袁津哲
|
1a74363541
|
优化实体字段
|
6 years ago |
puxiao.liao
|
4b3923a64d
|
bug8056【8056 car_no,driver_no这两个字段没有写在事务表中，导致wms_move_to_erp中没有】
|
6 years ago |
wynne1005
|
b5ecb91399
|
中航四月十号 内容提交
|
6 years ago |
joke.wang
|
4e8c4ae46f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
joke.wang
|
caf8feb374
|
[采集工步存入生产数据格式修改]
|
6 years ago |
|
joke.wang
|
11adb5ff09
|
[麦格纳问题：111 检测项数据报表]
|
6 years ago |
 钮海涛
|
05c1575e8f
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
钮海涛
|
01ae9caa8c
|
task:1496
|
6 years ago |
alwaysfrin
|
f4e9a80d79
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
alwaysfrin
|
14660641ba
|
hibernate优化
|
6 years ago |
wei.peng
|
fa42a25b96
|
异常处理优化
|
6 years ago |
|
puxiao.liao
|
63c827d0de
|
bug8050【8050 运输规则配置页面--新增成功，数据库有数据，但是页面不显示】
|
6 years ago |
|
joke.wang
|
1d50c135ac
|
[麦格纳问题：87 增加工单管理页面]
|
6 years ago |
 曾贞一
|
3bea17f2d7
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
b7e3aeef41
|
【8014 20011--报工记录表，查询数据重复---0415】
【8015 20011--报工记录报表，增加两列显示】
|
6 years ago |
|
钮海涛
|
4dee474c73
|
修改POM版本号
|
6 years ago |
|
钮海涛
|
417120358c
|
Merge branch 'test' into dev
|
6 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
陈思洁
|
cd810ce1fc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5a6c525d1f
|
【MES_生成条码模型增加时分秒字段】
|
6 years ago |
 王杰
|
e0a23b147e
|
mes enum
|
6 years ago |
|
王杰
|
3f3d0038e8
|
【任务：1608 数据监听预警配置，定时任务】
|
6 years ago |
qianhs
|
2e85d99380
|
联调测试
|
6 years ago |
|
wynne1005
|
dbba31670d
|
增加条码生产
|
6 years ago |
许心洁
|
4884f59072
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
2bc62e2444
|
动态查询：#需求变更 创建用户和更新用户也需要做成可选的
|
6 years ago |
|
wynne1005
|
17f6ac6609
|
删除重复字段
|
6 years ago |
|
wynne1005
|
07d8e12216
|
commit stationrequestbean
|
6 years ago |
|
wynne1005
|
2e177ba671
|
dev合并test test有修改
|
6 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
|
6 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
6 years ago |
|
wynne1005
|
763d72b128
|
dev合并麦格纳的test
|
6 years ago |
|
puxiao.liao
|
b8701bc398
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
puxiao.liao
|
7062e7a383
|
bug7935【7935 二维码收货-供应商批次格式-校验不通过系统异常】
|
6 years ago |
|
joke.wang
|
14bb71f9f2
|
[料架条码打印查询修改]
|
6 years ago |
|
wynne1005
|
581d900123
|
状态机model提交
|
6 years ago |
|
qianhs
|
ba4b450437
|
联调测试
|
6 years ago |
|
wynne1005
|
12e31f630b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wynne1005
|
ba90a50621
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
8c635c3557
|
联调测试
|
6 years ago |
|
qianhs
|
7244fb38b1
|
联调测试
|
6 years ago |
|
wynne1005
|
f8e0f5e37e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wynne1005
|
e289414363
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
46e0f502d0
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
6 years ago |
|
曾贞一
|
a59a5e532e
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
6 years ago |
|
曾贞一
|
35023af12c
|
【7988 20011--多级包装打印时母条码现在无法打印出来】
|
6 years ago |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
b4f14112b3
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
6 years ago |
|
袁津哲
|
94f25541aa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
袁津哲
|
4dc2996bdc
|
业务类型实体中新增是否启用波次字段
|
6 years ago |
宋军超
|
b3032ca8e8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
45dda6ea57
|
添加散件配置报文关系和工装明细实体
|
6 years ago |
|
袁津哲
|
cbe3094f2a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
ea9457a191
|
修复WMS波次计划实体类字段
|
6 years ago |
|
钮海涛
|
cfd3f8d58f
|
冲突解决
|
6 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
6 years ago |
|
陈思洁
|
30608f886b
|
解决冲突
|
6 years ago |
|
陈思洁
|
d9d2113f75
|
【MES_增加枚举】
|
6 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
|
钮海涛
|
53dc57a03e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
df1cbc9449
|
新增供货追踪接口
|
6 years ago |
|
qianhs
|
836a4f710d
|
联调测试
|
6 years ago |
|
宋军超
|
b3cecc9481
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
f64a543a4a
|
添加产品流程批量配置功能
|
6 years ago |
|
袁津哲
|
bcec12cb38
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
3442fd4801
|
波次规则明细新增开窗查询字段
|
6 years ago |
|
袁津哲
|
9f918b6664
|
修改波次规则和范围枚举类字段值名称
|
6 years ago |
|
王杰
|
cd99a63233
|
mes
|
6 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
|
6 years ago |
|
wynne1005
|
032fb350c8
|
queueordermodel添加构造函数
|
6 years ago |
|
曾贞一
|
57f2177ef6
|
【波次合并规则--枚举查询错误】
|
6 years ago |
|
袁津哲
|
ae1c6ef8fd
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
8a836e340a
|
优化枚举查询报错问题
|
6 years ago |
|
puxiao.liao
|
d2fb33d888
|
bug1536【1536 PDA组件修改增加录入车牌信息功能】
|
6 years ago |
|
puxiao.liao
|
053e81b861
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
puxiao.liao
|
a432b77ca0
|
任务1536【1536 PDA组件修改增加录入车牌信息功能】
|
6 years ago |
|
曾贞一
|
c0e3f1cb4f
|
【找回文件】
|
6 years ago |
|
曾贞一
|
e84d74d7be
|
【冲突文件找回】
|
6 years ago |
|
王杰
|
5fc4c6c025
|
mes
|
6 years ago |
|
曾贞一
|
c926992611
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
4dae2eea7d
|
【MES 导入】
|
6 years ago |
|
钮海涛
|
52a5c1e2f8
|
Merge branch 'test' into dev
|
6 years ago |
|
qianhs
|
851bd1feec
|
联调测试
|
6 years ago |
|
wynne1005
|
4324457b61
|
merge
|
6 years ago |
|
wynne1005
|
dce52df770
|
组件传参给工步
|
6 years ago |
|
qianhs
|
241ec4974b
|
联调测试
|
6 years ago |
|
wynne1005
|
351ea8755e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wynne1005
|
6a36ad7601
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
6 years ago |
|
袁津哲
|
15035d2851
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
3529d1b845
|
枚举类修改规则范围和规则值
|
6 years ago |
|
钮海涛
|
8c4cb0748b
|
任务【1483】：LES-新增拉动规则表
任务【1484】：LES-物料表属性变更
任务【1485】：LES-库位物料属性变更
任务【1486】：LES-存储区属性变更
任务【1487】：LES-生产计划属性变更
任务【1488】：LES-拉动任务属性变更
任务【1489】：LES-入场管理新增窗口时间表
任务【1490】：LES-巡线拉动
任务【1491】：LES-计划拉动
任务【1492】：LES-过点拉动
任务【1493】：LES-手工拉动
任务【1494】：LES-预留外部拉动接口
|
6 years ago |
zcg
|
83d7a618bf
|
按钮组件model修改
|
6 years ago |
|
zcg
|
9ab0d784dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
3654d60214
|
【bug7947】PLC监听工步装队列无法显示
|
6 years ago |
|
汪云昊
|
2a80a4c720
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
aeda8d8287
|
版本调整
|
6 years ago |
|
zcg
|
73f647e3b4
|
枚举修改
|
6 years ago |