宋军超
|
69b620336f
|
散件BOM导入
|
5 years ago |
qianhs
|
ca85c59cdb
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
|
5 years ago |
|
qianhs
|
20f5bfc9eb
|
wms数据同步迁移至mes
|
5 years ago |
 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
5 years ago |
|
王杰
|
94fed3b9b2
|
Merge branch 'test' into dev
|
5 years ago |
陈思洁
|
59cbfbf293
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
08ec98305b
|
【1581 工位扫描-记录换模时间 -校验逻辑调整】
|
5 years ago |
|
王杰
|
b1018dbd39
|
[平台；]
|
5 years ago |
 钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
5 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
5 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
e0a23b147e
|
mes enum
|
5 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
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
|
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 |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
5 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
5 years ago |
 曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
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 |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
5 years ago |
|
钮海涛
|
cfd3f8d58f
|
冲突解决
|
5 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
5 years ago |
|
陈思洁
|
30608f886b
|
解决冲突
|
5 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
5 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
5 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
5 years ago |
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
5 years ago |
|
王杰
|
cd99a63233
|
mes
|
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 |
|
曾贞一
|
c0e3f1cb4f
|
【找回文件】
|
5 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
5 years ago |
|
曾贞一
|
c926992611
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
4dae2eea7d
|
【MES 导入】
|
5 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
5 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
5 years ago |
|
袁津哲
|
15035d2851
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
袁津哲
|
3529d1b845
|
枚举类修改规则范围和规则值
|
5 years ago |