Commit Graph

112 Commits

Author SHA1 Message Date
jiaoliming
3b02e7bc1c fix :清洗上料,下料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-25 11:03:20 +08:00
jiaoliming
240d5aa8b4 fix : 修改刻字上料输送线逻辑
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-22 11:53:32 +08:00
jiaoliming
415b980c51 add : 清洗后段
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-19 18:15:12 +08:00
4a0a36c091 rev:根据实际排产场景,修改销售订单内容 2023-07-17 16:29:29 +08:00
3d1b6119e1 add:刻字机取放货判断工作模式 2023-07-06 16:31:42 +08:00
周俊杰
39e9afae00 海亮海柔接口 2023-07-06 14:36:03 +08:00
1870c02e50 add:刻字称重 2023-07-05 11:04:04 +08:00
jiaoliming
d7104beb88 add : 合框称重
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-04 20:50:31 +08:00
jiaoliming
ea3b8caabc fix:移除UnboxingOrderDto
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-04 19:18:00 +08:00
jiaoliming
bbc2b8b1c6 Revert "no message"
This reverts commit 337b1a0cdd.
2023-07-04 19:11:45 +08:00
jiaoliming
337b1a0cdd no message
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-04 19:06:55 +08:00
jiaoliming
a27e76a7bd add:清洗刻字包装
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-07-04 19:00:33 +08:00
3fb718b739 rev 缓存线出库数量 2023-06-28 08:49:59 +08:00
afec6749f7 rev 监控页面异常信息显示 2023-06-27 13:56:10 +08:00
a9547de830 rev 出缓存线数量 2023-06-26 14:30:31 +08:00
1c60718e8c REV 单工NDC 2023-06-20 16:44:00 +08:00
3b1e1a7194 rev 清洗上料 2023-06-16 16:15:00 +08:00
edc2f84199 rev 监控显示信息 2023-06-16 09:36:56 +08:00
391a6a11ba add ndc反馈smart200驱动 2023-06-14 20:26:48 +08:00
afe0866aed rev 分页、下发plc两次 2023-06-13 09:39:26 +08:00
594eede6ce add 取消指令清除phase值 2023-06-09 19:33:51 +08:00
756a2daf34 REV 专机设备、缓存线 2023-06-08 18:32:55 +08:00
jiaoliming
1d52b58d6a fix:盘点完成清除任务号
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
2023-06-06 17:38:15 +08:00
ce9e6e80a8 rev 缓存线反馈 2023-06-06 17:31:00 +08:00
jiaoliming
ee2b98ff01 Revert "fix:"
This reverts commit 4fed94c420.
2023-06-06 17:27:03 +08:00
jiaoliming
4fed94c420 fix: 2023-06-06 17:24:29 +08:00
35dc93da32 rev 缓存线、专机取放货条件更改 2023-06-02 14:35:57 +08:00
c02894484d rev ndc驱动 2023-05-30 18:33:41 +08:00
9add7774cd add 双工位AGV日志 2023-05-29 18:34:59 +08:00
ce340a9951 rev 反馈mes取放倒完成 2023-05-26 15:53:03 +08:00
0cf19a531f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/ChangeIvtUtil.java
#	mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue
#	mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
#	mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
#	mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
2023-05-25 20:40:39 +08:00
db98481387 REV 修改 2023-05-25 19:56:34 +08:00
22d4222e1f add 智能车间 2023-05-25 19:38:31 +08:00
USER-20220102CG\noblelift
f73fdf49e6 add 老车间包装 2023-05-25 19:27:14 +08:00
13dbaca2ba rev ndc执行状态 2023-05-23 17:30:24 +08:00
USER-20220102CG\noblelift
2eba078ddb add 老车间包装线驱动 2023-05-23 12:26:30 +08:00
USER-20220102CG\noblelift
b5aca2b6a8 add 老车间驱动 2023-05-19 17:15:48 +08:00
USER-20220102CG\noblelift
9e60ebfbfa add 老车间设备驱动 2023-05-18 21:25:04 +08:00
USER-20220102CG\noblelift
e96c97aefd fix 日志 2023-05-17 20:47:30 +08:00
f6abc2cd3e rev 请求标记复位 2023-05-17 17:27:57 +08:00
a72caf0a31 rev 修复删除设备报错 分页显示问题 2023-05-17 17:26:50 +08:00
f6c8f65177 add lucene 2023-05-09 15:37:26 +08:00
9b8d295fe7 rev 在线状态 2023-05-09 14:35:18 +08:00
e3031c5267 add 封箱拆箱线, rev 测试读写 2023-05-08 11:04:52 +08:00
a23eae3cf2 rev 工作模式 2023-04-27 14:21:16 +08:00
778d8fb7df rev 封箱拆箱 2023-04-27 13:33:04 +08:00
d1ac61df70 rev 联调问题修改 2023-04-25 17:30:25 +08:00
2313d80660 rev 信号类型 2023-04-25 11:10:19 +08:00
d4a63d1619 rev 缓存线有任务时不下发调度 2023-04-18 12:00:00 +08:00
9deeb8b14c rev 更新细节 2023-04-17 08:50:26 +08:00