3560 Commits (7496eb4a1b16f55950c76cd669681e285af2b1b8)
 

Author SHA1 Message Date
wei.peng 7496eb4a1b LAC 全部 CRUD 接口完成 6 years ago
wei.peng 4c6f0b0d57 添加 CRUD Base 6 years ago
陈思洁 935845704a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 e5b5891d23 bom信息中新增冗余字符 6 years ago
qianhs caf6dc17ab 【NC冻结】nc冻结 6 years ago
crish fd5c6b2c9d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 0824a58ead 安灯定时自处理job, 广播播报内容优化 6 years ago
钮海涛 1f9fc9f280 1:新增实现生产时间的计算逻辑 6 years ago
王杰 0c01648551 【需求:1088,设备维修作业】 6 years ago
王杰 09cff08e1e [需求1086,设备点检保养作业,第2次提交] 6 years ago
王杰 752476b3df [需求1086,设备点检保养作业,第2次提交] 6 years ago
wei.peng d5a45176d0 LAC 任务类型、指令集类型 对象优化 6 years ago
曾贞一 610a96d2ee Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 6b9c7b3ced 【VDA库存调整盘点】 添加供应商字段 6 years ago
许心洁 e12ba1d839 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
钮海涛 6816c7b566 1:新增实现生产时间的计算逻辑 6 years ago
wei.peng 5e78c31a70 LAC 名称修改 6 years ago
wei.peng e8f8c941c9 LAC 指令集类型CRUD接口完成
LAC 任务类型CRUD接口完成
6 years ago
许心洁 e593cc875d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
changjiang.gao 2ba7596a57 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
changjiang.gao 25f11781c1 盘点差异增加字段 6 years ago
许心洁 ba7fe81978 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 5956d5a08e 冲销:需求变更优化 6 years ago
王杰 07749b50ec [需求:1086, mes设备点检保养作业] 6 years ago
曾贞一 26b4a5c52c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 a9045ed403 bug 5953 6 years ago
陈思洁 aaa0636920 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 a54d711d95 #1085 BOM导入接口新增 6 years ago
crish 10bc56cf46 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 901e37d6e7 修复bug 6 years ago
许心洁 f9b09ce2c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 87ffdfd9a3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 18789939b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc ac7b0415ba 1083 添加枚举字段 6 years ago
汪云昊 5c67a7bb5f MySQL 数据库不支持 CAST AS DOUBLE,需要改成 CAST AS DECIMAL 6 years ago
王杰 081d792b98 mes设备通知 6 years ago
于学杰 9bce0549a7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
于学杰 dbc69e957a 1. 供应商物料实体增加字段 6 years ago
crish 35241794c9 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish bdb818930b 安灯广播,自处理 6 years ago
wei.peng 689f6057c1 添加查询账号接口 6 years ago
王杰 fa25769c50 mes枚举 6 years ago
王杰 0d0178545c mes设备 6 years ago
WYnneaoapc 44f2b1e826 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
WYnneaoapc e8336c85d7 idea 异常 文件格式化 6 years ago
changjiang.gao f2453163b6 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
changjiang.gao 3ab8cf112d 盘点条码差异 6 years ago
WYnneaoapc 1eca1a963a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java
6 years ago
WYnneaoapc 2da78c3237 idea 异常 文件格式化 + 包装扫描工步 6 years ago
jokelone 7139d9b5f1 解决冲突 6 years ago