8854 Commits (e8bf435d6ed6672309e36566805ca4f10acad4b5)

Author SHA1 Message Date
王宝玉 05d789ea64 wms物料子检查项增加动态表单字段 3 years ago
nies dfe93ff37e 新增账号类型字段 3 years ago
nies 187c1382ca 新增用户账号类型 3 years ago
castle.zang 37d7b461f6 添加soft_type,eam_pad 3 years ago
castle.zang 8f1633e797 Merge remote-tracking branch 'upstream/test' into test 3 years ago
nies 0ca309e38b 新增报关管理系统 3 years ago
聂帅 e09dc6fd94 Merge pull request 'MesPartFormula 物料配方表新增参照数量字段' (#342) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/342
3 years ago
蒋鸿辉 fcff103a4d MesPartFormula 物料配方表新增参照数量字段 3 years ago
nies 8cd30d3bc8 修改eam端口 3 years ago
castle.zang e8cc06babb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
聂帅 428ebcf614 Merge pull request 'MesPartStockSchedule(安全库存配置)新增已下达箱数字段' (#341) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/341
3 years ago
蒋鸿辉 f7a8acb88b MesPartStockSchedule(安全库存配置)新增已下达箱数字段 3 years ago
castle.zang 83efec6280 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies 4c57d9e9b3 修改SysTableTemplate索引设置 3 years ago
nies f843878e7e 新增钉钉单聊机器人批量发送消息的model 3 years ago
castle.zang e01f9a5570 集中对账单 3 years ago
castle.zang 5bea74bf80 sweb供应商自助修改密码---供应商登出 3 years ago
castle.zang 0e5d45d477 sweb供应商自助修改密码 3 years ago
castle.zang 3088b05027 sweb统一登录 3 years ago
nies 34df681f37 新增前端列表模板类 3 years ago
nies 8ebc96d1f7 sysMessage 查询增加organizeCode字段 3 years ago
castle.zang 6508ad8082 获取redis信息 3 years ago
nies bad5dc8134 软适配webservice服务端新增调用对应服务的适配模式 3 years ago
聂帅 085c272e1d Merge pull request '生产队列明细(MesQueueOrderDetail)增加产线字段' (#339) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/339
3 years ago
蒋鸿辉 8179cceb4d 生产队列明细(MesQueueOrderDetail)增加产线字段 3 years ago
聂帅 e84952994a Merge pull request '供应商物料界面显示是否加严字段' (#338) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/338
3 years ago
jun c27db13780 加字段【变更号】字段 3 years ago
jun ac6d420e99 供应商物料界面显示是否加严字段 3 years ago
臧学普 bae79eeee7 Merge pull request '#19995 19081-WMS服务挂掉-PDA无法使用' (#337) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/337
3 years ago
jun a515c629d0 #19995 19081-WMS服务挂掉-PDA无法使用 3 years ago
聂帅 8a4111a430 Merge pull request 'BUG #19874 松下页面优化' (#336) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/336
3 years ago
castle.zang f24fe9eae3 BSP pojo 3 years ago
castle.zang 60d2501505 wms作业流程导入导出功能,不校验脚本描述 3 years ago
castle.zang 4831d506cd Merge remote-tracking branch 'upstream/test' into test 3 years ago
ban.yuan 13a3f30876 BUG #19874 松下页面优化 3 years ago
聂帅 c72c4fddb7 Merge pull request 'BUG #19874 松下页面优化' (#334) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/334
3 years ago
ban.yuan e79b0da311 BUG #19874 松下页面优化 3 years ago
castle.zang 87ecad5b52 Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 7b2d2e816c wms作业流程导入导出功能 3 years ago
jun 0ba685d226 供应商物料新增等级 3 years ago
王杰 0f3b4c66a9 离线登陆 3 years ago
nies 6b7ecd19b4 suitClientModel增加字段 3 years ago
castle.zang d919ef4243 BSP 调整pojo 3 years ago
nies d5afc6d195 RequestModel新增属性 3 years ago
castle.zang f82b161f78 BSP 脚本调整-1 3 years ago
聂帅 7361dfca50 Merge pull request 'BUG #19800 松下页面优化' (#330) from qi.yuan/i3plus-pojo-ban:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/330
3 years ago
ban.yuan 8b80c4f16f BUG #19800 松下页面优化 3 years ago
nies 6c52328750 (update)修改QMS枚举常量 3 years ago
link a4edb8a731 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link 9d065ffac2 健康指标SQL取值计算BUG修复 3 years ago
castle.zang b4088b888f BSP 脚本调整 3 years ago
castle.zang fa91cf6804 BSP 脚本 3 years ago
castle.zang 0107aab563 BSP联调pojo 3 years ago
castle.zang aa80fff7fa BSP联调pojo 3 years ago
link 741193be82 健康度指标DP修改 3 years ago
聂帅 924339025e Merge pull request '北京pda显示新增分组' (#328) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/328
3 years ago
jun 14678a5bad 北京pda显示新增分组 3 years ago
castle.zang 9aafab3d5a 增加中航新的mes-history的menuRootCode 3 years ago
castle.zang 8fc894b413 Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang db2941fd31 调试bsp方法管理,执行器管理,日志管理接口 3 years ago
link 99c6752b63 add healthindex module Entity and DP 3 years ago
聂帅 261fd456d5 Merge pull request '中航物料对象修复' (#327) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/327
3 years ago
王宝玉 c92b401fe4 中航物料对象修复 3 years ago
nies 7d06827898 clientModel新增requestId 3 years ago
nies c9535bf555 新增产品类型EAM 设备信息管理服务 3 years ago
castle.zang a0079ae73f Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang b81b9c569d 冷热数据分离--重构--测试完成 3 years ago
聂帅 ba78a4b0f7 Merge pull request '【19625 21062+质检报表导出失败,需修复】' (#326) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/326
3 years ago
曾贞一 fbc5415086 【19625 21062+质检报表导出失败,需修复】 3 years ago
曾贞一 b5fb208027 【19625 21062+质检报表导出失败,需修复】 3 years ago
曾贞一 5c9e6ad4cf 【19625 21062+质检报表导出失败,需修复】 3 years ago
曾贞一 cb5db7101a 【19625 21062+质检报表导出失败,需修复】 3 years ago
聂帅 1ee62d1689 Merge pull request '仓库健康统计变量,周期和计算频次换成corn表达式' (#324) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/324
3 years ago
jun d21cc02739 仓库健康统计变量,周期和计算频次换成corn表达式 3 years ago
castle.zang 94c61f77f4 冷热数据分离--重构 3 years ago
castle.zang c2437fd00f 接口映射bean 3 years ago
聂帅 edc4a74001 Merge pull request '中航物料对象导入修改' (#323) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/323
3 years ago
王宝玉 2e2487ebc0 中航物料对象导入修改 3 years ago
link 8c65aa1294 fix miss field 3 years ago
link ac152cf3f2 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link b04cedf70b 添加dao的数据接口 3 years ago
nies f44a69a46c UserDeatilModel增加登录次数字段 3 years ago
聂帅 b7ba3b1f6e Merge pull request '中航条码补偿字段' (#322) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/322
3 years ago
王宝玉 74f9e00f56 中航条码补偿字段 3 years ago
nies d5f6d501b5 WmsStockSn新增构造函数 3 years ago
nies 6a07e7ff30 供应商新增字段是否首次登录 3 years ago
nies f0ddb6ca60 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
聂帅 2f79cf7d2b Merge pull request '条码表新增补偿字段' (#321) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/321
3 years ago
王宝玉 da44d62f8f 条码表新增补偿字段 3 years ago
nies db04d60fbc Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
link ba5ddc09e1 delete table index 3 years ago
nies 1086f11875 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies a43b17841f 软适配新增SuitRetryModel 3 years ago
puxiao.liao 403fef80f4 实盘表增加托盘字段 3 years ago
link 73191c1961 三方指标查询POJO 3 years ago
nies 976369fa10 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 3 years ago
nies 2255d1dfcf (update)软适配新增适配类型表 3 years ago
聂帅 a70c9cf5ec Merge pull request 'MesProdCfgType 新增 项目代码与报文vehicleCode关系字段' (#319) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/319
3 years ago
蒋鸿辉 b7bf7edfa5 MesProdCfgType 新增 项目代码与报文vehicleCode关系字段 3 years ago
castle.zang 35abd70bae Merge remote-tracking branch 'upstream/test' into test 3 years ago
castle.zang 8a369c31fa 通用数据冷热分离代码,并规范化test分支开发时的依赖,全部依赖1.0-TEST-SNAPSHOT 3 years ago
聂帅 e51e82994a Merge pull request 'MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode)' (#318) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/318
3 years ago
蒋鸿辉 4d61109541 MesKpsnRule(关键件条码校验规则),MesBypassMapping(MES_BYPASS项映射关系)增加项目代(prodCfgTypeCode) 3 years ago
聂帅 39e0235ad9 Merge pull request '物料项目关系表新增客户零件号(custPartNo)字段' (#317) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/317
3 years ago
蒋鸿辉 f1811b42de 物料项目关系表新增客户零件号(custPartNo)字段 3 years ago
nies 585e2aefe1 (update)WmsInterfaceDataMapper增加busiIdList字段 3 years ago
nies 058a761500 (update)增加适配重复记录 3 years ago
nies ccab3f0c04 (update)BsSuitCase增加requestId 3 years ago
nies a3d2749161 (update)SuitModel 增加requestId 3 years ago
聂帅 65c22dec22 Merge pull request '18934 原材料扣减job替换' (#316) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/316
3 years ago
jun 0ef89f2a6d 18934 原材料扣减job替换 3 years ago
聂帅 f1e158737b Merge pull request '【18835 19081-盘点策略-循环规则-选项可配置】' (#314) from jimmy.zeng/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/314
4 years ago
曾贞一 7f7baa1ea4 【18835 19081-盘点策略-循环规则-选项可配置】 4 years ago
nies 38b1ce6643 (update)更新aps-4的端口为8400 4 years ago
nies d06fe76744 增加aps_3和aps_4的枚举配置 4 years ago
jun 93d84b66f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 4 years ago
jun 67ed074d35 18681 交易类型需要导出功能 4 years ago
臧学普 0e5cafae91 Merge pull request 'WmsBH物料子检测项新增录入方式字段' (#312) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/312
4 years ago
王宝玉 cdd7f7bed2 WmsBH物料子检测项新增录入方式字段 4 years ago
聂帅 443a8a200d Merge pull request 'test' (#311) from baoyu.wang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/311
4 years ago
王宝玉 4625987eef Mes散件BOM增加项目代码字段 4 years ago
王宝玉 5056f30f45 核心包mes散件产品配置BOM新增项目代码 4 years ago
nies fc9ef265f9 修改aps-2的menurootid 4 years ago
nies 0400305d91 增加aps-2的枚举配置 4 years ago
曾贞一 7b9a91fd0f 【18541 21062+盘点 盘点单冻结页面缺一个托条码的字段,需添加+1110】 4 years ago
nies 5b5e00eee7 model core 增加SysRoleModel 4 years ago
nies 72673bfa12 平台新增用户角色关联model 4 years ago
王杰 3270395d94 安灯 4 years ago
臧学普 9d8371bdac Merge pull request '工单表增加系统同步标志字段' (#306) from honghui.jiang/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/306
4 years ago
nies 5666b5d120 软适配增加华域相关的配置 4 years ago
nies 0f92e2bbf9 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
聂帅 74dab6e6d0 Merge pull request '成都麦格纳,wmsCqMaster新增构造方法' (#304) from junsheng.li/i3plus-pojo-junsheng:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/304
4 years ago
castle.zang d771304733 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
王杰 77795be8df StationRequestBean 增加 缓存数据来源class 4 years ago
蒋鸿辉 0cfac0aaaf 工单表增加系统同步标志字段 4 years ago
nies b8662be266 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 211d20e840 修改打印模板复杂查询 4 years ago
jun a7b6cd22d3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest 4 years ago
jun 93f50a56be WMS_产品报工明细信息 新增@ApiParam("是否已经生成领料单")字段 4 years ago
jun e390e7fc33 成都:PULL_WAY_STATUS枚举新增 OVER_PULL(80, "过点拉动") 4 years ago
castle.zang 1072745cda Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
臧学普 f7d8ee1026 Merge pull request '索引' (#302) from jhforever.wang/wangjie-i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/302
4 years ago
castle.zang 34cb9d311f Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 5acd3270f9 修改pom中版本为1.0.0.1 4 years ago
nies 968708d1b8 删除多余的taskNo 4 years ago
castle.zang 124cc7d729 Merge remote-tracking branch 'upstream/test' into test 4 years ago
castle.zang ace269e8aa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 5f4b8efe56 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
聂帅 a995805f74 Merge pull request '二开项目目前pojo类无法同步,在核心包新增pojo' (#303) from dominic.xiao/i3plus-pojo:test into test
Reviewed-on: http://git.estsh.com/i3-IMPP/i3plus-pojo/pulls/303
4 years ago
Dominic_Xiao cbba75032a 二开项目目前pojo类无法同步,在核心包新增pojo 4 years ago