删除冗余代码

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocAsnController.java

@@ -41,63 +41,63 @@ public class PdaDocAsnController {
     @Autowired
     private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
 
-    @Transactional
-    @ApiOperation("入库位->接驳位任务下发")
-    @PostMapping("inToTran")
-    public AjaxResult inToTran(@RequestBody DocAsnHeader docAsnHeader) {
-        if (StringUtils.isEmpty(docAsnHeader.getLocationFrom())) {
-            return AjaxResult.error("请选择起始点位！");
-        }
-        // 创建入库单
-        WmsDocAsnHeader header = new WmsDocAsnHeader();
-        header.setAsnStatus("99");
-        header.setAsnType("PR");
-        header.setCreateTime(new Date());
-        header.setCreateBy("pda");
-        header.setCustomerId(Constant.CUSTOMER_ID);
-        AjaxResult ajaxResult = wmsDocAsnHeaderService.insertWmsDocAsnHeader(header);
-        String asnno = (String) ajaxResult.getData();
-        List<DocAsnDetails> docAsnDetails = docAsnHeader.getDocAsnDetails();
-        for (DocAsnDetails docAsnDetail : docAsnDetails) {
-            WmsDocAsnDetails details = new WmsDocAsnDetails();
-            details.setAsnNo(header.getAsnNo());
-            details.setSku(docAsnDetail.getSku());
-            details.setExpectedQty(new BigDecimal(docAsnDetail.getQty()));
-            details.setExpectedQtyEach(new BigDecimal(docAsnDetail.getQty()));
-            details.setReceivedQty(BigDecimal.ZERO);
-            details.setReceivedQtyEach(BigDecimal.ZERO);
-            details.setLineStatus("99");
-            details.setCreateBy("pda");
-            details.setCreateTime(new Date());
-            details.setLotatt01(docAsnDetail.getBatchNo());
-            details.setLotatt02(docAsnDetail.getWeight());
-            details.setLotatt05("DJ");
-            details.setLotatt07(docAsnDetail.getBoxNo() != null ? docAsnDetail.getBoxNo() : "");
-            wmsDocAsnHeaderService.insertWmsDocAsnDetails(details);
-        }
-        // 下发任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom(docAsnHeader.getLocationFrom());
-        agvCallDTO.setLocationTo(docAsnHeader.getLocationTo());
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        docAsnDetails.stream().forEach(v -> {
-            AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-            agvCallItemDTO.setSku(v.getSku());
-            agvCallItemDTO.setQty(Double.valueOf(v.getQty()));
-            agvCallItemDTO.setWeight(Double.valueOf(v.getWeight()));
-            LotattDTO lotattDTO = new LotattDTO();
-            lotattDTO.setLotatt01(v.getBatchNo());
-            lotattDTO.setLotatt02(v.getWeight());
-            lotattDTO.setLotatt05("DJ");
-            lotattDTO.setLotatt07(v.getBoxNo() != null ? v.getBoxNo() : "");
-            lotattDTO.setLotatt08(asnno);
-            agvCallItemDTO.setLotattDTO(lotattDTO);
-            agvCallItemDTOList.add(agvCallItemDTO);
-        });
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        return businessService.agvCall(Constant.IN_TRAN_FLOW_ID, agvCallDTO);
-    }
+//    @Transactional
+//    @ApiOperation("入库位->接驳位任务下发")
+//    @PostMapping("inToTran")
+//    public AjaxResult inToTran(@RequestBody DocAsnHeader docAsnHeader) {
+//        if (StringUtils.isEmpty(docAsnHeader.getLocationFrom())) {
+//            return AjaxResult.error("请选择起始点位！");
+//        }
+//        // 创建入库单
+//        WmsDocAsnHeader header = new WmsDocAsnHeader();
+//        header.setAsnStatus("99");
+//        header.setAsnType("PR");
+//        header.setCreateTime(new Date());
+//        header.setCreateBy("pda");
+//        header.setCustomerId(Constant.CUSTOMER_ID);
+//        AjaxResult ajaxResult = wmsDocAsnHeaderService.insertWmsDocAsnHeader(header);
+//        String asnno = (String) ajaxResult.getData();
+//        List<DocAsnDetails> docAsnDetails = docAsnHeader.getDocAsnDetails();
+//        for (DocAsnDetails docAsnDetail : docAsnDetails) {
+//            WmsDocAsnDetails details = new WmsDocAsnDetails();
+//            details.setAsnNo(header.getAsnNo());
+//            details.setSku(docAsnDetail.getSku());
+//            details.setExpectedQty(new BigDecimal(docAsnDetail.getQty()));
+//            details.setExpectedQtyEach(new BigDecimal(docAsnDetail.getQty()));
+//            details.setReceivedQty(BigDecimal.ZERO);
+//            details.setReceivedQtyEach(BigDecimal.ZERO);
+//            details.setLineStatus("99");
+//            details.setCreateBy("pda");
+//            details.setCreateTime(new Date());
+//            details.setLotatt01(docAsnDetail.getBatchNo());
+//            details.setLotatt02(docAsnDetail.getWeight());
+//            details.setLotatt05("DJ");
+//            details.setLotatt07(docAsnDetail.getBoxNo() != null ? docAsnDetail.getBoxNo() : "");
+//            wmsDocAsnHeaderService.insertWmsDocAsnDetails(details);
+//        }
+//        // 下发任务
+//        AgvCallDTO agvCallDTO = new AgvCallDTO();
+//        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
+//        agvCallDTO.setLocationFrom(docAsnHeader.getLocationFrom());
+//        agvCallDTO.setLocationTo(docAsnHeader.getLocationTo());
+//        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+//        docAsnDetails.stream().forEach(v -> {
+//            AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+//            agvCallItemDTO.setSku(v.getSku());
+//            agvCallItemDTO.setQty(Double.valueOf(v.getQty()));
+//            agvCallItemDTO.setWeight(Double.valueOf(v.getWeight()));
+//            LotattDTO lotattDTO = new LotattDTO();
+//            lotattDTO.setLotatt01(v.getBatchNo());
+//            lotattDTO.setLotatt02(v.getWeight());
+//            lotattDTO.setLotatt05("DJ");
+//            lotattDTO.setLotatt07(v.getBoxNo() != null ? v.getBoxNo() : "");
+//            lotattDTO.setLotatt08(asnno);
+//            agvCallItemDTO.setLotattDTO(lotattDTO);
+//            agvCallItemDTOList.add(agvCallItemDTO);
+//        });
+//        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+//        return businessService.agvCall(Constant.IN_TRAN_FLOW_ID, agvCallDTO);
+//    }
 
     @Data
     public static class DocAsnHeader {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocSoController.java

@@ -41,37 +41,37 @@ public class PdaDocSoController {
     @Autowired
     private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
 
-    /**
-     * PDA出库（不合格品->不合格区）
-     * 仓储位->接驳位->不合格区
-     *
-     * @param docOrderHeader
-     * @return
-     */
-    @Transactional
-    @ApiOperation("PDA出库（不合格品->不合格区）")
-    @PostMapping("outToTranBHG")
-    public AjaxResult outToTranBHG(@RequestBody DocOrderHeader docOrderHeader) {
-        docOrderHeader.setQualityStatus("BHG");
-        docOrderHeader.setToArea("BHG");
-        return outToTran(docOrderHeader);
-    }
+//    /**
+//     * PDA出库（不合格品->不合格区）
+//     * 仓储位->接驳位->不合格区
+//     *
+//     * @param docOrderHeader
+//     * @return
+//     */
+//    @Transactional
+//    @ApiOperation("PDA出库（不合格品->不合格区）")
+//    @PostMapping("outToTranBHG")
+//    public AjaxResult outToTranBHG(@RequestBody DocOrderHeader docOrderHeader) {
+//        docOrderHeader.setQualityStatus("BHG");
+//        docOrderHeader.setToArea("BHG");
+//        return outToTran(docOrderHeader);
+//    }
 
-    /**
-     * PDA出库（不合格品->合格区）
-     * 仓储位->接驳位->合格区
-     *
-     * @param docOrderHeader
-     * @return
-     */
-    @Transactional
-    @ApiOperation("PDA出库（不合格品->合格区）")
-    @PostMapping("outToTranBHGToHG")
-    public AjaxResult outToTranBHGToHG(@RequestBody DocOrderHeader docOrderHeader) {
-        docOrderHeader.setQualityStatus("BHG");
-        docOrderHeader.setToArea("HG");
-        return outToTran(docOrderHeader);
-    }
+//    /**
+//     * PDA出库（不合格品->合格区）
+//     * 仓储位->接驳位->合格区
+//     *
+//     * @param docOrderHeader
+//     * @return
+//     */
+//    @Transactional
+//    @ApiOperation("PDA出库（不合格品->合格区）")
+//    @PostMapping("outToTranBHGToHG")
+//    public AjaxResult outToTranBHGToHG(@RequestBody DocOrderHeader docOrderHeader) {
+//        docOrderHeader.setQualityStatus("BHG");
+//        docOrderHeader.setToArea("HG");
+//        return outToTran(docOrderHeader);
+//    }
 
     /**
      * PDA出库（合格品->合格区）
@@ -80,57 +80,57 @@ public class PdaDocSoController {
      * @param docOrderHeader
      * @return
      */
-    @Transactional
-    @ApiOperation("PDA出库（合格品）")
-    @PostMapping("outToTran")
-    public AjaxResult outToTran(@RequestBody DocOrderHeader docOrderHeader) {
-        // 质量状态
-        String lotatt05 = StringUtils.isEmpty(docOrderHeader.getQualityStatus()) ? "HG" : docOrderHeader.getQualityStatus();
-        String toArea = StringUtils.isEmpty(docOrderHeader.getToArea()) ? "HG" : docOrderHeader.getToArea();
-        // 创建出库单
-        WmsDocOrderHeader header = new WmsDocOrderHeader();
-        header.setOrderStatus("99");
-        header.setOrderType("OD");
-        header.setCreateTime(new Date());
-        header.setCreateBy("pda");
-        header.setCustomerId(Constant.CUSTOMER_ID);
-        AjaxResult ajaxResult = wmsDocOrderHeaderService.insertWmsDocOrderHeader(header);
-        String orderno = (String) ajaxResult.getData();
-        WmsDocOrderDetails details = new WmsDocOrderDetails();
-        details.setOrderNo(orderno);
-        details.setLineStatus("99");
-        details.setCustomerId(Constant.CUSTOMER_ID);
-        details.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
-        details.setLotatt05(lotatt05);
-        details.setQtyOrdered(BigDecimal.ONE);
-        details.setQtyOrderedEach(details.getQtyOrdered());
-        details.setQtyPicked(BigDecimal.ZERO);
-        details.setQtyPickedEach(BigDecimal.ZERO);
-        details.setQtyAllocated(BigDecimal.ZERO);
-        details.setQtyAllocatedEach(BigDecimal.ZERO);
-        details.setQtyShipped(BigDecimal.ZERO);
-        details.setQtySoftAllocated(BigDecimal.ZERO);
-        details.setQtySoftallocatedEach(BigDecimal.ZERO);
-        details.setQtyShippedEach(BigDecimal.ZERO);
-        details.setCreateBy("PDA");
-        details.setCreateTime(new Date());
-        wmsDocOrderHeaderService.insertWmsDocOrderDetails(details);
-        // 下发任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom(docOrderHeader.getLocationFrom() == null ? "" : docOrderHeader.getLocationFrom());
-        agvCallDTO.setLocationTo(""); // 目标库位不需要输入
-        agvCallDTO.setToArea(toArea); // 目标区域（货物最终去掉区域）
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
-        LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt05(lotatt05);
-        agvCallItemDTO.setLotattDTO(lotattDTO);
-        agvCallItemDTOList.add(agvCallItemDTO);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        return businessService.agvCall(Constant.STO_TRAN_FLOW_ID, agvCallDTO);
-    }
+//    @Transactional
+//    @ApiOperation("PDA出库（合格品）")
+//    @PostMapping("outToTran")
+//    public AjaxResult outToTran(@RequestBody DocOrderHeader docOrderHeader) {
+//        // 质量状态
+//        String lotatt05 = StringUtils.isEmpty(docOrderHeader.getQualityStatus()) ? "HG" : docOrderHeader.getQualityStatus();
+//        String toArea = StringUtils.isEmpty(docOrderHeader.getToArea()) ? "HG" : docOrderHeader.getToArea();
+//        // 创建出库单
+//        WmsDocOrderHeader header = new WmsDocOrderHeader();
+//        header.setOrderStatus("99");
+//        header.setOrderType("OD");
+//        header.setCreateTime(new Date());
+//        header.setCreateBy("pda");
+//        header.setCustomerId(Constant.CUSTOMER_ID);
+//        AjaxResult ajaxResult = wmsDocOrderHeaderService.insertWmsDocOrderHeader(header);
+//        String orderno = (String) ajaxResult.getData();
+//        WmsDocOrderDetails details = new WmsDocOrderDetails();
+//        details.setOrderNo(orderno);
+//        details.setLineStatus("99");
+//        details.setCustomerId(Constant.CUSTOMER_ID);
+//        details.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
+//        details.setLotatt05(lotatt05);
+//        details.setQtyOrdered(BigDecimal.ONE);
+//        details.setQtyOrderedEach(details.getQtyOrdered());
+//        details.setQtyPicked(BigDecimal.ZERO);
+//        details.setQtyPickedEach(BigDecimal.ZERO);
+//        details.setQtyAllocated(BigDecimal.ZERO);
+//        details.setQtyAllocatedEach(BigDecimal.ZERO);
+//        details.setQtyShipped(BigDecimal.ZERO);
+//        details.setQtySoftAllocated(BigDecimal.ZERO);
+//        details.setQtySoftallocatedEach(BigDecimal.ZERO);
+//        details.setQtyShippedEach(BigDecimal.ZERO);
+//        details.setCreateBy("PDA");
+//        details.setCreateTime(new Date());
+//        wmsDocOrderHeaderService.insertWmsDocOrderDetails(details);
+//        // 下发任务
+//        AgvCallDTO agvCallDTO = new AgvCallDTO();
+//        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
+//        agvCallDTO.setLocationFrom(docOrderHeader.getLocationFrom() == null ? "" : docOrderHeader.getLocationFrom());
+//        agvCallDTO.setLocationTo(""); // 目标库位不需要输入
+//        agvCallDTO.setToArea(toArea); // 目标区域（货物最终去掉区域）
+//        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+//        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+//        agvCallItemDTO.setSku(docOrderHeader.getSku() == null ? "" : docOrderHeader.getSku());
+//        LotattDTO lotattDTO = new LotattDTO();
+//        lotattDTO.setLotatt05(lotatt05);
+//        agvCallItemDTO.setLotattDTO(lotattDTO);
+//        agvCallItemDTOList.add(agvCallItemDTO);
+//        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+//        return businessService.agvCall(Constant.STO_TRAN_FLOW_ID, agvCallDTO);
+//    }
 
     @Data
     public static class DocOrderHeader {

ruoyi-ui/src/views/base/baseSku/index.vue

@@ -90,7 +90,7 @@
       <el-table-column label="规格" align="center" prop="specs" />
       <el-table-column label="型号" align="center" prop="model" />
       <el-table-column label="物料名称" align="center" prop="desc1" />
-      <el-table-column label="描述2" align="center" prop="desc2" />
+      <el-table-column label="Wcs号" align="center" prop="desc2" />
       <el-table-column label="自赋码1" align="center" prop="selfCode1" />
       <el-table-column label="自赋码2" align="center" prop="selfCode2" />
       <el-table-column label="是否托盘" align="center" prop="hazardFlag">

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask.java

@@ -47,71 +47,71 @@ public class AutoButtonBoxTask {
      * 按钮1业务（硫化任务）
      */
     public void buttonTask01() {
-        log.info("按钮1已经被按下");
-        // 下发模具搬运任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom("");
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("硫化模具");
-        LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("硫化模具");
-        agvCallItemDTO.setLotattDTO(lotattDTO);
-        agvCallItemDTOList.add(agvCallItemDTO);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_LH_FLOW_ID, agvCallDTO);
-        if (!ajaxResult.isSuccess()) {
-            log.error("下发模具搬运任务（硫化）失败：" + ajaxResult.getMsg());
-            return;
-        }
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        // 清除按下标记
-        buttonBoxClient.clearBtn01();
-        // 灭灯
-        buttonBoxClient.writeLamp01Death();
-        log.info("按钮1已经灭灯");
-        // 关闭墙外同时 打开墙里第二层自动门
-        autoDoorClient.sendOpen(AutoDoorClient.AUTO_DOOR_NO.C);
+//        log.info("按钮1已经被按下");
+//        // 下发模具搬运任务
+//        AgvCallDTO agvCallDTO = new AgvCallDTO();
+//        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
+//        agvCallDTO.setLocationFrom("");
+//        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+//        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+//        agvCallItemDTO.setSku("硫化模具");
+//        LotattDTO lotattDTO = new LotattDTO();
+//        lotattDTO.setLotatt01("硫化模具");
+//        agvCallItemDTO.setLotattDTO(lotattDTO);
+//        agvCallItemDTOList.add(agvCallItemDTO);
+//        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+//        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_LH_FLOW_ID, agvCallDTO);
+//        if (!ajaxResult.isSuccess()) {
+//            log.error("下发模具搬运任务（硫化）失败：" + ajaxResult.getMsg());
+//            return;
+//        }
+//        try {
+//            Thread.sleep(1000);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+//        // 清除按下标记
+//        buttonBoxClient.clearBtn01();
+//        // 灭灯
+//        buttonBoxClient.writeLamp01Death();
+//        log.info("按钮1已经灭灯");
+//        // 关闭墙外同时 打开墙里第二层自动门
+//        autoDoorClient.sendOpen(AutoDoorClient.AUTO_DOOR_NO.C);
     }
 
     /**
      * 按钮2业务（冲边任务）
      */
     public void buttonTask02() {
-        log.info("按钮2已经被按下");
-        // 下发模具搬运任务
-        AgvCallDTO agvCallDTO = new AgvCallDTO();
-        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
-        agvCallDTO.setLocationFrom("");
-        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
-        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("冲边模具");
-        LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("冲边模具");
-        agvCallItemDTO.setLotattDTO(lotattDTO);
-        agvCallItemDTOList.add(agvCallItemDTO);
-        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_CB_FLOW_ID, agvCallDTO);
-        if (!ajaxResult.isSuccess()) {
-            log.error("下发模具搬运任务（冲边）失败：" + ajaxResult.getMsg());
-            return;
-        }
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        // 清除按下标记
-        buttonBoxClient.clearBtn02();
-        // 灭灯
-        buttonBoxClient.writeLamp02Death();
-        log.info("按钮2已经灭灯");
-        // 关闭墙外同时 打开墙里第二层自动门
-        autoDoorClient.sendOpen(AutoDoorClient.AUTO_DOOR_NO.C);
+//        log.info("按钮2已经被按下");
+//        // 下发模具搬运任务
+//        AgvCallDTO agvCallDTO = new AgvCallDTO();
+//        agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
+//        agvCallDTO.setLocationFrom("");
+//        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+//        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+//        agvCallItemDTO.setSku("冲边模具");
+//        LotattDTO lotattDTO = new LotattDTO();
+//        lotattDTO.setLotatt01("冲边模具");
+//        agvCallItemDTO.setLotattDTO(lotattDTO);
+//        agvCallItemDTOList.add(agvCallItemDTO);
+//        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+//        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_CB_FLOW_ID, agvCallDTO);
+//        if (!ajaxResult.isSuccess()) {
+//            log.error("下发模具搬运任务（冲边）失败：" + ajaxResult.getMsg());
+//            return;
+//        }
+//        try {
+//            Thread.sleep(1000);
+//        } catch (InterruptedException e) {
+//            e.printStackTrace();
+//        }
+//        // 清除按下标记
+//        buttonBoxClient.clearBtn02();
+//        // 灭灯
+//        buttonBoxClient.writeLamp02Death();
+//        log.info("按钮2已经灭灯");
+//        // 关闭墙外同时 打开墙里第二层自动门
+//        autoDoorClient.sendOpen(AutoDoorClient.AUTO_DOOR_NO.C);
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -681,27 +681,27 @@ public class BusinessServiceImpl implements IBusinessService {
     @Transactional
     @Override
     public void autoSendTranSit() {
-        List<BaseLocationInfo> baseLocationInfos = baseLocationInfoService.selectSortedLocatinListByZoneId(Constant.ZONE_TYPE.TRANSIT.getValue()
-                , Constant.WAREHOUSE_ID, null);
-        for (BaseLocationInfo baseLocationInfo : baseLocationInfos) {
-            // 判断是否有货并且空闲
-            if (baseLocationInfo.getStockStatus().equals(Constant.STOCK_STATUS.STOCK00.getValue())
-                    && baseLocationInfo.getIsEmpty().equals(Constant.IS_YES.N.name())) {
-                if (baseLocationInfo.getUserdefine1().equals("ASN")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_STO_FLOW_ID, agvCallDTO);
-                } else if (baseLocationInfo.getUserdefine1().equals("SO_HG")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_OUT_FLOW_ID, agvCallDTO);
-                } else if (baseLocationInfo.getUserdefine1().equals("SO_BHG")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_OUT_BHG_FLOW_ID, agvCallDTO);
-                }
-            }
-        }
+//        List<BaseLocationInfo> baseLocationInfos = baseLocationInfoService.selectSortedLocatinListByZoneId(Constant.ZONE_TYPE.TRANSIT.getValue()
+//                , Constant.WAREHOUSE_ID, null);
+//        for (BaseLocationInfo baseLocationInfo : baseLocationInfos) {
+//            // 判断是否有货并且空闲
+//            if (baseLocationInfo.getStockStatus().equals(Constant.STOCK_STATUS.STOCK00.getValue())
+//                    && baseLocationInfo.getIsEmpty().equals(Constant.IS_YES.N.name())) {
+//                if (baseLocationInfo.getUserdefine1().equals("ASN")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_STO_FLOW_ID, agvCallDTO);
+//                } else if (baseLocationInfo.getUserdefine1().equals("SO_HG")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_OUT_FLOW_ID, agvCallDTO);
+//                } else if (baseLocationInfo.getUserdefine1().equals("SO_BHG")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_OUT_BHG_FLOW_ID, agvCallDTO);
+//                }
+//            }
+//        }
     }
 
     @Transactional

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -361,11 +361,6 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                             log.info("不能重复取货，" + taskNo);
                             return;
                         }
-                        // 如果是接驳位(模具-东)的点位取货完成 反馈关闭靠墙第二层自动门
-                        if (wcsTask.getLocationFrom().equals(Constant.LOC_MJ_EAST.toString())) {
-                            Thread.sleep(3000);
-                            autoDoorClient.sendClose(AutoDoorClient.AUTO_DOOR_NO.C);
-                        }
                         // 解锁起始库位
                         baseLocationInfoService.unLockLocationStockStatus(Long.parseLong(wcsTask.getLocationFrom())
                                 , Constant.WAREHOUSE_ID, updateBy);

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/service/WcsToWmsApiService.java

@@ -22,6 +22,8 @@ public class WcsToWmsApiService {
      * @return
      */
     public AjaxResult stackingCompletion(StackingCompletionForm stackingCompletion) {
+
+
         return AjaxResult.success();
     }