1848 Commits (95048bce44c46fb927b281a6f3ebbdcf18321a41)

Author SHA1 Message Date
jenkins 95048bce44 Jenkins自动合并 5 years ago
qianhs d4d30bf634 【 零件号条码打印,扫描后需要提示当前扫描零件,当前扫描数量,剩余扫描数量(标包减去扫描数量)。】【bug7020】 5 years ago
汪云昊 1318c6ef56 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
陈思洁 5d4e8a94c4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 c5ae91b41e 【KT-1286 计划拉动-计划拉动JOB】 5 years ago
jenkins 55dcb795c9 Jenkins自动合并 5 years ago
许心洁 258c1ccbe8 流程导入:优化数字类型CELL为空字符串时的校验+有些SHEET没有数据时无需校验+快速移库:只能移入库状态的条码;不可多人操作同一个库位进行整库移库 5 years ago
jenkins cfebb937fb Jenkins自动合并 6 years ago
gcj 4c2d922ed9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj 2c63820f98 【运输管理】 6 years ago
jenkins 350f7101d2 Jenkins自动合并 6 years ago
puxiao.liao da4f32f0b4 【在配料时,点击右上角放大镜,输入单号无法查询,并且显示的内容需要有来源,目标,是否紧急
】6978
6 years ago
gcj 59e7704f67 【运输管理】装车单 6 years ago
陆卫豪 5393d6e034 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
陈思洁 40c64db0b1 冲突 6 years ago
陈思洁 ee14ce1d4b 【KT-快速入库功能】 6 years ago
jenkins 015d284239 Jenkins自动合并 6 years ago
puxiao.liao 99a1ec309d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
puxiao.liao 3bfb0995d5 【物料基础信息增加【贵重物料】属性,领料上线流程根据此属性判断是否需要扫描目标库位
】bug1299
6 years ago
jenkins 39f4c733a4 Jenkins自动合并 6 years ago
gcj 304677e7da Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj 91e3209ef9 【运输管理】 6 years ago
jenkins 6be1ef7dbd Jenkins自动合并 6 years ago
许心洁 5a1dc6dc7d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 67f7d66782 宁德现场问题#330 6 years ago
jokelone 874fd139dc Merge branch 'dev' into test 6 years ago
E ef9293867f 【bug6929 收货道口数量长度没有限制】【bug6928 收货道口为0时没有默认为1】 6 years ago
jokelone 0dfb948810 Merge branch 'dev' into test 6 years ago
许心洁 927579aca5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 fc663ee283 作业流程导入导出BUG#6189 6 years ago
陈思洁 45c1fc6571 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 129e60a6df 【KT-1284 计划拉动-生产计划管理】 6 years ago
gcj a6bb80a5a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj 2e98e17a05 【运输管理】 6 years ago
qianhs da2cfd77b0 【 增加一个扫描零件上的条码,累计数量达到零件标包后自动打印条码+按照主数据自动报工的界面】【bug6704】 6 years ago
陈思洁 7d07580a78 合并冲突 6 years ago
陈思洁 b9844c255b 生产计划表结构增加 6 years ago
gcj 3e6ca8d039 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
gcj a1a3d1e838 【Bug清单】------------------------------ 6 years ago
于学杰 67b5069c48 1. 增加分组提交的配置字段 6 years ago
jokelone a337f1824f Merge branch 'dev' into test 6 years ago
陈思洁 3a353b1539 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 1d5f4b38a4 【KT-1282 计划拉动-班次管理】 6 years ago
gcj 32dccc056c 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/sqlpack/WmsHqlPack.java
6 years ago
gcj 1e10bdee0c 【坤泰运输管理】 6 years ago
jokelone 056dbaacf2 Merge branch 'dev' into test 6 years ago
陈思洁 eb5f9610a8 【KT-1282 计划拉动-班次管理】 6 years ago
陈思洁 5797ec4b1b 新增工位表字段 6 years ago
陈思洁 4f67cc1310 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 61f3465255 新增工位表字段 6 years ago