 钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
cc947c08f5
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
8f899f2f46
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
fdec58c92a
|
feat(form):表单导入功能支持
|
5 years ago |
|
汪云昊
|
206e5f8d20
|
feat(form):支持导入数据
|
5 years ago |
|
汪云昊
|
1825cfbdf3
|
revert(pojo):还原pom版本
|
5 years ago |
puxiao.liao
|
e68735be83
|
MOVE_SN 增加 left_code 属性
|
5 years ago |
|
汪云昊
|
c9b4b37c23
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
687de9d828
|
feat(form):支持存储过程参数
|
5 years ago |
 曾贞一
|
d8e5aa44bc
|
pom.xml
|
5 years ago |
|
曾贞一
|
9a350912ea
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
|
5 years ago |
|
汪云昊
|
31cdda5b33
|
feat(softswitch):适配记录,FTP文件支持SID
|
5 years ago |
|
钮海涛
|
a8cdba48c3
|
合并Master代码
|
5 years ago |
|
钮海涛
|
7afd60073a
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
puxiao.liao
|
6907ab6dc0
|
北京麦格纳看板需求
|
5 years ago |
|
汪云昊
|
15dc4b00c7
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
ed22bd6f64
|
feat(form):存储过程调用适配mysql,mssql
|
5 years ago |
rock.yu
|
c3bdf4a162
|
解决10330库存扣减不准的问题
|
5 years ago |
|
puxiao.liao
|
6d64c61848
|
修改FIFO推荐查询逻辑
|
5 years ago |
|
汪云昊
|
2b6ff6498c
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
b186af893c
|
feat(softswitch):ftp适配信息优化
|
5 years ago |
|
puxiao.liao
|
44b5635e78
|
天津麦格纳PO生产任务增加关联行号
|
5 years ago |
|
钮海涛
|
af4bb83f85
|
sweb合并test代码
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
5033c8dde0
|
Fix bug#11661
移库单界面增加来源存储区和目标库位的检索条件
|
5 years ago |
|
汪云昊
|
604b8821eb
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
汪云昊
|
815daba16d
|
feat(softswitch):ftp适配记录按文件名查询
|
5 years ago |
|
汪云昊
|
0d20685a55
|
fix(softswitch):ftp适配器并发读取文件重复
|
5 years ago |
|
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
5 years ago |
|
puxiao.liao
|
4bfb903e54
|
修复麦格那发运提交事务重复&盘点提交sql异常
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
汪云昊
|
6156207369
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
d19fbe8cf1
|
fix(core):用户信息导出时，用户状态信息为空
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
汪云昊
|
4e8716f173
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
55a8bcad72
|
feat(core):系统更新记录功能
|
5 years ago |
|
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
3cf5c70774
|
修复MGN系列BUG
|
5 years ago |
|
puxiao.liao
|
f1715db664
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
|
汪云昊
|
7a4be36111
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
ab608c0919
|
feat:用户导出
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
|
曾贞一
|
6ca0948a5d
|
【11026 20011--有关北美收货产生的需求变更--0910】
|
5 years ago |
|
汪云昊
|
f878e6b283
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
曾贞一
|
332e37ea94
|
【2719 06 1.1.10 数据库文档管理-导入模板生成功能新增】
|
5 years ago |
|
rock.yu
|
3935bde8f6
|
同步 SAP 数据同步 JOB（从仪征同步）
|
5 years ago |
许心洁
|
73c0ae5d42
|
优化合并仪征代码
|
5 years ago |
|
钮海涛
|
51746154ba
|
合并dev到test
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
曾贞一
|
a9e97d4e28
|
【2688 08 extPDA-查询查看零件对应库位】
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
qianhs
|
86c9bce2aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
宋军超
|
fa4b1e09aa
|
修改海纳川问题
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
宋军超
|
8bc0da924c
|
修改海纳川问题
|
5 years ago |
|
qianhs
|
c872663847
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
汪云昊
|
e6ecd4f86f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
0d40470059
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
18a09cc4b6
|
FTP多文件读取问题
脚本解析功能初版
|
5 years ago |
 王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
许心洁
|
f791b3f82f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
ffc70e158a
|
BUG#8696
|
5 years ago |
|
钮海涛
|
5a64ce6021
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
qianhs
|
163d610265
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
许心洁
|
46904c43d1
|
任务#2528，#2545
|
5 years ago |
|
puxiao.liao
|
3c3a5f6068
|
Fix bug#9902
20089+物料拆分条码异常+0724
|
5 years ago |
|
rock.yu
|
0f8326d5f8
|
1. 修改扭矩枪采集部分因主数据变动引起的逻辑变动
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
wynne1005
|
d0e1900a84
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
c1fd1f6eee
|
bypass redo release
|
5 years ago |
|
宋军超
|
13142b4ce1
|
修改电检逻辑
|
5 years ago |
|
puxiao.liao
|
31c3fcd868
|
泰国需求
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
|
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |
|
钮海涛
|
81266fbfb6
|
解决合并冲突
|
5 years ago |
|
王杰
|
9b6be3167d
|
dev merge test
|
5 years ago |
|
王杰
|
d2ff83e22b
|
test merge dev
|
5 years ago |
|
wynne1005
|
bd3e32d39e
|
小枪调试完毕
|
5 years ago |
|
钮海涛
|
9a516f893f
|
合并dev代码到test
|
5 years ago |
|
钮海涛
|
37a12c0cdf
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
wynne1005
|
1252027685
|
dl小枪
|
5 years ago |
|
曾贞一
|
9bf2d5206c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
6750f11459
|
【2388 07 1.2.3.6.2欧洲WMS-PCR-悬挂链库存同步】
|
5 years ago |
|
王杰
|
e1b3b14a36
|
test merge dev
|
5 years ago |
|
wynne1005
|
cc4d17a81f
|
大枪ok bug 9492
|
5 years ago |
|
王杰
|
7e48674d9e
|
dev merge test
|
5 years ago |
|
王杰
|
4260316f62
|
test merge dev
|
5 years ago |
|
wynne1005
|
25382f0265
|
Fix Bug #2357,2358
|
5 years ago |
|
wynne1005
|
085f15427d
|
还原pom
|
5 years ago |
|
wynne1005
|
dfa993b9e9
|
还原pom
|
5 years ago |
|
wynne1005
|
15f0a37508
|
还原pom
|
5 years ago |
|
汪云昊
|
a2f7642d53
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
cbf1c97c06
|
彭伟代码恢复
定时任务日志过滤器
|
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 |
|
钮海涛
|
32eb9dc797
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
9dca27259e
|
Merge branch 'test' into dev
|
5 years ago |
|
许心洁
|
9d79ed5376
|
3D仓库规则引擎优化
|
5 years ago |
|
许心洁
|
6cd70eb695
|
3D仓库规则引擎优化
|
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 |
|
王杰
|
70d58be136
|
pom
|
5 years ago |
|
王杰
|
91d0ec1671
|
Merge branch 'master' into test
|
5 years ago |
|
qianhs
|
20cefbfec6
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
6c6fbf7e2c
|
新增收货回执显示收货时间功能
|
5 years ago |
|
钮海涛
|
d08465dd38
|
修复版本问题
|
5 years ago |
|
钮海涛
|
800a954b7f
|
Merge branch 'test' into dev
|
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 |
|
钮海涛
|
ac7e69e51e
|
修复版本问题
|
5 years ago |
|
wynne1005
|
b0b07437d6
|
还原pom
|
5 years ago |
|
wynne1005
|
60c1f6ecab
|
还原pom
|
5 years ago |
|
wynne1005
|
47ae0b46ef
|
还原pom
|
5 years ago |
袁津哲
|
adb974d874
|
合并test分支代码到dev分支
|
5 years ago |
|
qianhs
|
f4ca720ce4
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
袁津哲
|
0067e31420
|
合并test分支代码到dev分支
|
5 years ago |
|
钮海涛
|
7982cefc1e
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
2f8b0ba5db
|
修复版本问题
|
5 years ago |
|
钮海涛
|
a71d7a31ce
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
471208d051
|
SWEB添加条码状态枚举
|
5 years ago |
|
袁津哲
|
7f0b99297f
|
Start Task #2019 Cost:16h Left:0h
Finish Task #2019 Cost:16h
|
5 years ago |
|
汪云昊
|
e416b032c2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
4fc8c2a80d
|
软适配添加适配发送报文
|
5 years ago |
|
袁津哲
|
7aaa8bca6d
|
合并dev分支代码到test分支
|
5 years ago |
wei.peng
|
adb95f100f
|
Ics 日志收集功能完成
|
5 years ago |
|
钮海涛
|
7414b76d85
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
6061f89d43
|
修复合并版本问题
|
5 years ago |
|
袁津哲
|
868e82d83a
|
Start Task #2019 Cost:16h Left:0h
Finish Task #2019 Cost:16h
|
5 years ago |
|
曾贞一
|
b2d9741453
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
|
曾贞一
|
31c26017c1
|
【2009 天津麦格纳WMS-报表-库位利用率】
|
5 years ago |
|
wynne1005
|
b43317c11a
|
还原pom
|
5 years ago |
|
袁津哲
|
00f07acd45
|
Fix Bug #1916,1917
|
5 years ago |
|
袁津哲
|
399c9c828e
|
Fix Bug #1916,1917
|
6 years ago |
|
wynne1005
|
8ef3997038
|
还原pom
|
6 years ago |
|
钮海涛
|
47131ff13f
|
修复版本问题
|
6 years ago |
|
袁津哲
|
44f313abc4
|
Task1917、1916:开发关键件绑定、扭矩二合一(PF)、关键件绑定、扭矩二合一(DL)功能
|
6 years ago |