538 Commits (d06b6cf062ce40982fb88173d5ec050e5d9c705b)

Author SHA1 Message Date
柯裕 10cc2ac052 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 d081c16c61 安灯类型,状态,子类型,基础数据开发 6 years ago
汪云昊 4cbc41a959 细节优化 6 years ago
柯裕 3cba9077fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 f1e8f07a90 新增需求:自处理 6 years ago
wei.peng 7ef2eb0c6e 报表 表单打通 6 years ago
Silliter 1adcd23c6f 呼叫升级和响应升级优化 6 years ago
柯裕 47baf16e0f ANDON动作 6 years ago
Silliter 9c5aab7215 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c9243ccad0 呼叫升级和响应升级优化 6 years ago
陈思洁 e33c7c2465 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 8e7b3d61e7 枚举修改 6 years ago
Silliter 27b32626b3 开发主动升级和启动产线业务 6 years ago
crish 701430066e 事务管理
Signed-off-by: crish <570360737@qq.com>
6 years ago
crish 3a7aace277 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 1efd33975d 生产队列,生产计划,生产工单优化和bug修复
Signed-off-by: crish <570360737@qq.com>
6 years ago
Silliter 8a298687c2 开发andon呼叫停止产线 6 years ago
Silliter 9eb6e82306 开发andon呼叫停止产线 6 years ago
jiajack c8a9edab64 质量判定业务修改 6 years ago
曾贞一 4e45f813dc CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
6 years ago
许心洁 9200080178 MES-POJO添加产品配置名称,产品类型名称作为冗余字段 6 years ago
Silliter a42bb71aee docker配置文件修改 6 years ago
alwaysfrin 65b5ac3803 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin cc02090910 事务调整及demo 6 years ago
Silliter 630ad20587 开发安灯呼叫升级定时任务 6 years ago
许心洁 b5696a63f7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 e79987d235 MES流程配置接口(流程,产品流程配置) 6 years ago
刘敏 b90139312c 条码管控枚举添加 6 years ago
yiming.gu 2eb732c7df Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
6 years ago
yiming.gu 7c647c7844 1、班次pojo修改
2、andon项目新增组织模型基础数据
6 years ago
柯裕 c1bf54f9c8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 5a3e2996c7 findMaxByProperties更新 6 years ago
crish 8c443c3afb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish d6221c39ae 生产模块bug修改
Signed-off-by: crish <570360737@qq.com>
6 years ago
柯裕 72ac3490e4 ANDON枚举 6 years ago
柯裕 4a84e1e8ca Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 95789ab615 ANDON实体枚举更新 6 years ago
yiming.gu 12e555e3a4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu c7e5fc732e mes组织模型菜单等级枚举修改 6 years ago
柯裕 56e17f62e9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 593a062e9f ANDON枚举 6 years ago
yiming.gu 494fc4aa70 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 486dda639f pcn队列pojo vin字段改为string型 6 years ago
柯裕 8ccc265f0d ANDON枚举更新 6 years ago
Silliter c9c470a27f 开发物理安灯业务 6 years ago
Silliter 47bd2c0aa7 安灯项目开发 6 years ago
许心洁 4cf5fbc2b7 #4091+流程配置复制流程+作业步骤参数,作业组件,作业组件参数,作业流程基础数据接口代码调整 6 years ago
alwaysfrin f343ea865c 安灯和硬件适配初始化 6 years ago
Silliter b2c5494983 联调系统配置接口 6 years ago
许心洁 85a44b1baa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago