jenkins
|
5947429d54
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
于学杰
|
8d15084b20
|
1. 调整5个批次的名称
|
6 years ago |
|
jenkins
|
68b650ab81
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
1111
|
8447ef39c9
|
【采购收货】
|
6 years ago |
|
jenkins
|
870dc7007d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
acbbbf8e32
|
【采购收货】
|
6 years ago |
|
jenkins
|
f6506bdd0b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
 曾贞一
|
47ccfcc9e3
|
【EU成品发运-检查数量组件】【bug1177】
【EU成品发运-检查单据是否操作完成组件】【bug1176】
【EU成品发运-成品发运FIFO推荐组件】【bug1174】
|
6 years ago |
|
jenkins
|
2f6400dc78
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
7452d49930
|
【采购收货】
|
6 years ago |
|
jenkins
|
ddee8a5215
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
qianhs
|
314aa78336
|
【 采购日程单里的寄售属性选项是0/1，应改为是/否】【bug6369】
|
6 years ago |
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
1111
|
f0290a758d
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
1111
|
e349ab3e9b
|
【采购收货】
|
6 years ago |
qinjia zou
|
c051b6024b
|
【VDA物流路线-路线新增-字段赋值】bug6515
|
6 years ago |
|
jenkins
|
04ae04246e
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
549f63aa0d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
07bda76d4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
b181cf2ac3
|
【安全库存拉动】
|
6 years ago |
|
许心洁
|
77b921ef38
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b0c4d11000
|
流程设计界面：查询组件列表根据作业类型名称分组返回给前端+每个步骤开始前都重新获取当前流程明细的步骤参数并放入缓存（BUG#6304）
|
6 years ago |
|
jenkins
|
edc281dffe
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qinjia zou
|
51d70654ef
|
【欧洲-生产快速入库】bug6389
|
6 years ago |
 王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
jenkins
|
8eb8c2f97e
|
Merge branch 'master' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
王杰
|
9f9c095846
|
Merge branch 'dev' into test
|
6 years ago |
|
1111
|
d35c6e97cd
|
【采购收货】
|
6 years ago |
|
王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
e7bad502c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
96ea008725
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
汪云昊
|
c0d8375d0f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
1111
|
41a48b4b59
|
【采购收货】 采购收货
|
6 years ago |
|
许心洁
|
8d6a2b53b1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b7c6189308
|
生产汇报JOB优化（新增根据多个属性值将对象集合进行分组的公共方法）+标准收货速度优化（30%）
|
6 years ago |
|
汪云昊
|
68f31721f0
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
qianhs
|
d4422bee15
|
【 PO订单页面，点击查询后，过滤条件错误，导致数据显示异常】【bug6493】
|
6 years ago |
|
王杰
|
7f08847c50
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
6297ccc4d7
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
5050c0c5a1
|
新增实体--安全库存
|
6 years ago |
|
qinjia zou
|
2210482918
|
【自动入库】bug6390
|
6 years ago |
wei.peng
|
02a9c64a42
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
qinjia zou
|
a8ebcb669b
|
【自动入库】bug6390
|
6 years ago |
|
qinjia zou
|
6e8977e5aa
|
【自动入库】bug6390
|
6 years ago |
陆卫豪
|
4a76c480ac
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
jenkins
|
f76aaddbd5
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
a55795d43f
|
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
|
qianhs
|
f0b35d1d74
|
【VDA生产退料-条码所在库位-需为线边库位】【bug6442】
【VDA收货---选择ASN订单，点击预收货，预收货成功后，按钮还可以点击。导致数据重复】【bug6464】
【 VDA收货---预收货的单据，要在页面上可以查询】【bug6465】
|
6 years ago |
|
jenkins
|
4d2a2a35b0
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
339a12eba3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
3781713a29
|
实时库存-条码明细优化查询速度
|
6 years ago |
|
于学杰
|
9e625acc0d
|
1. MOVE_TO_ERP 增加是否预收货字段
|
6 years ago |
|
曾贞一
|
3ba4e9b4f1
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
28078287af
|
【VDA收货】【预收货的单据，要在页面上可以查询-bug6465】
|
6 years ago |
|
于学杰
|
71818c4745
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
于学杰
|
db9a698c68
|
1. 增加是否寄售的属性
|
6 years ago |
|
王杰
|
1a7164c474
|
Merge branch 'dev' into test
|
6 years ago |
|
qianhs
|
48cbf9d471
|
【NC冻结】【350 NC冻结-4.2 批量NC冻结】【1187 NC冻结-4.2 批量NC冻结】
【 库存报表中无法看到寄售零件】【bug6331】
|
6 years ago |
puxiao.liao
|
3bda3169f4
|
【超级移库】bug6295
|
6 years ago |
|
王杰
|
57253ea87b
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
a441633326
|
【超级移库】bug6295
|
6 years ago |
|
crish
|
5b6b303722
|
Merge branch 'test'
|
6 years ago |
|
crish
|
17d5f1e512
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
曾贞一
|
7dbb55bcb0
|
【VDA质检】【缺了检验条码数量是否为-bug6402】
|
6 years ago |
|
jenkins
|
b5685a7874
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
c27daae8e4
|
移动单条码表 --供应商编码
|
6 years ago |
|
王杰
|
9137555226
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
21375ed6f4
|
【超级移库】bug6295
|
6 years ago |
|
jenkins
|
c1b50db526
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
puxiao.liao
|
1f85c75f6c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
9b8d4c900b
|
【事物查询】bug6294
|
6 years ago |
|
1111
|
2077c651e7
|
【采购收货】
|
6 years ago |
|
许心洁
|
60c25d7a71
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
许心洁
|
ccb29c5903
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
1111
|
2f2c843006
|
【坤泰-采购收货】包装关系
|
6 years ago |
|
许心洁
|
208410340e
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
王杰
|
ab34ebb769
|
Merge branch 'dev' into test
|
6 years ago |
|
qianhs
|
62bb71f4b0
|
【EU盘点】【 317-EU盘点-盘点差异查询】【1148EU盘点-盘点差异查询】
|
6 years ago |
|
许心洁
|
6d9787dc65
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lpx
|
94dc90172d
|
【扫描查询】bug6246
|
6 years ago |
张哲铭
|
578be0650a
|
Merge branch 'dev' into test
|
6 years ago |
|
1111
|
7378df1b9e
|
【宁德问题清单】
|
6 years ago |
|
张哲铭
|
6871e96496
|
Merge branch 'dev' into test
|
6 years ago |
|
1111
|
88a69ac7f8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
1111
|
71c867dd8c
|
【包装规格】
|
6 years ago |
|
许心洁
|
ac43296df3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5dc8ffb394
|
日志处理队列V1.0
|
6 years ago |
|
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
|
张哲铭
|
efbe0dfce9
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
lpx
|
fc49ddeea5
|
【事务查询】【326EU事务查询-新增按条码查询事务交易记录组件】【1157 新增按条码查询事务交易记录组件】
|
6 years ago |
|
许心洁
|
e433915759
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
be75c4ec42
|
【VDA质检--物料信息维护】任务号1135
【VDA质检--检查数量组件--修改】任务号1134
【VDA质检--检查质检箱数组件】任务号1133
|
6 years ago |
|
许心洁
|
017cd18950
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
d428aa302d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
b7071bd0db
|
供应商字段 添加
|
6 years ago |
|
王杰
|
d2c7a81893
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3ef115bbe2
|
新增冗余字段
|
6 years ago |
|
许心洁
|
219bf6db9a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
qianhs
|
457e10bc75
|
1,【拆包管理】【305-4.3物料信息维护】【1122物料信息维护】
|
6 years ago |