wei.peng
|
823f818abf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
wei.peng
|
44af186f2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
af6083ddff
|
日志存储优化
|
5 years ago |
jenkins
|
422aa1835f
|
Jenkins自动合并
|
5 years ago |
 钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
5 years ago |
|
jenkins
|
dfb06def2b
|
Jenkins自动合并
|
5 years ago |
 曾贞一
|
9e9d3e2afa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
5a4510cedb
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
5 years ago |
qianhs
|
81bab75132
|
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
|
5 years ago |
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
5 years ago |
许心洁
|
7594b3d515
|
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
|
5 years ago |
|
jenkins
|
688d976683
|
Jenkins自动合并
|
5 years ago |
 王杰
|
8a4aa9fed2
|
jis发运
|
5 years ago |
|
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
5 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
5 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
5 years ago |
汪云昊
|
b12f67e34b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
6b02d9969a
|
数据源批量写入优化
|
5 years ago |
|
王杰
|
7287aaeb77
|
其他组未提交的代码
|
5 years ago |
|
jenkins
|
471016b345
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
5 years ago |
|
汪云昊
|
d89ed44bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
1d9ab80ae8
|
数据源适配器 - 批量写入优化
|
5 years ago |
|
王杰
|
3ddadad142
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
019cb91a4c
|
【需求：1329】
|
5 years ago |
|
王杰
|
91ab421d5e
|
Merge branch 'dev' into test
|
5 years ago |
jokelone
|
f857a4065d
|
【任务：1327JIT生产】
|
5 years ago |
E
|
e5452056b6
|
【bug7083 KT器具管理】新增业务类型和作业类型
|
5 years ago |
puxiao.liao
|
794992d687
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
734b54d1b2
|
【 领料上线扫描时，在扫描完条码后将目标库位带出。
】bug7024
|
5 years ago |
|
王杰
|
06afd98334
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
0e84990f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
20f6961daf
|
【任务：1327JIT生产】
|
5 years ago |
|
jenkins
|
6a19a07fce
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
d5c1f7a7a3
|
资源模块数据
模板软删除
软适配list传参
|
5 years ago |
|
jenkins
|
1fbd9c4357
|
Jenkins自动合并
|
5 years ago |
zcg
|
dccd104fdd
|
[需求：1324，excel导出]
|
5 years ago |
|
jenkins
|
4e8ee475b4
|
Jenkins自动合并
|
5 years ago |
gcj
|
99eaa8b8ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
|
5 years ago |
|
gcj
|
fc9b8629ab
|
【采购收货】
|
5 years ago |
|
jenkins
|
cc45dbc2cb
|
Jenkins自动合并
|
5 years ago |
|
E
|
996526ac7c
|
【bug7088 物料信息中的导入功能】
|
5 years ago |
|
王杰
|
90de0f7df6
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
b0709aca97
|
枚举
|
5 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
5 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
5 years ago |
|
qianhs
|
a2ac02aa47
|
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
|
5 years ago |
|
E
|
7ef04dd824
|
【1320 KT物料信息--需要维护物料的类型：器具】
|
5 years ago |
|
gcj
|
a7d1ec785b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
5c28c8344c
|
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
|
5 years ago |