1854 Commits (ad1513770463b7d25cba13de7eccf529e1d0685b)

Author SHA1 Message Date
许心洁 01d4963c57 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 9200080178 MES-POJO添加产品配置名称,产品类型名称作为冗余字段 6 years ago
柯裕 7ba4c4a6e4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 8aa958b902 ANDON统计报表更新 6 years ago
许心洁 0bd995e990 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 bb14454170 MES—POJO实体复制+Dao层少了@Service注释+任务生成详细日志+交易处理组件:出入库:目的库位的数量累加依据改为目的质量状态 6 years ago
柯裕 d60368b227 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 d62904cac7 ANDON统计报表更新(待改进) 6 years ago
wei.peng 13c0e5afeb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter b4ca1fe409 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter a42bb71aee docker配置文件修改 6 years ago
wei.peng 0e79a6cdc9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 7831940c2a FastDfs 添加日志 6 years ago
许心洁 c99125b1a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 76e553234e MES-JIT队列组件+WMS-GOJS位置字段添加@Lob注解 6 years ago
柯裕 3f961e7923 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 00086912bc ANDON实体更新 6 years ago
yiming.gu 08d0b32ea3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 85c4f94dcb MES model转移至pojo-mes目录下 6 years ago
柯裕 b581cbee63 ANDON实体更新 6 years ago
yiming.gu 78145e44e4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 26fc821d1a MES model修改 6 years ago
crish ce864025e1 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish d0840978de PLC数据采集优化
Signed-off-by: crish <570360737@qq.com>
6 years ago
yihang.lv 21c60292bf Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 245596ee0b sweb 导入非标准包装修改 6 years ago
汪云昊 93ace83b5f 长文本数据类型 6 years ago
yiming.gu 5fc11292ea Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 280f9a2233 MES新增班次休息表、物料关键数据关系表 6 years ago
alwaysfrin 41a8adcea2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 309f3f2282 事务调整及demo 6 years ago
wei.peng 302ac8a7e8 初始化功能目录 6 years ago
许心洁 bdff2c3e2f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 8e2e1f6543 MES:流程配置添加工序,工步基础数据接口 6 years ago
柯裕 d9b263d10c ANDON_HQLPACK更新 6 years ago
jiajack 550f2132e3 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPLCConfigureRepository.java
6 years ago
jiajack 21f6d4eaf8 PLC配置 6 years ago
crish 5841ae2ed2 错误文件修改
Signed-off-by: crish <570360737@qq.com>
6 years ago
yiming.gu 623dfed52b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 090fdca183 MES新增客户零件关系 6 years ago
crish 072bccc0e5 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 7caec34dad PLC设备配置实体
Signed-off-by: crish <570360737@qq.com>
6 years ago
柯裕 171675ffb7 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 2e4f792afa ANDON更新 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
alwaysfrin d00c228823 事务调整及demo 6 years ago
Silliter 05baaba8da Merge remote-tracking branch 'origin/dev' into dev 6 years ago
Silliter 630ad20587 开发安灯呼叫升级定时任务 6 years ago
crish 018d4a0404 PLC数据采集实体
Signed-off-by: crish <570360737@qq.com>
6 years ago
crish 7374fd34bb Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish e22ecf30ef 添加字段
Signed-off-by: crish <570360737@qq.com>
6 years ago
Silliter df02c5d1b2 开发安灯呼叫升级定时任务 6 years ago
yiming.gu 6405bcefcb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 7c7fb30e1a MES新增设备查询条件 6 years ago
yiming.gu 2d3cc6ea2b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 316077d263 MES新增工序流程工作单元对应表 6 years ago
柯裕 5b041db0c9 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 021e308a9e ANDON实体更新 6 years ago
Silliter 3111806b7b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter e31b35b6e3 安灯实体索引加入 6 years ago
crish 7bd4ea8be9 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 52d27b663b 扭矩采集
Signed-off-by: crish <570360737@qq.com>
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
柯裕 26693e107f ANDON实体更新 6 years ago
jiajack 564de0acdd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 9be4b8a7d0 工位程序业务编写 6 years ago
yiming.gu 2ac8437b76 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu c60dd62f32 新增工步、工序、工步参数查询条件 6 years ago
Silliter 251ce84d73 开发安灯呼叫升级定时任务 6 years ago
yihang.lv 40b0dc430e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv c5a4a5c023 sweb 订单按天发布 6 years ago
Silliter 37a4e42a87 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c1949e099c 开发安灯呼叫升级定时任务 6 years ago
alwaysfrin 7edd35e688 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv c8240076bc Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 7db7dee50c sweb 订单发布状态取子表 6 years ago
wei.peng aafa463afc 添加英文的时候字段长度不够,修改字段类型 6 years ago
柯裕 1d945dbc04 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 d3be2fb6df ANDON更新 6 years ago
alwaysfrin 4b2a19a3fb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 a8c2474397 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
刘敏 b90139312c 条码管控枚举添加 6 years ago
Silliter ad28d11486 安灯项目优化 6 years ago
alwaysfrin a1ccd25594 事务调整及demo 6 years ago
Silliter b70069e7ce Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 791d6084bc 安灯看板开发 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
jiajack 2617793d0f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 83fb4ab8c0 工位程序业务编写 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
Silliter 42e8c4e960 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 7d762dac6a 按灯系统配置开发 6 years ago
yihang.lv 73330e3ba4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv 458cf3610f sweb 订单发布修改子表状态 6 years ago
许心洁 7cce6b828f Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 9a4323614c 流程新增与流程设计分开 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
柯裕 e8238796c3 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 72ac3490e4 ANDON枚举 6 years ago
yihang.lv 256c688304 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv b4f07905e5 sweb 发布列表修改,按天发布 6 years ago
Silliter e2ce7c5ce9 物理按灯开发 6 years ago
Silliter dbfae39ea6 安灯项目优化 6 years ago
柯裕 44e2a13ff5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 b56994fcca ANDON更新 6 years ago
Silliter 6b295aaace Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 8c5970d500 物理按灯开发 6 years ago
柯裕 c161cef319 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 dfba307e43 ANDON_HQLPACK更新 6 years ago
许心洁 e48c94caa8 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 cca408fcf0 监控台:防止出现负库存+流程配置:流程添加POSITION字段 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
crish 28caf8bf4c Merge remote-tracking branch 'origin/dev' into dev 6 years ago
crish 275a991593 实体属性不正确
Signed-off-by: crish <570360737@qq.com>
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
柯裕 ba368a0327 ANDON更新 6 years ago
柯裕 8ccc265f0d ANDON枚举更新 6 years ago
柯裕 1977dc230b ANDON实体创建 6 years ago
柯裕 1b702d0821 ANDON_HQLPACK更新 6 years ago
Silliter c9c470a27f 开发物理安灯业务 6 years ago
Silliter da56d45a68 安灯项目优化 6 years ago
Silliter 47bd2c0aa7 安灯项目开发 6 years ago
柯裕 4895b3ae85 ANDON实体更新 6 years ago
柯裕 02281095ea Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 0e090c7e08 优化POJO 6 years ago
yiming.gu 9281b74453 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu f844f89f5d andon新增班次表 6 years ago
yihang.lv 263fa2be19 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv fe23d7003f sweb po详情级联查询重写,发布订单接口重写 6 years ago
柯裕 060fa564da 更新AndonHqlPack 6 years ago
Silliter 81b03ff299 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu 68a66c67b0 设备pojo新增工作中心代码,区域代码 6 years ago
yiming.gu 15b5edfaec Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yiming.gu b1f513d786 新增设备pojo,组织模型model 6 years ago
Silliter 4c11c1645d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
alwaysfrin 31bdf2561a Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter 6d8e0f6c82 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter e02f61c51f 安灯项目优化 6 years ago
alwaysfrin 5fa2b67880 安灯源码位置错误,重新调整 6 years ago
许心洁 c7e417e644 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 a65b3d6fb2 交易处理组件基础方法维护+流程配置+任务生成代码结构层优化+交易处理主程序查询移动单条件修改调工厂代码(代码逻辑错误) 6 years ago
柯裕 a11d2c04d5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 f6c90bd96b ANDON创建dao 6 years ago
Silliter 7f8c0303fe Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter f89090c40e 按灯项目实体创建 6 years ago
柯裕 97aa0ea44c ANDON实体创建 6 years ago
crish dd477bdf94 生产计划
Signed-off-by: crish <570360737@qq.com>
6 years ago
crish 571ad144b7 解决冲突
Signed-off-by: crish <570360737@qq.com>
6 years ago
crish 47ab4c7a45 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter e38a7de8ea Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 c84df68fac Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 81821c70a8 移库单 生成条码问题 6 years ago
柯裕 9ee049e086 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
柯裕 5ef8089c02 ANDON实体创建 6 years ago
柯裕 30db0904a4 ANDON实体创建 6 years ago
Silliter 2b37ad77c5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
Silliter c5093b073c 安灯实体优化 6 years ago
许心洁 37efbf718e Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 4cf5fbc2b7 #4091+流程配置复制流程+作业步骤参数,作业组件,作业组件参数,作业流程基础数据接口代码调整 6 years ago
Silliter 24af646ad8 安灯项目开发环境搭建 6 years ago
Silliter 10844622a7 1.优化查询语句
2.流程管家查询条件加上工厂字段
6 years ago
yihang.lv 58bc54f3c6 sweb 订单发布代码修改bug 6 years ago
crish c771fa925b 更改model位置
Signed-off-by: crish <570360737@qq.com>
6 years ago
yihang.lv e0383285b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
yihang.lv e93605135c sweb 发布列表重写 6 years ago
许心洁 c03810358b Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 58c29f5aee 作业流程接口+作业组件接口联调优化 6 years ago
wei.peng 7349c5fb3a 添加注释 6 years ago
alwaysfrin f343ea865c 安灯和硬件适配初始化 6 years ago
许心洁 24d115be6d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 35690ce138 作业流程界面+后端分页查询接口 6 years ago
jimmy bc1b0b7e90 业务类型表 字段数据类型修改 6 years ago
Silliter b2c5494983 联调系统配置接口 6 years ago
jimmy fc15efe67c 开发业务类型增删改查接口 6 years ago
jiajack 7728bbf61c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 9137fe9c4f 工位程序业务编写 6 years ago
Silliter 733b65e8d5 流程管家优化:1.缓存重新规划
2.重入保存上一步的回显
6 years ago
许心洁 85a44b1baa Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 19f30ce4f9 流程配置+定时处理错误移动单给错误信息赋值过长 6 years ago
jimmy b44a178ec6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jimmy f39abebd90 qc HQL修改 6 years ago
jiajack d6c7e39989 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
jiajack 038484e7ac 工步调度业务完善 6 years ago
yunhao.wang 099a58a14d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
yunhao.wang 7e8730ea9f 自定义按钮功能接口
消息优化
6 years ago
crish 5daf6d960f hqpPack优化
Signed-off-by: crish <570360737@qq.com>
6 years ago
jimmy b1d8addd0f Merge remote-tracking branch 'origin/dev' into dev 6 years ago
jimmy c72c2fa891 散件盘点 6 years ago
刘敏 7ffa55fbe8 查询条件方法优化 6 years ago