From 35f70da133a6f229801a4cd5d7e5910b6efd780c Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 11 Jul 2023 09:26:57 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=88=BB=E5=AD=97=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BB=A3=E7=A0=81/=E5=8D=8A=E6=88=90?= =?UTF-8?q?=E5=93=81=E5=85=A5=E5=BA=93=E6=95=B0=E9=87=8F=E6=94=B9=E9=87=8D?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/AcsTaskEnum.java | 2 +- .../acs/rest/AcsToWmsController.java | 4 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 48 +++++++---------- .../service/extendtask/PointListener.java | 2 +- .../packageWrap/WrapCallMaterialTask.java | 2 +- .../packageWrap/WrapSendEmptyTask.java | 2 +- .../extendtask/wash/WashCallEmptyTask.java | 2 +- .../wash/WashSendMaterialQZTask.java | 2 +- .../extendtask/wash/WashSendMaterialTask.java | 12 +++-- .../StIvtIostorinvBcpController.java | 24 +++++---- .../mapper/xml/StIvtIostorinvBcpMapper.xml | 2 +- .../impl/StIvtIostorinvBcpOutServiceImpl.java | 4 +- .../impl/StIvtIostorinvBcpServiceImpl.java | 6 +-- .../wms/masterdata_manage/st/struct/index.vue | 21 ++++++++ .../wms/old_manage/old_package/index.vue | 4 +- .../product_manage/workorder/AddDialog.vue | 9 ++-- .../product_manage/workorder/ViewDialog.vue | 40 ++++++++++---- .../wms/product_manage/workorder/index.vue | 54 +++++++++++++------ .../semiproduct/semiproductIn/AddDialog.vue | 4 +- .../semiproduct/semiproductIn/ViewDialog.vue | 2 +- .../semiproduct/semiproductIn/index.vue | 4 +- .../semiproduct/semiproductIvt/index.vue | 4 +- .../semiproduct/semiproductIvtFlow/index.vue | 6 +-- .../semiproductShutFrame/AddDialog.vue | 2 +- .../semiproduct/semiproductout/AddDialog.vue | 5 +- .../semiproduct/semiproductout/StructIvt.vue | 2 +- .../semiproduct/semiproductout/ViewDialog.vue | 14 ++--- .../semiproduct/semiproductout/index.vue | 6 +-- 28 files changed, 177 insertions(+), 112 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 29502e25..bd200d02 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -59,7 +59,7 @@ public enum AcsTaskEnum { REQUEST_WARP_CALL_FULL("5","包装缺料请求"),//ok REQUEST_WARP_SEND_EMP("6","包装送空框请求"),//ok REQUEST_WASH_LACK("7","清洗机器缺料请求"),//深坑->清洗:相同物料的重量<150公斤； - REQUEST_WASH_FULL("8","清洗机器满料请求"),//清洗机满料请求//去半成品入库 + REQUEST_WASH_FULL("9","清洗机器满料请求"),//清洗机满料请求//去半成品入库 REQUEST_WASH_EMP("10","清洗机器空框请求"),//清洗机下料位 REQUEST_WASH_FULL_ERROR("11","清洗机-满料异常请求"),//去半成品入库 异常位 REQUEST_WASH_PLOTTER_EMP("12","刻字上料空框回库"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java index 88499d90..352f4b07 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java @@ -41,7 +41,7 @@ public class AcsToWmsController { @Log("ACS给WMS发送任务") //("ACS给WMS发送任务") @SaIgnore - public ResponseEntity receiveTaskFromAcs(@RequestBody JSONObject whereJson) { + public ResponseEntity apply(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK); } @@ -61,7 +61,7 @@ public class AcsToWmsController { @Log("ACS给WMS反馈任务状态") //("ACS给WMS反馈任务状态") @SaIgnore - public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { + public ResponseEntity status(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index 9c8ef81d..070f8afc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -132,36 +132,28 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ String processing_class = one.getHandle_class(); String status = row.getString("status"); // 任务处理类 - try { - if (ObjectUtil.isNotEmpty(processing_class)) { - AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class)); - if (taskHandler!=null){ - taskHandler.updateTaskStatus(row,status); + if (!status.equals(StatusEnum.TASK_FINISH.getCode())){ + try { + if (ObjectUtil.isNotEmpty(processing_class)) { + AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class)); + if (taskHandler!=null){ + taskHandler.updateTaskStatus(row,status); + } } - }else { -// EXECUTING("6", "执行中"), -// FINISHED("7", "完成"), -// CANCEL("8", "取消"); -// //回调状态 -// STATUS_START("1","执行中"), -// STATUS_FINISH("2","完成"), -// STATUS_CANNEL("3","取消"), - itaskService.update(new UpdateWrapper().set("task_status",String.valueOf(Integer.valueOf(status)+5))); - + //发布一个任务执行事件:服务跟任务不一样，可以同事存在 + TaskEvent event = TaskEvent.builder() + .task_id(task_id) + .task_type(one.getTask_type()) + .status(status) + .build(); + BussEventMulticaster.Publish(event); + } catch (Exception e) { + log.error("任务状态更新失败:{}", e.getMessage()); + JSONObject json = new JSONObject(); + json.put("task_id", task_id); + json.put("message", e.getMessage()); + errArr.add(json); } - //发布一个任务执行事件:服务跟任务不一样，可以同事存在 - TaskEvent event = TaskEvent.builder() - .task_id(task_id) - .task_type(one.getTask_type()) - .status(status) - .build(); - BussEventMulticaster.Publish(event); - } catch (Exception e) { - log.error("任务状态更新失败:{}", e.getMessage()); - JSONObject json = new JSONObject(); - json.put("task_id", task_id); - json.put("message", e.getMessage()); - errArr.add(json); } } JSONObject result = new JSONObject(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java index 70b0e62a..53d97ded 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/PointListener.java @@ -28,7 +28,7 @@ public class PointListener extends AbstraceListener { task.put("task_id", task_id); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("task_type", event.getType().getCode()); - task.put("task_type", event.getType().getDesc()); + task.put("task_name", event.getType().getDesc()); task.put("acs_task_type", event.getAcs_task_type()); task.put("task_status", TaskStatusEnum.CREATED.getCode()); task.put("point_code1", event.getPoint_code1()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java index d081270d..bd0d9539 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapCallMaterialTask.java @@ -68,7 +68,7 @@ public class WrapCallMaterialTask extends AbstractAcsTask { pointService.update(new UpdateWrapper().set("lock_type",StatusEnum.LOCK_OFF.getCode()) .set("lock_type",StatusEnum.LOCK_ON.getCode()) .set("task_id",one.getTask_id()) - .eq("point_code",one.getPoint_code1()).ne("task_id",one.getTask_id())); + .eq("point_code",one.getPoint_code1())); } if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java index 84ad5114..b8c31248 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/packageWrap/WrapSendEmptyTask.java @@ -64,7 +64,7 @@ public class WrapSendEmptyTask extends AbstractAcsTask { pointService.update(new UpdateWrapper().set("lock_type",StatusEnum.LOCK_OFF.getCode()) .set("lock_type",StatusEnum.LOCK_ON.getCode()) .set("task_id",one.getTask_id()) - .eq("point_code",one.getPoint_code3()).ne("task_id",one.getTask_id())); + .eq("point_code",one.getPoint_code3())); } if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java index 7e37e1de..8837ffc0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashCallEmptyTask.java @@ -95,7 +95,7 @@ public class WashCallEmptyTask extends AbstractAcsTask { .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) .set(StIvtStructattr::getIs_emptyvehicle,false) .set(StIvtStructattr::getStoragevehicle_code,"") - .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) + .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code3()) ); } taskService.updateById(taskDao); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java index dd04b1d6..b3c3c018 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialQZTask.java @@ -112,7 +112,7 @@ public class WashSendMaterialQZTask extends AbstractAcsTask { PdmProduceWorkorder order = null; if (StringUtils.isNotEmpty(param.getString("workorder_code"))){ order = workorderService.getOne(new QueryWrapper() - .eq("workorder_code", "123456")// param.getString("workorder_code")) + .eq("workorder_code", param.getString("workorder_code"))// ) .eq("is_delete", false) .lt("workorder_status", WorkerOrderEnum.COMPLETE.getCode())); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java index 7f846bc8..08fcf65d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/wash/WashSendMaterialTask.java @@ -18,6 +18,7 @@ import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; +import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.pda.service.PdaStBcpInService; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; @@ -60,7 +61,6 @@ public class WashSendMaterialTask extends AbstractAcsTask { @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject param, String status) { - stIvtIostorinvBcpService.taskOperate(param); } @Override @@ -71,7 +71,7 @@ public class WashSendMaterialTask extends AbstractAcsTask { }else { String start_point_code = param.getString("device_code"); PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper() - .eq("workorder_code", "123456")// param.getString("workorder_code")) + .eq("workorder_code", param.getString("workorder_code")) .eq("is_delete", false) .lt("workorder_status", WorkerOrderEnum.COMPLETE.getCode())); Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code"))); @@ -89,14 +89,16 @@ public class WashSendMaterialTask extends AbstractAcsTask { JSONObject form = new JSONObject(); form.put("bill_type","0001"); form.put("point_code",start_point_code); - form.put("stor_id","15286279952695336962");//半成品仓库 - form.put("plan_qty",order.getPlan_qty()); + form.put("stor_id", IOSEnum.STOR_CODE.code("半成品仓库"));//半成品仓库 + form.put("total_qty",param.getString("weight")); form.put("material_id",order.getMaterial_id()); form.put("unit_weight",order.getMaterial_weight()); form.put("storagevehicle_code",param.getString("vehicle_code")); form.put("product_code","A1"); form.put("auto_send",true); - pdaStBcpInService.createIn(form); + JSONObject req = new JSONObject(); + req.put("from",form); + pdaStBcpInService.createIn(req); return ""; } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java index 0a9e39ab..f1aa6e77 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java @@ -19,11 +19,15 @@ import org.nl.wms.storage_manage.semimanage.service.iostorInv.dto.BcpIostorInvQu import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.util.Arrays; +import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -70,16 +74,18 @@ public class StIvtIostorinvBcpController { .set("is_delete","1") .in("iostorinv_id",ids)); - StIvtIostorinvBcp mst = stIvtIostorinvBcpService.getById(ids); - + List bcps = stIvtIostorinvBcpService.listByIds(Arrays.asList(ids)); + List collect = bcps.stream().map(StIvtIostorinvBcp::getStoragevehicle_code).collect(Collectors.toList()); // 更新载具扩展属性 - 释放载具对应物料关系 清空数量 - iMdPbStoragevehicleextService.update( - new MdPbStoragevehicleext() - .setMaterial_id("") - .setStorage_qty(BigDecimal.valueOf(0)), - new QueryWrapper().lambda() - .eq(MdPbStoragevehicleext::getStoragevehicle_code,mst.getStoragevehicle_code()) - ); + if (!CollectionUtils.isEmpty(collect)){ + iMdPbStoragevehicleextService.update( + new MdPbStoragevehicleext() + .setMaterial_id("") + .setStorage_qty(BigDecimal.valueOf(0)), + new QueryWrapper().lambda() + .in(MdPbStoragevehicleext::getStoragevehicle_code,collect) + ); + } } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml index 645eed43..5ca921fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/dao/mapper/xml/StIvtIostorinvBcpMapper.xml @@ -9,7 +9,7 @@ mater.material_spec, task.task_code, task.task_status, - ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS weight_qty + ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS qty FROM st_ivt_iostorinv_bcp dtl LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java index cf474076..2a2e0b99 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpOutServiceImpl.java @@ -137,7 +137,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl().lambda() .set(MdPbStoragevehicleext::getMaterial_id, mst.getMaterial_id()) - .set(MdPbStoragevehicleext::getStorage_qty, mst.getPlan_qty()) + .set(MdPbStoragevehicleext::getWeight, mst.getPlan_qty()) .eq(MdPbStoragevehicleext::getStoragevehicle_code, mst.getStoragevehicle_code()) ); @@ -173,7 +173,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl否 + + + {{ item.label }} + + + @@ -207,6 +218,15 @@ + + + --> - +