feat: 自建单据-单据给一个分配库位逻辑

易文鹏
1 parent 05b47ece
Showing 7 changed files with 143 additions and 46 deletions
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
src/main/java/com/huaheng/api/tv/controller/TvController.java
src/main/java/com/huaheng/api/tv/domain/ReceiptFrequencyAndQty.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationService.java
src/main/java/com/huaheng/api/wcs/service/warecellAllocation/LocationAllocationServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java
src/main/java/com/huaheng/pc/shipment/shipmentHeaderHistory/service/ShipmentHeaderHistoryServiceImpl.java
@@ -371,9 +371,6 @@ public class MesServiceImpl implements IMesService {
                 newMaterial.setCompanyCode("BHF");
                 materialService.save(newMaterial);
             } else {
-                if (!material.getCode().equals(shipmentDetail.getMaterialCode())) {
-                    throw new ServiceException("物料编码对不上，出库单：" + shipmentDetail.getMaterialCode() + "物料表：" + material.getCode());
-                }
                 shipmentDetail.setMaterialSpec(material.getSpec());
                 shipmentDetail.setMaterialUnit(material.getUnit());
             }
@@ -108,7 +108,7 @@ public class TvController extends BaseController {
     }
  
  
-    //二期新入库看板，显示入库次数和入库数量
+    //二期新入库看板，显示出入库次数和出入库数量
     @PostMapping("/getTvReceiptFrequencyAndQty")
     @ResponseBody
     public TVResult getTvReceiptFrequencyAndQty() {
@@ -120,9 +120,19 @@ public class TvController extends BaseController {
         String sql2 = "SELECT a.click_date AS DATE,ifnull( b.taskCount, 0 ) AS count FROM(SELECT curdate() AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 1 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 2 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 3 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 4 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 5 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 6 DAY ) AS click_date ) a LEFT JOIN (SELECT DATE ( h.completeTime ) AS completeTime,COUNT( DISTINCT h.id ) AS taskCount FROM task_detail d JOIN task_header h ON d.taskId = h.id WHERE h.completeTime >= DATE_SUB( CURDATE(), INTERVAL 7 DAY ) AND h.STATUS = 100 AND h.internalTaskType=100 GROUP BY DATE ( h.completeTime )) b ON a.click_date = b.completeTime ORDER BY a.click_date;";
         List<LinkedHashMap<String, Object>> list2 = mapper.selectCommon(sql2);
  
+
+        //数量
+        String sql3 = "SELECT a.click_date AS DATE,ifnull( b.taskQty, 0 ) AS qty FROM(SELECT curdate() AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 1 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 2 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 3 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 4 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 5 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 6 DAY ) AS click_date ) a LEFT JOIN (SELECT DATE ( h.completeTime ) AS completeTime,SUM( d.qty ) AS taskQty  FROM task_detail d JOIN task_header h ON d.taskId = h.id WHERE h.completeTime >= DATE_SUB( CURDATE(), INTERVAL 7 DAY ) AND h.STATUS = 100 AND h.internalTaskType=200 GROUP BY DATE ( h.completeTime )) b ON a.click_date = b.completeTime ORDER BY a.click_date;";
+        List<LinkedHashMap<String, Object>> list3 = mapper.selectCommon(sql3);
+        //次数
+        String sql4 = "SELECT a.click_date AS DATE,ifnull( b.taskCount, 0 ) AS count FROM(SELECT curdate() AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 1 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 2 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 3 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 4 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 5 DAY ) AS click_date UNION ALL SELECT date_sub( curdate(), INTERVAL 6 DAY ) AS click_date ) a LEFT JOIN (SELECT DATE ( h.completeTime ) AS completeTime,COUNT( DISTINCT h.id ) AS taskCount FROM task_detail d JOIN task_header h ON d.taskId = h.id WHERE h.completeTime >= DATE_SUB( CURDATE(), INTERVAL 7 DAY ) AND h.STATUS = 100 AND h.internalTaskType=200 GROUP BY DATE ( h.completeTime )) b ON a.click_date = b.completeTime ORDER BY a.click_date;";
+        List<LinkedHashMap<String, Object>> list4 = mapper.selectCommon(sql4);
+
         ReceiptFrequencyAndQty resultData = new ReceiptFrequencyAndQty();
         resultData.setReceiptQty(list);
         resultData.setReceiptFrequency(list2);
+        resultData.setShipmentQty(list3);
+        resultData.setShipmentFrequency(list4);
         return TVResult.success(resultData);
     }
  
@@ -9,4 +9,7 @@ import java.util.List;
 public class ReceiptFrequencyAndQty {
     private List<LinkedHashMap<String, Object>> ReceiptFrequency;
     private List<LinkedHashMap<String, Object>> ReceiptQty;
+
+    private List<LinkedHashMap<String, Object>> ShipmentFrequency;
+    private List<LinkedHashMap<String, Object>> ShipmentQty;
 }
@@ -15,5 +15,7 @@ public interface LocationAllocationService {
  
     void setTemporaryLocationType(Location location, boolean isBigContainer);
  
-    String doubleRk(String area, String roadWay, int high, Integer frequencyLocation, Integer emptyContainerTask, Integer isSelfCreated, boolean isFlammable);
+    String doubleRk(String area, String roadWay, int high, Integer frequencyLocation, Integer emptyContainerTask, boolean isFlammable);
+
+    String isSelfCreated(String roadWay, int high, Integer frequencyLocation, boolean isFlammable);
 }
@@ -60,8 +60,11 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         //二期5号巷道
         if (roadWay.equals(DYNAMIC_ROADWAY)) {
             return locationAllocationService.fiveStacker(high, containerCode, isFlammable);
+            //自建单据
+        } else if (isSelfCreated == 1) {
+            return locationAllocationService.isSelfCreated(roadWay, high, frequencyLocation, isFlammable);
         } else {
-            return locationAllocationService.doubleRk(area, roadWay, high, frequencyLocation, emptyContainerTask, isSelfCreated, isFlammable);
+            return locationAllocationService.doubleRk(area, roadWay, high, frequencyLocation, emptyContainerTask, isFlammable);
         }
     }
  
@@ -74,7 +77,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         Container container = containerService.getOne(new LambdaQueryWrapper<Container>().eq(Container::getCode, containerCode));
         String containerType = container.getContainerType();
         //判断预留库位
-        int reserveNumber = getReserveNumber();
+        int reserveNumber = getDynamicReserveNumber();
         LambdaQueryWrapper<Location> wrapper = Wrappers.lambdaQuery();
         wrapper
                 .eq(Location::getRoadway, DYNAMIC_ROADWAY)
@@ -146,7 +149,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         if (list.isEmpty()) {
             return null;
         }
-        
+
         Location location = list.stream().findFirst().orElse(null);
         if (location.getTemporaryType().equals(UNDEFINED_CONTAINER_TYPE)) {
             //设置相邻临时库位类型
@@ -203,7 +206,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String doubleRk(String area, String roadWay, int high, Integer frequencyLocation, Integer emptyContainerTask, Integer isSelfCreated, boolean isFlammable) {
+    public String doubleRk(String area, String roadWay, int high, Integer frequencyLocation, Integer emptyContainerTask, boolean isFlammable) {
         // 获取双伸位预留库位数
         int reserveNumber = getReserveNumber();
         // 移除掉可用库位数小于预留库位数的巷道
@@ -214,6 +217,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 .eq(Location::getHigh, high)
                 .eq(Location::getContainerCode, "")
                 .orderByAsc(Location::getILayer)
+                .eq(Location::getSelfCreated, NOTSELFCREATED)
                 .last(" limit 20");
  
         // emptyContainerTask=1表示是空托盘任务
@@ -224,14 +228,6 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         } else {
             wrapper.eq(Location::getOnlyEmptyContainer, 0);
         }
-
-        //自建单据
-        if (isSelfCreated == 1) {
-            wrapper.eq(Location::getSelfCreated, 1);
-        } else {
-            wrapper.eq(Location::getSelfCreated, 0);
-        }
-
         List<Location> totalLocationList = locationService.list(wrapper);
         //双伸位预留库位数不够了就排除掉该巷道
         if (totalLocationList.size() <= reserveNumber) {
@@ -246,6 +242,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 .eq(Location::getHigh, high)
                 .eq(Location::getRowFlag, ROW_OUT)//外侧
                 .eq(Location::getContainerCode, "")
+                .eq(Location::getSelfCreated, NOTSELFCREATED)
                 .last(" limit 20");
  
         //空托盘
@@ -255,14 +252,6 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         } else {
             locationLambda.eq(Location::getOnlyEmptyContainer, 0);
         }
-
-        //自建单据
-        if (isSelfCreated == 1) {
-            locationLambda.eq(Location::getSelfCreated, 1);
-        } else {
-            locationLambda.eq(Location::getSelfCreated, 0);
-        }
-
         //频繁库位
         String str;
         if (frequencyLocation == 1) {
@@ -284,7 +273,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
             if (isFlammable) {
                 locationLambda.orderByAsc(Location::getILayer);
             } else {
-                locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 10 END) ASC");
+                locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 20 END) ASC");
             }
         }
  
@@ -312,6 +301,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                     .eq(Location::getHigh, high)
                     .eq(Location::getRowFlag, ROW_IN)
                     .eq(Location::getContainerCode, "")
+                    .eq(Location::getSelfCreated, NOTSELFCREATED)
                     .last(" limit 20");
  
             if (emptyContainerTask == 1) {
@@ -321,12 +311,6 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 locationLambda.eq(Location::getOnlyEmptyContainer, 0);
             }
  
-            if (isSelfCreated == 1) {
-                locationLambda.eq(Location::getSelfCreated, 1);
-            } else {
-                locationLambda.eq(Location::getSelfCreated, 0);
-            }
-
             //频繁库位
             //if (frequencyLocation == 1) {
             //    locationLambda.orderByAsc(Location::getFrequencyLocation); //升序
@@ -343,7 +327,7 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
                 if (isFlammable) {
                     locationLambda.orderByAsc(Location::getILayer);
                 } else {
-                    locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 10 END) ASC");
+                    locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 20 END) ASC");
                 }
             }
             locationList = locationService.list(locationLambda);
@@ -368,6 +352,113 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         return location.getCode();
     }
  
+    //自建单据
+    @Override
+    public String isSelfCreated(String roadWay, int high, Integer frequencyLocation, boolean isFlammable) {
+        // 获取双伸位预留库位数
+        int reserveNumber = getReserveNumber();
+        // 移除掉可用库位数小于预留库位数的巷道
+        LambdaQueryWrapper<Location> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(Location::getArea, AREA)
+                .eq(Location::getRoadway, roadWay)
+                .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
+                .eq(Location::getHigh, high)
+                .eq(Location::getSelfCreated, SELFCREATED)
+                .eq(Location::getContainerCode, "")
+                .orderByAsc(Location::getILayer)
+                .last(" limit 20");
+
+        List<Location> totalLocationList = locationService.list(wrapper);
+        //双伸位预留库位数不够了就排除掉该巷道
+        if (totalLocationList.size() <= reserveNumber) {
+            return "可能是自建单据库位不够用了，请检查预留库位数";
+        }
+
+        // 查找外侧的库位
+        LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
+        locationLambda.eq(Location::getArea, AREA)
+                .eq(Location::getRoadway, roadWay)
+                .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
+                .eq(Location::getHigh, high)
+                .eq(Location::getSelfCreated, SELFCREATED)
+                .eq(Location::getRowFlag, ROW_OUT)//外侧
+                .eq(Location::getContainerCode, "")
+                .last(" limit 20");
+
+        //频繁库位
+        String str;
+        if (frequencyLocation == 1) {
+            str = "frequencyLocation asc";
+        } else if (frequencyLocation == 2) {
+            //常用
+            locationLambda.ge(Location::getFrequencyLocation, 2);//大于等于2
+            str = "frequencyLocation asc";
+        } else {
+            //不常用
+            str = "frequencyLocation desc";
+        }
+
+        //可燃物料
+        if (isFlammable) {
+            locationLambda.orderByAsc(Location::getILayer);
+        } else {
+            locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 20 END) ASC");
+        }
+
+
+        List<Location> locationList = locationService.list(locationLambda);
+        List<Location> removeLocaationList = new ArrayList<>();
+        if (locationList != null && !locationList.isEmpty()) {
+            for (Location location1 : locationList) {
+                //库位内侧，有未完成的任务就去掉这个库位
+                if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
+                    removeLocaationList.add(location1);
+                }
+            }
+        }
+        if (locationList != null) {
+            locationList.removeAll(removeLocaationList);
+        }
+
+        // 如果没有外侧库位可分配了，再查内侧的库位
+        if (locationList == null || locationList.isEmpty()) {
+            locationLambda = Wrappers.lambdaQuery();
+            locationLambda.eq(Location::getArea, AREA)
+                    .eq(StringUtils.isNotEmpty(roadWay), Location::getRoadway, roadWay)
+                    .eq(Location::getStatus, STATUS_LOCATION_EMPTY)
+                    .eq(Location::getHigh, high)
+                    .eq(Location::getSelfCreated, SELFCREATED)
+                    .eq(Location::getRowFlag, ROW_IN)
+                    .eq(Location::getContainerCode, "")
+                    .last(" limit 20");
+
+            //可燃物料（空托盘不用进来判断）
+            if (isFlammable) {
+                locationLambda.orderByAsc(Location::getILayer);
+            } else {
+                locationLambda.last("ORDER BY " + str + ", (CASE WHEN iLayer > 2 THEN iLayer ELSE iLayer + 20 END) ASC");
+            }
+            locationList = locationService.list(locationLambda);
+
+            removeLocaationList = new ArrayList<>();
+            if (locationList != null && !locationList.isEmpty()) {
+                for (Location location1 : locationList) {
+                    if (taskHeaderService.getUncompleteTaskInNear(location1) > 0) {
+                        removeLocaationList.add(location1);
+                    }
+                }
+            }
+            if (locationList != null) {
+                locationList.removeAll(removeLocaationList);
+            }
+        }
+        if (locationList == null || locationList.isEmpty()) {
+            return null;
+        }
+        Location location = locationList.stream().findFirst().orElse(null);
+        return location.getCode();
+    }
+
  
     //获取双伸位预留库位数
     private int getReserveNumber() {
@@ -375,6 +466,13 @@ public class LocationAllocationServiceImpl implements LocationAllocationService 
         return StringUtils.isNotEmpty(value) ? Integer.parseInt(value) : 0;
     }
  
+
+    //获取5号堆垛机动态分配大小托盘双伸位预留库位数（12个）
+    private int getDynamicReserveNumber() {
+        String value = configService.getKey(DYNAMIC_DOUBLE_FORK_RESERVE_LOCATION);
+        return StringUtils.isNotEmpty(value) ? Integer.parseInt(value) : 0;
+    }
+
     /**
      * 单伸位库位入库分配库位
      */
@@ -129,12 +129,6 @@ public class ReceiptHeaderHistoryService extends ServiceImpl&lt;ReceiptHeaderHistor
         String createdBy = receiptHeader.getCreatedBy();
         String lastUpdatedBy = receiptHeader.getLastUpdatedBy();
         Date lastUpdated = receiptHeader.getLastUpdated();
-
-        String code = receiptHeader.getCode();
-        List<ReceiptHeaderHistory> list = list(new LambdaQueryWrapper<ReceiptHeaderHistory>().eq(ReceiptHeaderHistory::getCode, code));
-        if (!list.isEmpty()) {
-            return;
-        }
         ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
         BeanUtils.copyProperties(receiptHeader, receiptHeaderHistory);
         if (StringUtils.isNotEmpty(name) && "回传".equals(name)) {
@@ -53,13 +53,6 @@ public class ShipmentHeaderHistoryServiceImpl extends ServiceImpl&lt;ShipmentHeader
         String createdBy = shipmentHeader.getCreatedBy();
         String lastUpdatedBy = shipmentHeader.getLastUpdatedBy();
         Date lastUpdated = shipmentHeader.getLastUpdated();
-
-        String code = shipmentHeader.getCode();
-        List<ShipmentHeaderHistory> list = list(new LambdaQueryWrapper<ShipmentHeaderHistory>().eq(ShipmentHeaderHistory::getCode, code));
-        if (!list.isEmpty()) {
-            return;
-        }
-
         ShipmentHeaderHistory shipmentHeaderHistory = new ShipmentHeaderHistory();
  
         BeanUtils.copyProperties(shipmentHeader, shipmentHeaderHistory);