汪云昊
|
2772ea6a2f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/pom.xml
# modules/i3plus-pojo-mes-pcn/pom.xml
# modules/i3plus-pojo-mes/pom.xml
# modules/i3plus-pojo-model/pom.xml
# modules/i3plus-pojo-platform/pom.xml
# modules/i3plus-pojo-ptl/pom.xml
# modules/i3plus-pojo-report/pom.xml
# modules/i3plus-pojo-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
wynne1005
|
763d72b128
|
dev合并麦格纳的test
|
5 years ago |
puxiao.liao
|
b8701bc398
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
7062e7a383
|
bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】
|
5 years ago |
joke.wang
|
14bb71f9f2
|
[料架条码打印查询修改]
|
5 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
5 years ago |
qianhs
|
ba4b450437
|
联调测试
|
5 years ago |
|
wynne1005
|
12e31f630b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
ba90a50621
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
qianhs
|
8c635c3557
|
联调测试
|
5 years ago |
|
qianhs
|
7244fb38b1
|
联调测试
|
5 years ago |
|
wynne1005
|
f8e0f5e37e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
e289414363
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
 曾贞一
|
46e0f502d0
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
曾贞一
|
a59a5e532e
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
|
曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
5 years ago |
wei.peng
|
bfc9be08e5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
b4f14112b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
|
wei.peng
|
cc7572ddd0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
袁津哲
|
94f25541aa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
5 years ago |
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
5 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
5 years ago |
|
wynne1005
|
c8af9ed6f8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
965a8d37cd
|
删除多余maven profile
|
5 years ago |
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
qianhs
|
836a4f710d
|
联调测试
|
5 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
5 years ago |
|
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
5 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
5 years ago |
 王杰
|
231345c135
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
cd99a63233
|
mes
|
5 years ago |
|
汪云昊
|
0d75c1eac7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
5 years ago |
|
曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
5 years ago |
|
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
5 years ago |
|
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
5 years ago |