 王杰
|
d9e4ea8ea9
|
Merge branch 'test' into dev
|
6 years ago |
|
王杰
|
e5a401e5ef
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
6 years ago |
|
王杰
|
8ace0c363d
|
ptl enum
|
6 years ago |
|
王杰
|
dd9468ad14
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
6 years ago |
宋军超
|
fd79008df6
|
ptl同步配置表添加是否区分工厂字段isIgnoreOrg
|
6 years ago |
|
王杰
|
b3d3b8236d
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
d34f3b8215
|
2020-03-12/14:59 -- 数据清除定时任务出异常时，将异常信息存进数据库syncErrLog表中
|
6 years ago |
 钮海涛
|
669874cb9b
|
Merge branch 'dev' into test
|
6 years ago |
 曾贞一
|
674771de68
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
6 years ago |
许心洁
|
368986e9d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
1d90195de6
|
3D仓库
|
6 years ago |
|
曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
6 years ago |
 贾文涛
|
ba336893f8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
贾文涛
|
30722b130c
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
6 years ago |
|
王杰
|
068a0956db
|
解决冲突
|
6 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
6 years ago |
|
曾贞一
|
0368152e71
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
ab8b68c3cd
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
6 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
6 years ago |
汪云昊
|
e0bfb4c660
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
a510196022
|
软删合同禁用启用功能
|
6 years ago |
|
曾贞一
|
f16ac4a1d2
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
6 years ago |
puxiao.liao
|
277d2c851c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
6 years ago |
|
曾贞一
|
663b735c2f
|
Merge branch 'dev' of jessica.chen/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
6 years ago |
|
王杰
|
33a4c6b7bb
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
ac4a8b0ab4
|
修改ptl数据清除功能
|
6 years ago |
|
许心洁
|
d815ca9b12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
2c0ef55e85
|
解决动态查询BUG#7674,#7676+
流程导入BUG#7682
|
6 years ago |
陆卫豪
|
e43aee2e82
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e135ddd6ef
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
4d701aa9c4
|
添加ptl数据删除定时任务
|
6 years ago |
|
宋军超
|
5b17289c4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
61d3be19cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
|
6 years ago |
|
puxiao.liao
|
0968cdc49e
|
【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601
【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567
【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520
|
6 years ago |
zcg
|
5e78985247
|
【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突
|
6 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
6 years ago |
|
曾贞一
|
eefb472117
|
【7650 客户标签扫描】
|
6 years ago |
|
曾贞一
|
a9c9915a4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
5cc5844e45
|
【库存条码实体-添加字段 包装零件号】
|
6 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
6 years ago |
|
汪云昊
|
dd991b44fc
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
许心洁
|
3d3f134d7f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
c9f6f336af
|
动态查询：解决了BUG#7658,7660,7661,7663,7664
3D仓库：联调优化逻辑
|
6 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
钮海涛
|
36e2b74ee2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
钮海涛
|
b323b2feae
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |