328 Commits (544944d31cbb9848a71190aef8fd33db55ddaf0e)

Author SHA1 Message Date
陈思洁 d0e6d30a9e #6639 【VDA生产领料-FIFO跳过-系统异常】 6 years ago
陈思洁 42a6f8a02d 【#1219 在宁德现有生产扣减JOB基础上增加生成领料单功能】 6 years ago
许心洁 48e136c4aa 任务列表展示创建人 6 years ago
汪云昊 f0e77305dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 3856a6d600 LAC调整微服务指令集操作方式
OPC UA工具订阅方式调整
6 years ago
曾贞一 ff1f561b9d 消息样式实体类 增加一条 6 years ago
汪云昊 c4ed0f1f37 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 12ba5d2ff3 lac微服务模式优化 6 years ago
许心洁 8d6a2b53b1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 b7c6189308 生产汇报JOB优化(新增根据多个属性值将对象集合进行分组的公共方法)+标准收货速度优化(30%) 6 years ago
汪云昊 7cb9ffd37b Lac细节优化
OPC调整
6 years ago
WYnneaoapc 360f908ae4 获取生产数据 6283 6 years ago
许心洁 5dc8ffb394 日志处理队列V1.0 6 years ago
wei.peng da7ba77dab LAC 跨服务调用软适配接口完成 6 years ago
汪云昊 154bba4b3b LAC 调度模式优化 6 years ago
汪云昊 cfd7f5276e 实体调整 6 years ago
汪云昊 50bf9300ba LAC 调度模式完成 6 years ago
汪云昊 86a18d730a Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 9907813aed Lac调度实体 6 years ago
wei.peng aeff042046 添加 组织代码查询 6 years ago
WYnneaoapc 3dbbee3c60 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 3e9cc95017 pojo-model加入andon-pojo依赖 6 years ago
crish 2906667856 mes定时获取安灯安灯任务信息 6 years ago
WYnneaoapc b47f97fa05 1050-2 工位监控 6 years ago
许心洁 5956d5a08e 冲销:需求变更优化 6 years ago
许心洁 18789939b0 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 689f6057c1 添加查询账号接口 6 years ago
changjiang.gao 69e8357c69 条码数量编辑 6 years ago
许心洁 a1597c089c 成品冲销+导入转换格式(就一个不知道是什么单导入) 6 years ago
crish 9f9874902d 冲突解决 6 years ago
曾贞一 e603ac66a7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 4809b8bc83 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
许心洁 16839f6911 成品冲销+抛异常方法封装优化 6 years ago
陆卫豪 413266293e Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
WYnneaoapc 56d7457826 工位监控提交 6 years ago
许心洁 7863325afd 本地误拉了测试的代码,还原后提交,在测试分支拉开发分支的代码也得还原 6 years ago
许心洁 b7b78b85ac 误拉了test分支的代码:还原 6 years ago
汪云昊 52a5fe74af Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng d9dd10761e WebService 欧洲对接完成 6 years ago
许心洁 8deff73454 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng f35461ef57 WebService Server 优化完成 6 years ago
wei.peng 508d4b5aba Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
6 years ago
汪云昊 d83de01d33 服务端适配日志bug解决 6 years ago
刘辉 722146acd8 Merge branch 'dev' of i3-IMPP/i3plus-pojo into test 6 years ago
许心洁 d406532b37 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
wei.peng 1e5e35ee6f Pojo 合并代码 6 years ago
wei.peng babaf2f7d6 WebService 客户端Xml参数调试成功 6 years ago
汪云昊 f3867c64f4 软适配微服务接口 6 years ago
wei.peng 61a38c9acd WebService Server 优化完成 6 years ago
王杰 18bc35f60d Merge branch 'dev' into test 6 years ago