 钮海涛
|
b57ae573ed
|
合并test代码
|
5 years ago |
|
钮海涛
|
4ec6267b4e
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
f63813d66d
|
合并master代码
|
5 years ago |
|
钮海涛
|
ceebe541f2
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
5 years ago |
joke.wang
|
0009db6b33
|
工位技能查询bug修复
|
5 years ago |
|
joke.wang
|
7a33df666b
|
JSA JSP表增加索引
|
5 years ago |
|
joke.wang
|
148ef03e78
|
看板产线员工能力矩阵
|
5 years ago |
puxiao.liao
|
e250883f22
|
Fix bug#12004
19058-KT其他出库用例
|
5 years ago |
 王杰
|
21672237f5
|
Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test
|
5 years ago |
|
王杰
|
e2d6b573f0
|
不良记录报表 报工报表
|
5 years ago |
|
王杰
|
3636b75780
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
e21e49ae93
|
不良处理增加展示字段
|
5 years ago |
simon
|
0b68fdbee3
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
joke.wang
|
445f6b309c
|
备件消耗替代增加查询字段
|
5 years ago |
Dominic_Xiao
|
8e3943b306
|
Merge remote-tracking branch 'remotes/origin/test' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PackageDetailModel.java
|
5 years ago |
|
王杰
|
c615475dee
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
simon
|
52974a9633
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon
|
d3bcf1499e
|
去掉新增字段非空校验
|
5 years ago |
许心洁
|
0f5ab7b144
|
BUG#12609
|
5 years ago |
|
Dominic_Xiao
|
183d976c38
|
新增卡斯马展示组件模型
|
5 years ago |
|
Dominic_Xiao
|
27d76d86ae
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
Dominic_Xiao
|
a0776b7401
|
更新卡斯马展示组件,新增展示组件模型
|
5 years ago |
|
许心洁
|
79ee6eb901
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
359e085aac
|
BUG#12430
|
5 years ago |
陈思洁
|
92b395ad3f
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
88376bb350
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
陈思洁
|
ddc00a617b
|
【冲突】
|
5 years ago |
|
陈思洁
|
2de0d76af3
|
【2958 11 2.5.3 热处理上件】
|
5 years ago |
|
许心洁
|
063ba20f74
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
8e5c2f4b00
|
BUG#12170,12417,12166,12437,12452
|
5 years ago |
|
王杰
|
08fc0b54c6
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
joke.wang
|
22411fa928
|
备件导入增加列
|
5 years ago |
汪云昊
|
f2180f18f3
|
revert(pojo):还原pom版本
|
5 years ago |
|
汪云昊
|
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 |
|
王杰
|
b7e2ddd2c2
|
包装明细 增加索引
|
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 |