7862 Commits (378205ef61ebd2810b321f4fcbe8cb250c8ea7be)
 

Author SHA1 Message Date
汪云昊 378205ef61 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 cc947c08f5 revert(pojo):还原pom版本 5 years ago
汪云昊 8f899f2f46 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
simon faad8cf4c8 修复取消必填字段 5 years ago
汪云昊 fdec58c92a feat(form):表单导入功能支持 5 years ago
钮海涛 4dd875a691 Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 156b515497 修复SWEB问题 5 years ago
joke.wang 1f306924e4 看板自定义参数页面 5 years ago
宋双双 42feb06058 删除 'modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackage' 5 years ago
simon d8409c5b57 修改文件格式 5 years ago
Dominic_Xiao 22a88a4dc0 卡斯马定时同步实体类 5 years ago
Dominic_Xiao 452024abf6 删除多余类 5 years ago
Dominic_Xiao 13bd15d997 回滚PCN实体类 5 years ago
Dominic_Xiao d8c52a0534 新增导包 5 years ago
Dominic_Xiao f551ede492 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainerLocation.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartContainerCapacity.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesContainerLocationRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerSnRuleRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPartContainerCapacityRepository.java
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
5 years ago
Dominic_Xiao 61638c391a 包装详情表新增容器位置字段 5 years ago
Dominic_Xiao 785e8dbfe8 包装详情表新增容器位置字段 5 years ago
Dominic_Xiao f1fedb53f4 增加卡斯马业务pojo 5 years ago
Dominic_Xiao eb7ed898df 增加卡斯马业务pojo 5 years ago
Dominic_Xiao 8d0e2b942b 增加卡斯马业务pojo 5 years ago
puxiao.liao dc3e344f11 Fix bug#12401
19048-发运单支持关联多个470单据号
5 years ago
Dominic_Xiao e919987d68 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
5 years ago
simon 7d451dc136 Merge remote-tracking branch 'origin/test' into test 5 years ago
joke.wang 928c643031 看板自定义参数 5 years ago
许心洁 4300201f99 BUG#12430,12495 5 years ago
simon 4c1add6ba4 修改中文描述 5 years ago
许心洁 a5c78ae005 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 cbd0b1f136 BUG#12496 5 years ago
王杰 2612101cc1 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 fa01ec478a Mes_Package 表加索引 5 years ago
许心洁 e59f67e84b Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
钮海涛 1842d1de7c Merge remote-tracking branch 'origin/test' into test 5 years ago
钮海涛 e3e4e1fc84 修复坤泰问题 5 years ago
joke.wang 058bd05b4a mgn-bj esop展示组件优化 5 years ago
陈思洁 14f9dbed22 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 c6a3428cbe 【12420 19048 喷涂二检增加UNPACK功能 20201112】
12391 19048-条码补打(包装)增加关联批次查询条件-20201112
开线管控问题
5 years ago
许心洁 ecdc5888a4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
许心洁 e5aefee838 BUG#12166 5 years ago
Dominic_Xiao de51b68790 新增表:产品缺陷位置 5 years ago
Dominic_Xiao 395039e901 新增三个字段 5 years ago
Dominic_Xiao 31a1c64f69 新增字段:缺陷位置代码 5 years ago
宋军超 84986eb644 添加天津报工报表 5 years ago
simon cea2d334e3 中航-修复公差上线和公差下线赋值问题 5 years ago
Dominic_Xiao ea1d51f32c 删除无用类 5 years ago
Dominic_Xiao 5780306e94 增加序列化 5 years ago
汪云昊 3af9790a9e refactor(impp):调整描述注解 5 years ago
汪云昊 206e5f8d20 feat(form):支持导入数据 5 years ago
puxiao.liao 89bf22521a Fix bug#12380
19048-支持批量下发BOM的功能
5 years ago
王杰 132327d897 Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
王杰 86998e109e 总装 质量判定 5 years ago