2673 Commits (729a7b6990cb866dba8b4196c54c72fd073e1a9d)

Author SHA1 Message Date
puxiao.liao e85acdcfff Fix bug#9994
库存明细--显示重复
5 years ago
qianhs 958a45d3dd Finish Task #2080 Cost:8h 5 years ago
钮海涛 fd0f079a6a Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 34be0bde26 增加物料组功能 5 years ago
puxiao.liao 2e3f5bb2af Fix bug#9994
库存明细--显示重复
5 years ago
puxiao.liao 5f90efe691 Fix bug#9982
19125+条码打印页面,erpSrcNo字段数据错误,导致打印出的条码数据有误+0727
5 years ago
钮海涛 7ca3b43bfe 合并DEV分支代码 5 years ago
钮海涛 b04ef3caa4 合并TEST分支代码 5 years ago
钮海涛 ef40f20e1d 解决合并冲突 5 years ago
钮海涛 3c22c8e3f4 test版本合并到master 5 years ago
钮海涛 0eb571d717 Fix bug #9804 5 years ago
钮海涛 9bde10f13c 修复收货回执界面打不开问题 5 years ago
puxiao.liao 5006e0a938 Finish Task #2520 Cost:8h
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
5 years ago
puxiao.liao 31c3fcd868 泰国需求 5 years ago
钮海涛 3e95dd4029 修复北京麦格纳生产报工问题 5 years ago
puxiao.liao 88b85b03d2 Finish Task #2436 Cost:8h
拣货、客户发运流程简化配置
5 years ago
qianhs c9e4c72901 Finish Task #2080 Cost:8h 5 years ago
qianhs e17318dbcb Finish Task #2080 Cost:8h 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 81266fbfb6 解决合并冲突 5 years ago
qianhs 9461057a07 Finish Task #2080 Cost:8h 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
钮海涛 37a12c0cdf Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
puxiao.liao 5d62ebf26f Finish Task #2424 Cost:8h
2424 07 1.2.3.7.1新增检查容器包装关系
5 years ago
曾贞一 791acf7ae8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 dffdf88471 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
王杰 e1b3b14a36 test merge dev 5 years ago
王杰 6de2bc5472 Merge branch 'test' into dev 5 years ago
puxiao.liao df125e71b9 泰国翻包 5 years ago
曾贞一 354d1290f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f99c5232be 【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】 5 years ago
曾贞一 c0cf08fa19 【9556 欧洲-RFID条码操作记录-操作类型显示问题】 5 years ago
王杰 4260316f62 test merge dev 5 years ago
曾贞一 ef58d72067 【9514 欧洲-定制业务-RFID管理-查询条件无效】 5 years ago
puxiao.liao 9445989545 Finish Task #2338 Cost:4h
2338 07 1.2.3.5.1客户发往地新增维护目标存储区
5 years ago
曾贞一 000097a4c6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 82e2366fa6 【2181 06 1.2.3.8 泰国WMS-容器包装关系接口-需求变更】 5 years ago
钮海涛 20a5443fa7 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c05e18db5b 合并源分支代码 5 years ago
王杰 a2f047553f pom 5 years ago
王杰 dc91809bb7 test merge dev 5 years ago
曾贞一 3620d2abd2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 e9492a86b0 【2315 07 1.2.3.6.3欧洲WMS-RFID查询】 5 years ago
rock.yu c4f8497dda 通用接口的字段映射关系 JSON 中增加 seq 属性,发出的接口报文会按照此属性生序
如果未配置此属性,则默认为 0,即无序
增加此段代码的单元测试用例
5 years ago
曾贞一 5dfad71e39 【2292 子 07 1.2.3.6.3欧洲WMS-PCR-RFID入库 】
【2310 07 1.2.3.6.3欧洲WMS-RFID发运】
【2312 07 1.2.3.6.3欧洲WMS-RFID空车回库】
5 years ago
qianhs f0b8cee974 Merge remote-tracking branch 'origin/test' into test 5 years ago
qianhs ba6be25390 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 595266f536 Fix bug#9343
19125+条码打印页面后端传值新增一个字段值,传表wms_part 字段color +0709
5 years ago
曾贞一 0108649a73 【代码优化-优化】 5 years ago
曾贞一 c20159da6a 【上架策略-功能优化】 5 years ago
钮海涛 6033695b99 修复合并版本问题 5 years ago
puxiao.liao f385be1d7c 无锡喜德BUG 5 years ago
wynne1005 085f15427d 还原pom 5 years ago
wynne1005 cb4bf9f453 merge andon pom 5 years ago
wynne1005 dfa993b9e9 还原pom 5 years ago
曾贞一 50e2f18c0d 【9280 wms-202007-BH录值完成点击完成按钮系统响应时间过长-0705】 5 years ago
wynne1005 15f0a37508 还原pom 5 years ago
汪云昊 39d6609a5f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 24474b4704 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 c3398a6cc9 修改中航BH问题 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
曾贞一 f4edb471c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 3d826c5edc 【智能化开发-日志记录优化】 5 years ago
puxiao.liao 559fc003c8 Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
5 years ago
钮海涛 32eb9dc797 修复合并版本问题 5 years ago
钮海涛 9dca27259e Merge branch 'test' into dev 5 years ago
puxiao.liao 37fb285aa9 海纳川智能化 5 years ago
曾贞一 7dddac5113 【智能化开发-锁定库位】 5 years ago
曾贞一 aa09a31957 【智能化开发-锁定库存】 5 years ago
许心洁 9d79ed5376 3D仓库规则引擎优化 5 years ago
许心洁 38b154b0cb Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 6cd70eb695 3D仓库规则引擎优化 5 years ago
钮海涛 0626d6f969 修复版本问题 5 years ago
钮海涛 e42ea19f37 修复版本问题 5 years ago
钮海涛 8d4c5f3cd4 Merge branch 'test' into dev 5 years ago
钮海涛 0f2f56163e Merge branch 'master' into test 5 years ago
puxiao.liao 5269cfb732 BH 需求修改 5 years ago
钮海涛 62c9d8d27d 修复欧洲FIFO跳过未进行交易处理Bug 5 years ago
puxiao.liao 84253d7562 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao b9ac27df19 无锡喜德BUG 5 years ago
曾贞一 624e8d6461 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
曾贞一 b68f55b062 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
王杰 15e7f2a0b5 pom 5 years ago
王杰 ea5a069eeb pom 5 years ago
王杰 f3ffdc7d4c dev merge test 5 years ago
王杰 2c16efcb72 Merge branch 'test' into dev 5 years ago
王杰 7d5d36d084 test merge master 5 years ago
王杰 70d58be136 pom 5 years ago
王杰 91d0ec1671 Merge branch 'master' into test 5 years ago
曾贞一 913991d30d 【2193 06 1.2.3.7.4任务自动生成任务JOB】 5 years ago
钮海涛 6c6fbf7e2c 新增收货回执显示收货时间功能 5 years ago
钮海涛 d08465dd38 修复版本问题 5 years ago
钮海涛 800a954b7f Merge branch 'test' into dev 5 years ago
qianhs 98b0110ff3 Finish Task #2080 Cost:8h 5 years ago
曾贞一 9567d62195 【自动化策略】 5 years ago
曾贞一 e94e4ad189 【2180 06 1.2.3.8泰国WMS-生产报工接口】
【2181 06 1.2.3.8 泰国WMS-容器包装关系接口】
【2180 06 1.2.3.8泰国WMS-生产报工接口】
5 years ago
汪云昊 6d71c01178 Merge remote-tracking branch 'origin/dev' into test 5 years ago
puxiao.liao ffc2d4d56c Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
 Conflicts:
	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
5 years ago
puxiao.liao 49f9d06d5f Fix bug#9062
无锡喜德-生产汇报(原材料/成品)用 函数取出来的父位置和子位置号可能会有多个-0620
5 years ago
钮海涛 ac7e69e51e 修复版本问题 5 years ago
钮海涛 34e63db56c Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 e340749f87 Finish Task #2196 Cost:4h 5 years ago
puxiao.liao 0818778346 自动化策略主表 5 years ago
曾贞一 68c3f087dc 【2180 06 1.2.3.8泰国WMS-生产报工接口】 5 years ago
puxiao.liao 0c0d43cd96 北京海纳川:采购入库组件 5 years ago
曾贞一 a59fa1bf9b 【2078 06 1.2.3.9拣货策略-新增拣货推荐组价】 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
曾贞一 99f1ba98b6 【2077 06 1.2.3.8上架策略-4.5 新增上架推荐组件】 5 years ago
puxiao.liao 3fe454da39 Fix bug#8909 5 years ago
钮海涛 e457b50145 中航需求变更 5 years ago
曾贞一 5c2dcf8e10 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
曾贞一 f3857116d1 【2074 06 1.2.3.8上架策略-计算COI值】 5 years ago
曾贞一 27cb1dddfe 【1603 委外扣减查询-需求变更】 5 years ago
wynne1005 47ae0b46ef 还原pom 5 years ago
袁津哲 adb974d874 合并test分支代码到dev分支 5 years ago
puxiao.liao 328967ff06 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 2194715705 Fix bug#8736 5 years ago
qianhs f4ca720ce4 Finish Task #2080 Cost:8h 5 years ago
puxiao.liao 2b791901d2 Fix bug#8876 5 years ago
钮海涛 16574b6920 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 da454b3921 领料单界面显示erp单号问题 5 years ago
袁津哲 0067e31420 合并test分支代码到dev分支 5 years ago
钮海涛 7982cefc1e Merge branch 'test' into dev 5 years ago
钮海涛 2f8b0ba5db 修复版本问题 5 years ago
qianhs 057439d050 Finish Task #2080 Cost:8h
Finish Task #2081 Cost:12h
Finish Task #2083 Cost:8h
5 years ago
puxiao.liao 3173e43245 Fix bug#8742 5 years ago
钮海涛 a71d7a31ce Merge branch 'master' into test 5 years ago
钮海涛 97fb0bfd29 Fix Bug #8823 5 years ago
puxiao.liao 5c40073169 喜德BUG 修改 5 years ago
puxiao.liao 47a318f238 喜德BUG 修改 5 years ago
puxiao.liao bcb70400eb Finish Task #2027 Cost:10h 5 years ago
puxiao.liao 2133908ff5 Finish Task #2024 Cost:8h 5 years ago
钮海涛 fd45d66968 解决合并冲突 5 years ago
曾贞一 a2ef35082e 【1794 天津麦格纳WMS-报表-库位利用率看板】 5 years ago
puxiao.liao e57acfacee BH BUG 修改 5 years ago
puxiao.liao 454de274c7 Fix bug#8780 5 years ago
puxiao.liao 71d729b7f5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 16f1ed34a5 Fix bug#8780 5 years ago
qianhs 6d4a1b6975 BH-CODE 出库,绑定 5 years ago
puxiao.liao 9a65fc95fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
puxiao.liao 9975335acb Finish Task #2033 Cost:8h 5 years ago
曾贞一 36f9068e4c 【冲突】 5 years ago
曾贞一 4c3571182c 【冲突】 5 years ago
曾贞一 523e4b7b3b 【2016 BH-回传检测结果至MES系统】 5 years ago
钮海涛 7414b76d85 修复合并版本问题 5 years ago
钮海涛 32a566be93 Merge branch 'test' into dev 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago