From b49adc53e6faffb997ae64ff7e89a7ccaceaa334 Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 27 Jun 2023 14:10:12 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=8D=8A=E6=88=90=E5=93=81=E6=8B=BC?= =?UTF-8?q?=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/enums/AcsTaskEnum.java | 10 ++-- .../impl/ClassstandardServiceImpl.java | 2 +- .../StIvtShutframeinvBcpController.java | 7 +++ .../impl/StIvtCheckmstBcpServiceImpl.java | 51 ++++++++++++++++++- .../impl/StIvtIostorinvBcpServiceImpl.java | 8 +++ .../IStIvtShutframeinvBcpService.java | 4 ++ .../impl/StIvtShutframedtlBcpServiceImpl.java | 6 ++- .../impl/StIvtShutframeinvBcpServiceImpl.java | 43 +++++++++++++++- .../dao/mapper/StIvtStructivtBcpMapper.java | 2 + .../mapper/xml/StIvtStructivtBcpMapper.xml | 19 +++++++ .../semiproductCheck/ProcessDialog.vue | 6 +-- .../semiproductShutFrame/AddDialog.vue | 24 +++++---- .../semiproductShutFrame/shutframe.js | 11 +++- 13 files changed, 167 insertions(+), 26 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 31c32c7d..fb7fd6dd 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 @@ -33,11 +33,11 @@ public enum AcsTaskEnum { TASK_PLOTTER_CALL_MATERIAL("14","刻字机-叫料请求"), TASK_WARP_MAC("7","包装机-叫料出库"), TASK_WARP_EMPTY("8","包装机-送空框"), - TASK_STRUCT_IN("9","入库-生产入库"), - TASK_STRUCT_OUT("10","出库-生产出库"), - TASK_STRUCT_CHECK("14","盘点任务"), - TASK_STRUCT_SHUT("15","拼盘任务出"), - TASK_STRUCT_SHUT_IN("16","拼盘任务入"), + TASK_STRUCT_IN("9","入库-半成品-生产入库"), + TASK_STRUCT_OUT("10","出库-半成品-生产出库"), + TASK_STRUCT_CHECK("14","半成品-盘点"), + TASK_STRUCT_SHUT("15","半成品-拼盘任务出"), + TASK_STRUCT_SHUT_IN("16","半成品-拼盘任务入"), TASK_STRUCT_CP_IN("11","入库-成品-生产入库"), TASK_STRUCT_CP_OUT("12","出库-成品-生产出库"), TASK_STRUCT_CP_CHECK("13","成品-盘点"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java index e8cdfd38..ebaafb73 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/ClassstandardServiceImpl.java @@ -491,7 +491,7 @@ public class ClassstandardServiceImpl implements ClassstandardService { @Override public Set getAllChildIdSet(String class_idStr) { - JSONArray arr = WQLObject.getWQLObject("md_pb_classstandard").query("class_id IN " + class_idStr).getResultJSONArray(0); + JSONArray arr = WQLObject.getWQLObject("md_pb_classstandard").query("class_id IN " + "('"+class_idStr+"')").getResultJSONArray(0); Set set = new HashSet<>(); for (int i = 0; i < arr.size(); i++) { set.addAll(this.getChildIdSet(arr.getJSONObject(i).getString("class_id"))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java index a78945bf..1ca37bbd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java @@ -68,6 +68,13 @@ public class StIvtShutframeinvBcpController { return new ResponseEntity<>(shutframeinvBcpService.getBillDtl(jo), HttpStatus.OK); } + @PostMapping("/getBillDtlView") + @Log("查询拼盘详情") + @ApiOperation("查询拼盘详情") + public ResponseEntity getBillDtlView(@RequestBody JSONObject jo) { + return new ResponseEntity<>(shutframeinvBcpService.getBillDtlView(jo), HttpStatus.OK); + } + @PostMapping("/issueTask") @Log("任务下发") @ApiOperation("任务下发") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java index c8bdb999..58b0e6a7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java @@ -1,9 +1,12 @@ package org.nl.wms.storage_manage.semimanage.service.check.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -22,13 +25,18 @@ import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; +import org.nl.modules.wql.util.SpringContextHolder; +import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; +import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.scheduler_manage.service.point.dao.mapper.SchBasePointMapper; +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.CHECKEnum; import org.nl.wms.storage_manage.semimanage.MLEnum; import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckdtlBcpService; @@ -41,6 +49,7 @@ import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery; import org.nl.wms.storage_manage.semimanage.service.moveOrLess.IStIvtMoreorlessmstBcpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.HashMap; @@ -75,6 +84,8 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl().eq("struct_id", dtl.getStruct_id())); + String task_group_id = IdUtil.getStringId(); PointEvent event = PointEvent.builder() - .type(AcsTaskEnum.TASK_STRUCT_SHUT.getCode()) + .acs_task_type("7") + .type(AcsTaskEnum.TASK_STRUCT_CHECK.getCode()) .point_code1(struct.getStruct_code()) .point_code2((String) maps.get(0).get("point_code")) .vehicle_code(dtl.getStoragevehicle_code()) + .task_group_id(task_group_id) .product_area(mst.getWorkshop_id()) .build(); - BussEventMulticaster.Publish(event); + // 下发任务 + List taskList = taskService.list( + new QueryWrapper().lambda() + .eq(SchBaseTask::getTask_group_id, task_group_id) + ); + + taskList.forEach(this::sendTask); + checkdtlBcpService.update(new UpdateWrapper() .set("is_down", "1") .set("checkpoint_id", (String) maps.get(0).get("point_code")) @@ -309,6 +336,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl().eq("check_id", id)); @@ -434,6 +464,23 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl result = bean.issueTaskToAcs3(param); + + // 反馈失败报错 + if (!ObjectUtil.equal(MapUtil.getStr(result, "status"),"200")) { + throw new BadRequestException("下发失败："+MapUtil.getStr(result, "message")); + } + + // 2.更新任务状态 + taskDao.setTask_status(TaskStatusEnum.ISSUE.getCode()); + taskService.updateById(taskDao); + } + @NotNull private StIvtCheckmstBcp packageMstForm(StIvtCheckmstBcp checkmstYl, JSONObject whereJson) { JSONArray rows = whereJson.getJSONArray("tableData"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java index 91e4da1f..e5ed76ca 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/iostorInv/impl/StIvtIostorinvBcpServiceImpl.java @@ -135,6 +135,14 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda() + .set(MdPbStoragevehicleext::getMaterial_id, mst.getMaterial_id()) + .set(MdPbStoragevehicleext::getStorage_qty, mst.getPlan_qty()) + .eq(MdPbStoragevehicleext::getStoragevehicle_code, mst.getStoragevehicle_code()) + ); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java index f579b299..a50cf5a6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/IStIvtShutframeinvBcpService.java @@ -34,6 +34,8 @@ public interface IStIvtShutframeinvBcpService extends IService getBillDtl(JSONObject jo); + List getBillDtlView(JSONObject jo); + void confirm(JSONObject jo); void issueTask(JSONObject jo); @@ -43,4 +45,6 @@ public interface IStIvtShutframeinvBcpService extends IService list = rows.stream() - .sorted(Comparator.comparing(row -> ((JSONObject) row).getString("canuse_qty")).reversed()).collect(Collectors.toList()); + .sorted(Comparator.comparing(row -> ((JSONObject) row).getDoubleValue("canuse_qty")).reversed()).collect(Collectors.toList()); rows = JSONArray.parseArray(JSON.toJSONString(list)); StIvtStructattr first_struct = null; @@ -58,11 +58,13 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl().eq("shutframeinv_id", shutframeinv_id)); LinkedList struct_list = new LinkedList<>(); + double qty = 0; for (int i = 0; i < rows.size(); i++) { JSONObject row = rows.getJSONObject(i); if (ObjectUtil.isEmpty(struct_list)) { struct_list.addFirst(row.getString("struct_code")); first_struct = structattrService.getOne(new QueryWrapper().eq("struct_code", row.getString("struct_code"))); + qty = row.getDoubleValue("canuse_qty"); continue; } else { if (!struct_list.contains(row.getString("struct_code"))) { @@ -93,7 +95,7 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl().lambda() + .set(MdPbStoragevehicleext::getMaterial_id, "") + .set(MdPbStoragevehicleext::getStorage_qty, BigDecimal.valueOf(0)) + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code()) + ); + + // 更新扩展属性 -- 有料 + iMdPbStoragevehicleextService.update( + new UpdateWrapper().lambda() + .set(MdPbStoragevehicleext::getStorage_qty, in_ivt.getCanuse_qty()) + .eq(MdPbStoragevehicleext::getStoragevehicle_code, dtl.getStoragevehicle_code_in()) + ); + }); StIvtShutframeinvBcp mst = this.getById(form.getString("shutframeinv_id")); @@ -417,14 +436,36 @@ public class StIvtShutframeinvBcpServiceImpl extends ServiceImpl getBillDtlView(JSONObject jo) { + return bcpMapper.getBillDtlView(MapOf.of("shutframeinv_id", jo.getString("shutframeinv_id"))); + } + @Override @Transactional public void delete(Long[] ids) { for (Long id : ids) { StIvtShutframeinvBcp dao = this.getOne(new QueryWrapper().eq("shutframeinv_id", id)); dao.setIs_delete(true); - this.updateById(dao); + + List list = shutframedtlBcpService.list( + new QueryWrapper().lambda() + .eq(StIvtShutframedtlBcp::getShutframeinv_id, dao.getShutframeinv_id()) + ); + + // 解锁货位 + iStIvtStructattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getStruct_id, list.get(0).getTurnin_struct_id()) + ); + + iStIvtStructattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getStruct_id, list.get(0).getTurnout_struct_id()) + ); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java index b149518b..e521f889 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/StIvtStructivtBcpMapper.java @@ -28,6 +28,8 @@ public interface StIvtStructivtBcpMapper extends BaseMapper { List getStructIvtInfo(@Param("map") Map map); + List getBillDtlView(@Param("map") Map map); + List packageQuery(@Param("query") StructIvtBcpQuery query); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml index e092003d..efdc00b9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/structIvt/dao/mapper/xml/StIvtStructivtBcpMapper.xml @@ -112,6 +112,25 @@ + +