许心洁
|
60c25d7a71
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
许心洁
|
ccb29c5903
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
 王杰
|
f5c8e36ac9
|
【需求：1189，产品条码工步】
|
6 years ago |
|
王杰
|
649ffb548d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
e30ba280e0
|
解决冲突
|
6 years ago |
|
许心洁
|
208410340e
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
6 years ago |
|
许心洁
|
b6e27c33c8
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
jokelone
|
a04b8f7c57
|
【bug：5791 生产工单明细1】
|
6 years ago |
|
jokelone
|
5fd619ac79
|
【bug：5791生产工单明细】
|
6 years ago |
|
王杰
|
acaacf63a3
|
Merge branch 'dev' into test
|
6 years ago |
WYnneaoapc
|
b4cea27a5b
|
代码审核 修改2
|
6 years ago |
|
WYnneaoapc
|
56e6cf7918
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
|
WYnneaoapc
|
029c9b6bc8
|
代码审核 修改1
|
6 years ago |
|
许心洁
|
970105ac19
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
9a6c5cfda3
|
【任务：1163客户订单】
|
6 years ago |
陆卫豪
|
64be0c721c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
9418a0838b
|
【任务：1129 产品编码配置基础数据】
|
6 years ago |
|
陆卫豪
|
46fc5f5750
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
a6e8265e29
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jokelone
|
90ec0f107e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
32dbaed8fe
|
【任务：1129数据对象、对象结构、产品包装关系基础数据】
|
6 years ago |
|
WYnneaoapc
|
4308084ca3
|
数据抽取修改 1130
|
6 years ago |
|
陆卫豪
|
07a80e7fd2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
851ba63e7c
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
陆卫豪
|
576f02f75d
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
WYnneaoapc
|
9ad66157a8
|
数据同步优化 1078-4
|
6 years ago |
|
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
6996dc2273
|
6204: MesConfig配置添加业务主键
|
6 years ago |
|
WYnneaoapc
|
35f625ac21
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
563955570d
|
数据同步优化 1078
|
6 years ago |
|
王杰
|
a95b6baae1
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
828cf66784
|
【需求：1090 工序BOM，物料绑定记录删除多余字段】
|
6 years ago |
|
王杰
|
cb319e4304
|
【需求：1126，设备周期计划】
|
6 years ago |
|
王杰
|
7291a7a85c
|
Merge branch 'dev' into test
|
6 years ago |
汪云昊
|
86a18d730a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
9907813aed
|
Lac调度实体
|
6 years ago |
|
许心洁
|
c9f26c22c1
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
jokelone
|
6fd7e6be5f
|
【需求：1092 维修类型】
|
6 years ago |
|
王杰
|
75ce77f6f1
|
【需求：1126，设备周期计划】
|
6 years ago |
|
王杰
|
347c47c82f
|
【需求：1125，设备报表】
|
6 years ago |
|
王杰
|
1846c6f4f8
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
438517be44
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
|
6 years ago |
|
jokelone
|
6c847cf305
|
【需求：1091 返厂返修添加字段和枚举】
|
6 years ago |
|
王杰
|
2069d6a3ae
|
【需求：1125，设备报表】
|
6 years ago |
|
王杰
|
9446a76159
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
b668879f9d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
42ec1b3693
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
2f382d37cc
|
【需求：1124，首检件配置】
|
6 years ago |
|
王杰
|
dcaf007f4d
|
【需求：1107，生产工单首检件】
|
6 years ago |