陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
5 years ago |
 王杰
|
ed61052742
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
5 years ago |
袁津哲
|
1a74363541
|
优化实体字段
|
5 years ago |
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
5 years ago |
 钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
01ae9caa8c
|
task:1496
|
5 years ago |
alwaysfrin
|
f4e9a80d79
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
alwaysfrin
|
14660641ba
|
hibernate优化
|
5 years ago |
wei.peng
|
fa42a25b96
|
异常处理优化
|
5 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
302529199b
|
Merge branch 'master' into test
|
5 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
5 years ago |
|
王杰
|
08e5e4a349
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e0a23b147e
|
mes enum
|
5 years ago |
|
王杰
|
2b790d91ea
|
Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into dev
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
5 years ago |
qianhs
|
2e85d99380
|
联调测试
|
5 years ago |
wynne1005
|
dbba31670d
|
增加条码生产
|
5 years ago |
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
2bc62e2444
|
动态查询：#需求变更 创建用户和更新用户也需要做成可选的
|
5 years ago |
|
wynne1005
|
17f6ac6609
|
删除重复字段
|
5 years ago |
|
wynne1005
|
07d8e12216
|
commit stationrequestbean
|
5 years ago |
汪云昊
|
5a5be03ce6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
5 years ago |
|
汪云昊
|
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 |
|
wynne1005
|
2bb32bb6fc
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
wynne1005
|
763d72b128
|
dev合并麦格纳的test
|
5 years ago |
|
wynne1005
|
703a3f2195
|
更改失败消息 为false
|
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 |