756 Commits (77d7ac18adab54ad92b17b9e1bf1689906371db8)

Author SHA1 Message Date
陈思洁 c4032b8ed5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 320969f2f0 【1527 半成品标签自动打印】 5 years ago
贾文涛 048419d823 修改打包时版本号的定义,后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。 5 years ago
wynne1005 4b4bf4e433 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
钮海涛 9d5567f4a6 Merge branch 'test' into dev 5 years ago
王杰 e3a9defdab 任务1528,生成并打印门锁标签 5 years ago
wynne1005 6336ebd8e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
wynne1005 8b750e6a76 修改生产数据类型 5 years ago
王杰 a9a7d78bd5 解决冲突 5 years ago
joke.wang 9d55a2a8b3 [解决冲突1] 5 years ago
joke.wang 8b681af622 [解决冲突] 5 years ago
joke.wang 045dc01479 [任务:1479 料架条码打印] 5 years ago
王杰 f578311f55 数据复核 5 years ago
qianhs 564ba1e116 【1472 工步-设备状态采集(原PLC采集【设备状态】)】 5 years ago
qianhs c53999b0d2 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke.wang 79788daf8b pom 修改 5 years ago
zcg 74e4aa953b 【任务 1480 照片采集】 5 years ago
joke lin 62cee148cd [bug: 7875 客户JIT生产工单] 5 years ago
钮海涛 9da6628884 Merge branch 'master' into test 5 years ago
陈思洁 cc207240b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
陈思洁 bacab3fb88 【MES_新增设备工装关系和工装操作记录pojo】 5 years ago
王杰 9f8e51830e mes enum 5 years ago
qianhs 8d18c61d63 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
joke lin 126440c976 [任务:1435 客户JIT导入] 5 years ago
陈思洁 310bf49af6 【MES_校验是否换膜并推送换模信号 】 5 years ago
陈思洁 22788f1c44 还原POM文件TEST-DEV 5 years ago
qianhs a93882c881 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
曾贞一 779b9d209c 【修改 DEV-pom.xml】 5 years ago
qianhs 26bf62fbe7 设备状态采集工步 5 years ago
陈思洁 474bb995d6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 5 years ago
王杰 7d743c2c7f Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
陈思洁 b3e38170e6 【1440 PLC采集工步【生产数据】】 5 years ago
luweihao e90ea98d1f 解决冲突 5 years ago
luweihao 03f1c4fddf 修改生产数据结构 5 years ago
王杰 af4cb74392 Merge branch 'dev' of jhforever.wang/wangjie-i3plus-pojo into test 5 years ago
joke lin 3b928c6ddc [bug: 7637 生产数据] 5 years ago
joke lin e8f48bcb04 [bug: 7637 生产数据查询] 5 years ago
王杰 b6a83fff5d Merge branch 'dev' into test 5 years ago
zcg 3d28840bae 【新增枚举,pojo】 5 years ago
luweihao 16879a4f20 Merge branch 'dev' into test 5 years ago
陆卫豪 a65350bbf8 Merge branch 'dev' of chungui.zhou/i3plus-pojo into dev 5 years ago
luweihao 12579c7a14 还原pom 5 years ago
luweihao b52bb02d73 task `1430` 工位扫描,产品信号监听,队列监听 5 years ago
zcg 416c2ceffc 【任务 1443 excel模板导入功能修改】 5 years ago
zcg 9388e3b4f2 【pojo 冲突提交】 5 years ago
luweihao 679319635a task `1430` 工位扫描,产品信号监听,队列监听 5 years ago
陈思洁 4fec84f810 【PTL_PLC配置表增加字段】 5 years ago
陆卫豪 60ab731ffd Merge branch 'dev' of huasheng.qian/i3plus-pojo into dev 5 years ago
joke lin d4e1e854c5 [任务:1441 plc推送数据] 5 years ago
qianhs 65572b34a0 【1432 工位扫描-ESOP展示组件开发,队列组件调整】【工位扫描-ESOP展示组件开发,队列组件调整】 5 years ago