不同区下料取空托逻辑bug修改

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -70,18 +70,28 @@ public class StartService implements CommandLineRunner {
      * 临时写
      */
     public void write() {
-        PlcService.plcWritepassedProductRightBlanking1();
+        //取消写不合格品右正在下料
+//        PlcService.plcWritepassedNoProductRightBlanking1();
+        //取消写合格右正在上空托
+//        PlcService.plcWritepassedProductRightSky1();
+        //取消写合格左正在下料
+//        PlcService.plcWritepassedProductLeftBlanking1();
 //        //测试合格品左上空托
 //        plcCallAgvService.readTheEmptyPalletOnThequalifiedLeftTest();
+        //测试合格品右上空托
+        plcCallAgvService.readTheEmptyPalletOnThequalifiedRightTest();
     }
 
     /**
      * 临时写1
      */
     public void write1() {
-//        PlcService.plcWritepassedProductRightBlanking1();
+        //取消写合格品左正在下料
+//        PlcService.plcWritepassedProductLeftBlanking1();
         //测试合格品左下料
         plcCallAgvService.readThepassedProductLowerFeeLeftTest();
+        //测试合格品右下料
+//        plcCallAgvService.readThepassedProductLowerFeeRightTest();
     }
 
     /**

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

@@ -91,6 +91,7 @@ public class LocationViewSafeController extends BaseController {
     @Log(title = "设置库存信息为空托", businessType = BusinessType.CLEAN)
     @PostMapping(value = "/setIsEmptyPallent/{id}")
     public AjaxResult setIsEmptyPallent(@PathVariable("id") Long id) {
+        invLotLocIdService.clear(id.toString(),Constant.WAREHOUSE_ID, logger.getName());
         // 批次表
         String lotnum = idSequenceUtils.generateId("LOTNUMBER");
         LotattDTO lotattDTO = new LotattDTO();
@@ -115,6 +116,7 @@ public class LocationViewSafeController extends BaseController {
 //        invLotLocId.setQtyrpin(BigDecimal.ZERO);
         invLotLocId.setCreateTime(new Date());
         invLotLocIdMapper.insertInvLotLocId(invLotLocId);
+        invLotLocIdService.adjLocationIsEmpty(id.toString(), Constant.WAREHOUSE_ID, logger.getName());
         return AjaxResult.success();
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/MaGang02/service/PlcCallAgvService.java

@@ -94,6 +94,66 @@ public class PlcCallAgvService {
         return AjaxResult.success();
     }
 
+    /**
+     * 测试合格品右请求上空托
+     *
+     * @return
+     */
+    public AjaxResult readTheEmptyPalletOnThequalifiedRightTest() {
+        if (1 == 1) {
+            String locationFrom = "";
+            String locationTo = "100003";
+            WcsTask wcsTask = new WcsTask();
+            wcsTask.setLocationTo(locationTo);
+            List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
+            if (wcsTasks.size()>0 && wcsTasks!= null){
+                return AjaxResult.error("已经有正在进行的任务了");
+            }
+            List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+            AgvCallDTO agvCallDTO = new AgvCallDTO();
+            agvCallItemDTO.setSku("EMPTY_TRAY"); // 空托
+            agvCallItemDTO.setQty(1.0);
+            agvCallItemDTOList.add(agvCallItemDTO);
+            agvCallDTO.setLocationFrom(locationFrom);
+            agvCallDTO.setLocationTo(locationTo);
+            agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+            AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.TWO.getValue(), agvCallDTO);
+            System.out.println("合格品右正在上空托");
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 测试不合格品右请求上空托
+     *
+     * @return
+     */
+    public AjaxResult readTheEmptyPalletOnTheNoqualifiedRightTest() {
+        if (1 == 1) {
+            String locationFrom = "";
+            String locationTo = "100002";
+            WcsTask wcsTask = new WcsTask();
+            wcsTask.setLocationTo(locationTo);
+            List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
+            if (wcsTasks.size()>0 && wcsTasks!= null){
+                return AjaxResult.error("已经有正在进行的任务了");
+            }
+            List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+            AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+            AgvCallDTO agvCallDTO = new AgvCallDTO();
+            agvCallItemDTO.setSku("EMPTY_TRAY"); // 空托
+            agvCallItemDTO.setQty(1.0);
+            agvCallItemDTOList.add(agvCallItemDTO);
+            agvCallDTO.setLocationFrom(locationFrom);
+            agvCallDTO.setLocationTo(locationTo);
+            agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+            AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.FOUR.getValue(), agvCallDTO);
+            System.out.println("合格品右正在上空托");
+        }
+        return AjaxResult.success();
+    }
+
     /**
      * 测试合格品左请求下料
      *
@@ -123,6 +183,35 @@ public class PlcCallAgvService {
         return AjaxResult.success();
     }
 
+    /**
+     * 测试合格品右请求下料
+     *
+     * @return
+     */
+    public AjaxResult readThepassedProductLowerFeeRightTest() {
+        String locationFrom = "100003";
+        String locationTo = "";
+        WcsTask wcsTask = new WcsTask();
+        wcsTask.setLocationFrom(locationFrom);
+        List<WcsTask> wcsTasks = wcsTaskMapper.selectWcsTaskList1(wcsTask);
+        if (wcsTasks.size()>0 && wcsTasks!= null){
+            return AjaxResult.error("已经有正在进行的任务了");
+        }
+        //库存列表
+        List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
+        AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
+        LotattDTO lotattDTO = new LotattDTO();
+        agvCallItemDTO.setSku("sku001"); // 合格品
+        agvCallItemDTO.setQty(1.0);
+        agvCallItemDTOList.add(agvCallItemDTO);
+        AgvCallDTO agvCallDTO = new AgvCallDTO();
+        agvCallDTO.setLocationFrom(locationFrom);
+        agvCallDTO.setLocationTo(locationTo);
+        agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
+        AjaxResult ajaxResult = iBusinessService.agvCall(Constant.FLOW_CONFIG_ID.SIX.getValue(), agvCallDTO);
+        return AjaxResult.success();
+    }
+
     /**
      * 合格品右请求上空托
      *

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

@@ -160,8 +160,14 @@ public class BusinessServiceImpl implements IBusinessService {
                     AgvCallItemDTO agvCall = agvCallDTO.getAgvCallItemDTOList().get(0);
                     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
-                            , agvCallDTO.getWarehouseId(), hashMap, agvCall.getSku(), "inv.create_time");
+                    List<BaseLocationInfo> locationFromList = new ArrayList<>();
+                    if (flowConfigHeaderVO.getLocationTo().equals("4")){
+                         locationFromList = baseLocationInfoMapper.selectSortedLocationLotattListByZoneIdListOrderBy1(zoneIdList
+                                , agvCallDTO.getWarehouseId(), hashMap, agvCall.getSku(), "");
+                    }else {
+                         locationFromList = baseLocationInfoMapper.selectSortedLocationLotattListByZoneIdListOrderBy(zoneIdList
+                                , agvCallDTO.getWarehouseId(), hashMap, agvCall.getSku(), "");
+                    }
                     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-base/src/main/java/com/ruoyi/base/mapper/BaseLocationInfoMapper.java

@@ -137,7 +137,8 @@ public interface BaseLocationInfoMapper {
     List<BaseLocationInfo> selectSortedLocationLotattListByZoneIdListOrderBy(@Param("zoneId") List<String> zoneId, @Param("warehouseId") Long warehouseId
             , @Param("lotatt") Map<String, String> lotatt,@Param("sku") String sku,@Param("orderByClause") String orderBy);
 
-
+    List<BaseLocationInfo> selectSortedLocationLotattListByZoneIdListOrderBy1(@Param("zoneId") List<String> zoneId, @Param("warehouseId") Long warehouseId
+            , @Param("lotatt") Map<String, String> lotatt,@Param("sku") String sku,@Param("orderByClause") String orderBy);
     /**
      * 根据条件分配库位
      *

warewms-base/src/main/resources/mapper/base/BaseLocationInfoMapper.xml

@@ -639,6 +639,50 @@
         </if>
     </select>
 
+    <select id="selectSortedLocationLotattListByZoneIdListOrderBy1" parameterType="BaseLocationInfo"
+            resultMap="BaseLocationInfoLotattResult">
+        select b.id, b.warehouse_id, b.zone_id, b.location_no, b.location_barcode, b.row_no, b.row_index, b.col_no,
+        b.col_index, b.shift_no,
+        b.shift_index, b.stock_status, b.is_empty, b.bind_sku, b.location_type, b.rack_id, b.agv_station, b.folded_tag,
+        b.folded_count,
+        b.userdefine1, b.userdefine2, b.userdefine3, b.userdefine4, b.userdefine5, b.userdefine6, b.userdefine7,
+        b.userdefine8,
+        b.userdefine9, b.userdefine10, b.create_by, b.create_time, b.update_by, b.update_time, b.remark, inv.sku,
+        inv.qty, height_limit, weight_limit, att.*
+        from base_location_info b
+        left join inv_lot_loc_id inv on b.id = inv.location_id
+        left join inv_lot_att att on inv.lotnum = att.lotnum
+        where warehouse_id = #{warehouseId} and zone_id in
+        <foreach item="item" collection="zoneId" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        <if test="sku != null and sku != ''">and inv.sku = #{sku}</if>
+        <if test="lotatt.lotatt01 != null and lotatt.lotatt01 != ''">and att.lotatt01 = #{lotatt.lotatt01}</if>
+        <if test="lotatt.lotatt02 != null and lotatt.lotatt02 != ''">and att.lotatt02 = #{lotatt.lotatt02}</if>
+        <if test="lotatt.lotatt03 != null and lotatt.lotatt03 != ''">and att.lotatt03 = #{lotatt.lotatt03}</if>
+        <if test="lotatt.lotatt04 != null and lotatt.lotatt04 != ''">and att.lotatt04 = #{lotatt.lotatt04}</if>
+        <if test="lotatt.lotatt05 != null and lotatt.lotatt05 != ''">and att.lotatt05 = #{lotatt.lotatt05}</if>
+        <if test="lotatt.lotatt06 != null and lotatt.lotatt06 != ''">and att.lotatt06 = #{lotatt.lotatt06}</if>
+        <if test="lotatt.lotatt07 != null and lotatt.lotatt07 != ''">and att.lotatt07 = #{lotatt.lotatt07}</if>
+        <if test="lotatt.lotatt08 != null and lotatt.lotatt08 != ''">and att.lotatt08 = #{lotatt.lotatt08}</if>
+        <if test="lotatt.lotatt09 != null and lotatt.lotatt09 != ''">and att.lotatt09 = #{lotatt.lotatt09}</if>
+        <if test="lotatt.lotatt10 != null and lotatt.lotatt10 != ''">and att.lotatt10 = #{lotatt.lotatt10}</if>
+        <if test="lotatt.lotatt11 != null and lotatt.lotatt11 != ''">and att.lotatt11 = #{lotatt.lotatt11}</if>
+        <if test="lotatt.lotatt12 != null and lotatt.lotatt12 != ''">and att.lotatt12 = #{lotatt.lotatt12}</if>
+        <if test="lotatt.lotatt13 != null and lotatt.lotatt13 != ''">and att.lotatt13 = #{lotatt.lotatt13}</if>
+        <if test="lotatt.lotatt14 != null and lotatt.lotatt14 != ''">and att.lotatt14 = #{lotatt.lotatt14}</if>
+        <if test="lotatt.lotatt15 != null and lotatt.lotatt15 != ''">and att.lotatt15 = #{lotatt.lotatt15}</if>
+        <if test="lotatt.lotatt16 != null and lotatt.lotatt16 != ''">and att.lotatt16 = #{lotatt.lotatt16}</if>
+        <if test="lotatt.lotatt17 != null and lotatt.lotatt17 != ''">and att.lotatt17 = #{lotatt.lotatt17}</if>
+        <if test="lotatt.lotatt18 != null and lotatt.lotatt18 != ''">and att.lotatt18 = #{lotatt.lotatt18}</if>
+        <if test="orderByClause != null and orderByClause != ''">
+            order by ${orderByClause}
+        </if>
+        <if test="orderByClause == null or orderByClause == ''">
+            order by row_no + 0,row_index,shift_no + 0,shift_index,col_no + 0 desc,col_index
+        </if>
+    </select>
+
 
     <select id="selectAllocatingLocationAccordingConditionsOrderBy" parameterType="BaseLocationInfo"
             resultMap="BaseLocationInfoLotattResult">