 曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
5 years ago |
 贾文涛
|
ba336893f8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
贾文涛
|
30722b130c
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into master
|
5 years ago |
 王杰
|
068a0956db
|
解决冲突
|
5 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
5 years ago |
|
曾贞一
|
0368152e71
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
曾贞一
|
4fcd7cbc3f
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
ab8b68c3cd
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
5 years ago |
汪云昊
|
e0bfb4c660
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a510196022
|
软删合同禁用启用功能
|
5 years ago |
|
曾贞一
|
f16ac4a1d2
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
5 years ago |
puxiao.liao
|
277d2c851c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
5 years ago |
|
曾贞一
|
663b735c2f
|
Merge branch 'dev' of jessica.chen/i3plus-pojo into dev
|
5 years ago |
陈思洁
|
102af98a75
|
【PTL_增加主任务编号字段和组内编号字段】
|
5 years ago |
|
王杰
|
33a4c6b7bb
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
5 years ago |
宋军超
|
ac4a8b0ab4
|
修改ptl数据清除功能
|
5 years ago |
许心洁
|
d815ca9b12
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
2c0ef55e85
|
解决动态查询BUG#7674,#7676+
流程导入BUG#7682
|
5 years ago |
陆卫豪
|
e43aee2e82
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
e135ddd6ef
|
Merge branch 'dev' of adair.song/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
4d701aa9c4
|
添加ptl数据删除定时任务
|
5 years ago |
|
宋军超
|
5b17289c4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 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
|
5 years ago |
|
puxiao.liao
|
0968cdc49e
|
【7601 发运单明细生成条码后，由于生成的客户条码不存在于条码表中。需要有一个界面可以查到这些条码，并且打印出来，目前的话如果生成那次的打印失败了，那就无法再次打印改条码。】BUG#7601
【7567 条码状态报表希望增加一个ASN组号查询按钮，不需要增加显示字段，只是希望可以按照ASN组号查询条码】bug#7567
【7520 盘点单主界面增加库区与零件号，可以从盘点范围里取，如果有多个库区或者多个零件号，则显示为空就行,查询框增加零件号与库区字段查询】bug#7520
|
5 years ago |
zcg
|
5e78985247
|
【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突
|
5 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
5 years ago |
|
曾贞一
|
eefb472117
|
【7650 客户标签扫描】
|
5 years ago |
|
曾贞一
|
a9c9915a4f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
5cc5844e45
|
【库存条码实体-添加字段 包装零件号】
|
5 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
5 years ago |
|
汪云昊
|
dd991b44fc
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
许心洁
|
3d3f134d7f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
c9f6f336af
|
动态查询：解决了BUG#7658,7660,7661,7663,7664
3D仓库：联调优化逻辑
|
5 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
 钮海涛
|
36e2b74ee2
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
钮海涛
|
b323b2feae
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
钮海涛
|
35c1114230
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
5 years ago |
|
钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
196e5c87a4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
00252caa0c
|
移动mespcn公用model
|
5 years ago |
|
puxiao.liao
|
50d3de9b77
|
7600 二维码零件标签打印功能修改。
7565 收货分组功能要求。
7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
7628 库存调整盘点时，扫描库位后的提示增加一个库位
7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示
7536 没库存时领料与发运的提示修改为下列
7659 创建盘点单冻结条码时条码is_vaild=2
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
7652 在条码状态报表中增加组号字段显示，查询框也需要增加
7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。
7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号
7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
|
5 years ago |
|
宋军超
|
380fded580
|
添加数据清理实体和死信数据定时任务
|
5 years ago |
|
王杰
|
880d449dfb
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
b10ddbc958
|
ptl enum
|
5 years ago |
|
luweihao
|
005db6ac5b
|
Merge branch 'dev' into test
|
5 years ago |
|
luweihao
|
4e70422bec
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
luweihao
|
7beaa515c8
|
task `1428` 作业流程
|
5 years ago |