钮海涛
|
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 |
puxiao.liao
|
d3f2434aa0
|
Fix bug#8752,8753
|
5 years ago |
曾贞一
|
6e70e3257b
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
钮海涛
|
5643f1aab4
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
wynne1005
|
85f99fcdfa
|
提测 还原pom
|
5 years ago |
wynne1005
|
b43317c11a
|
还原pom
|
5 years ago |
wynne1005
|
5f80cc4322
|
Merge branch 'dev' into test
|
5 years ago |
钮海涛
|
5610e5a455
|
完成SWEB任务
|
5 years ago |
puxiao.liao
|
47a7a0a9a3
|
BH 需求报表的修改
|
5 years ago |
puxiao.liao
|
7f76cf0ad3
|
BH 需求修改
|
5 years ago |
qianhs
|
86f6fefd5b
|
BH-CODE 出库,绑定
|
5 years ago |
钮海涛
|
7286ce7ebb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
钮海涛
|
f7c42ee90d
|
Start Task #1973 Cost:2h
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
|
5 years ago |
puxiao.liao
|
1b84b3aeee
|
Fix bug#8637,8697
|
5 years ago |
wynne1005
|
8ef3997038
|
还原pom
|
5 years ago |
puxiao.liao
|
b5aa990ea7
|
Fix bug#8633
|
5 years ago |
钮海涛
|
4d26c95639
|
Merge branch 'test' into dev
|
5 years ago |
puxiao.liao
|
7353b79b9c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
puxiao.liao
|
944b400f1e
|
Fix bug#8679
|
5 years ago |
qianhs
|
b474ef1266
|
Finish Task #1813 Cost:32h
Finish Task #1814 Cost:32h
Finish Task #1815 Cost:16h
|
5 years ago |
钮海涛
|
47131ff13f
|
修复版本问题
|
5 years ago |
钮海涛
|
043e71649a
|
bh子检测项新增检测大类
|
5 years ago |
钮海涛
|
da21795f7f
|
Merge branch 'test' into dev
|
5 years ago |
钮海涛
|
f392a13832
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
钮海涛
|
d65d9a5a1d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
puxiao.liao
|
8bca38a17d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
puxiao.liao
|
e793667812
|
BH 需求变更
|
5 years ago |
钮海涛
|
e2e48f31bd
|
bh子检测项新增检测大类
|
5 years ago |