测试出入库接口和质检接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/LineCallController.java

@@ -75,7 +75,6 @@ public class LineCallController {
                 agvCallDTO.setId(lform.getId());
             }
             AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-            agvCallItemDTO.setWarehouseId(Constant.WAREHOUSE_ID);
             agvCallItemDTO.setSku(lform.getSku());
             agvCallItemDTO.setQty(lform.getQty());
             agvCallItemDTO.setSupplier(lform.getSupplier());

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

@@ -284,7 +284,6 @@ public class PdaController {
                 agvCallDTO.setId(lform.getId());
             }
             AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-            agvCallItemDTO.setWarehouseId(1L);
             agvCallItemDTO.setSku(lform.getSku());
             agvCallItemDTO.setQty(lform.getQty());
             agvCallItemDTO.setSupplier(lform.getSupplier());

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,6 +41,7 @@ public class PdaDocAsnController {
     @Autowired
     private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
 
+    @Transactional
     @ApiOperation("入库位->接驳位任务下发")
     @PostMapping("inToTran")
     public AjaxResult inToTran(@RequestBody DocAsnHeader docAsnHeader) {
@@ -69,7 +71,7 @@ public class PdaDocAsnController {
             details.setCreateTime(new Date());
             details.setLotatt01(docAsnDetail.getBatchNo());
             details.setLotatt02(docAsnDetail.getWeight());
-            details.setLotatt05("HG");
+            details.setLotatt05("DJ");
             wmsDocAsnHeaderService.insertWmsDocAsnDetails(details);
         }
         // 下发任务
@@ -86,7 +88,7 @@ public class PdaDocAsnController {
             LotattDTO lotattDTO = new LotattDTO();
             lotattDTO.setLotatt01(v.getBatchNo());
             lotattDTO.setLotatt02(v.getWeight());
-            lotattDTO.setLotatt05("HG");
+            lotattDTO.setLotatt05("DJ");
             lotattDTO.setLotatt08(asnno);
             agvCallItemDTO.setLotattDTO(lotattDTO);
             agvCallItemDTOList.add(agvCallItemDTO);

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

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,11 +41,12 @@ public class PdaDocSoController {
     @Autowired
     private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
 
+    @Transactional
     @ApiOperation("出库位->接驳位任务下发")
     @PostMapping("outToTran")
     public AjaxResult outToTran(@RequestBody DocOrderHeader docOrderHeader) {
         if (StringUtils.isEmpty(docOrderHeader.getLocationTo())) {
-            return AjaxResult.error("目标库位不可为空！");
+//            return AjaxResult.error("目标库位不可为空！");
         }
         // 创建出库单
         WmsDocOrderHeader header = new WmsDocOrderHeader();

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

@@ -107,7 +107,6 @@ public class BusinessServiceImpl implements IBusinessService {
         List<AgvCallDTO> agvCallDTOList = new ArrayList<>();
         List<AgvCallItemDTO> callItemDTOList = new ArrayList<>();
         AgvCallItemDTO callItemDTO = new AgvCallItemDTO();
-        callItemDTO.setWarehouseId(agvCallDTO.getWarehouseId());
         callItemDTO.setLotattDTO(new LotattDTO());
         callItemDTO.setExtParam(agvCallDTO.getExtParam());
         callItemDTOList.add(callItemDTO);
@@ -155,7 +154,7 @@ public class BusinessServiceImpl implements IBusinessService {
                     List<BaseLocationInfo> locationToList = this.convertLocation(paramLocationTo, agvCallDTO.getWarehouseId(), null);
                     HashMap<String, String> hashMap = JSON.parseObject(JSON.toJSONString(agvCall.getLotattDTO()), HashMap.class);
                     List<BaseLocationInfo> locationFromList = baseLocationInfoMapper.selectSortedLocationLotattListByZoneIdListOrderBy(zoneIdList
-                            , agvCall.getWarehouseId(), hashMap, agvCall.getSku(), "inv.create_time");
+                            , agvCallDTO.getWarehouseId(), hashMap, agvCall.getSku(), "inv.create_time");
                     locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "SO", asnSoStrategy, token);
                     locationTo = this.zoneLocationAllocation(locationToList, "locationTo", "SO", asnSoStrategy, token);
                     wcsTaskList.addAll(this.genTask(locationFrom, locationTo, flowConfigHeaderVO, agvCallDTO, token));

warewms-ams/src/main/java/com/ruoyi/ams/config/domain/dto/AgvCallItemDTO.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 @Data
 public class AgvCallItemDTO {
-    private Long warehouseId;
     private String sku;
     private Double qty;
     private Double weight;

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -597,7 +597,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE inv_lot_att t1
         SET t1.lotatt05 = #{status}
         WHERE
-            t1.sku = #{sku} and t1.lotatt01 = #{sku}
+            t1.sku = #{sku} and t1.lotatt01 = #{batchNo} and t1.lotatt05 = 'DJ'
           AND t1.lotnum IN ( SELECT lotnum FROM inv_lot_loc_id )
     </update>