功能优化

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1090,6 +1090,13 @@ public class LiteOrderCache {
                         task.setLoc(TaskCurrentLoc.Manual_FeedingInlet);
                     }
 
+                    Map<String,Long> outMap = new HashMap<>();
+                    List<Barcode> subCodeList = barcode.getSubCodeList();
+                    if (subCodeList != null && !subCodeList.isEmpty()) {
+                        outMap = subCodeList.stream().filter(Barcode::isOut).collect(Collectors.groupingBy(Barcode::getPosName, Collectors.counting()));
+                    }
+                    task.updateExtraDataMap("outCount",outMap);
+
                     try {
                         taskService.addTaskToExecute(task);
                     } catch (Exception e) {

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -11,11 +11,13 @@ import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.bean.MSDAppendInfo;
 import lombok.Data;
+import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 @Data
 @Document
@@ -396,6 +398,9 @@ public class DataLog extends BasePo implements Serializable {
      */
     private String ticketItem;
 
+
+    public Map<String,Object> extraDataMap;
+
     public String getBarcode() {
         if(barcode == null){
             return "";
@@ -604,4 +609,18 @@ public class DataLog extends BasePo implements Serializable {
         }
         return false;
     }
+
+    public void updateExtraDataMap(String key,Object value){
+        if (extraDataMap == null){
+            extraDataMap = new ConcurrentHashMap<>();
+        }
+        extraDataMap.put(key,value);
+    }
+
+    public Object getExtraDataMap(String key){
+        if (extraDataMap == null){
+            extraDataMap = new ConcurrentHashMap<>();
+        }
+        return extraDataMap.get(key);
+    }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/api/LuxsanApi.java

@@ -206,7 +206,7 @@ public class LuxsanApi extends DefaultSmfApiListener {
      * @param request
      * @return
      */
-    public static List<BackToWarehouseResult> backToWarehouse(BackToWarehouseRequest request) {
+    public static BackToWarehouseResult backToWarehouse(BackToWarehouseRequest request) {
         try {
             log.info("backToWarehouse接口请求参数为:" + JSONObject.toJSONString(request));
             String resultStr = HttpHelper.postJson(backToWarehouseUrl, request);
@@ -217,16 +217,13 @@ public class LuxsanApi extends DefaultSmfApiListener {
                 throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{apiResult.getMSGTX()});
             }
 
-            List<BackToWarehouseResult> resultList = JSONObject.parseArray(apiResult.getDATA(), BackToWarehouseResult.class);
-            if (resultList != null && !resultList.isEmpty()) {
-                return resultList;
-            }
+            BackToWarehouseResult result = JSONObject.parseObject(apiResult.getDATA(), BackToWarehouseResult.class);
+            return result;
 
         } catch (ApiException e) {
             log.error("backToWarehouse请求失败:" + e.getMessage());
             throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{e.getMessage()});
         }
-        throw new ValidateException("smfcore.api.error", "接口请求失败[{0}]", new String[]{"未找到对应的电子料入退库信息"});
     }
 
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/bean/dto/CtuTask.java

@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.bean.dto;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Map;
 
 /**
  * @author sunke
@@ -40,4 +41,6 @@ public class CtuTask {
 
     //任务优先级
     private int priority = 0;
+
+    private Object outCount;
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CtuDeviceController.java

@@ -26,10 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Api(tags = "Ctu对接接口")
@@ -117,6 +114,7 @@ public class CtuDeviceController {
                         ctuTask.setToLoc(toLoc);
                         ctuTask.setCreateDate(dataLog.getCreateDate());
                         ctuTask.setPriority(dataLog.getPriority());
+                        ctuTask.setOutCount(dataLog.getExtraDataMap("outCount"));
                         shelfToLineTaskList.add(ctuTask);
                     }
                 }
@@ -153,6 +151,7 @@ public class CtuDeviceController {
                         ctuTask.setToLoc(toLoc);
                         ctuTask.setCreateDate(dataLog.getCreateDate());
                         ctuTask.setPriority(dataLog.getPriority());
+                        ctuTask.setOutCount(dataLog.getExtraDataMap("outCount"));
                         shelfToLineTaskList.add(ctuTask);
                     }
                 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/PkCheckOutController.java

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/pkCheckOut")
@@ -93,6 +94,7 @@ public class PkCheckOutController {
             return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"pickingId"});
         }
         List<GetPickingItemsResult> pickingItems = LuxsanApi.getPickingItems(new GetPickingItemsRequest(CommonUtil.plantCode, pickingId));
+        pickingItems = pickingItems.stream().sorted(Comparator.comparing(GetPickingItemsResult :: getISSUED_QTY)).collect(Collectors.toList());
         return ResultBean.newOkResult(GetPickingItemsDto.convertGetPickingItemsResultDto(pickingItems));
     }
 

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/RestoreReplaceController.java

@@ -152,12 +152,12 @@ public class RestoreReplaceController {
 
 
         //3.先调用解绑信息
-        if (replaceBox) {
-            String unBindPalletResult = LuxsanApi.unBindPallet(new UnBindPalletRequest(CommonUtil.plantCode, ticketCode, "", palletId));
-            if (StringUtils.isNotEmpty(unBindPalletResult)) {
-                return ResultBean.newErrorResult(-1, "", boxStr + "解绑失败,原因为:" + unBindPalletResult);
-            }
+        //if (replaceBox) {
+        String unBindPalletResult = LuxsanApi.unBindPallet(new UnBindPalletRequest(CommonUtil.plantCode, ticketCode, "", palletId));
+        if (StringUtils.isNotEmpty(unBindPalletResult)) {
+            return ResultBean.newErrorResult(-1, "", boxStr + "解绑失败,原因为:" + unBindPalletResult);
         }
+        //}
 
         if (pos != null){
             Storage storage = dataCache.getStorageById(pos.getStorageId());