1.优化功能提交

src/main/java/com/neotel/smfcore/custom/lizhen/agvBox/rest/OutLineController.java

@@ -425,7 +425,7 @@ public class OutLineController {
                pidBarcode.setReelAmount(pidBarcode.getReelAmount() - 1);
                pidBarcode.setReelAmount(pidBarcode.getReelAmount() - 1);
                pidBarcode.setAmount(pidBarcode.getAmount() - amount);
                pidBarcode.setAmount(pidBarcode.getAmount() - amount);
                barcodeManager.save(pidBarcode);
                barcodeManager.save(pidBarcode);
-
+               pidBarcode.updateExtraData(barcode.getPosName(),null);
 
 
                int extendType = StringUtils.isNotBlank(barcode.getOrderItemId()) ? ExtendType.VIRTUAL_PICKING_DETAIL : ExtendType.VIRTUAL_CHECKOUT;
                int extendType = StringUtils.isNotBlank(barcode.getOrderItemId()) ? ExtendType.VIRTUAL_PICKING_DETAIL : ExtendType.VIRTUAL_CHECKOUT;
                generateTask(barcode, opStatus, amount, opType, orderItemId, extendType, false);
                generateTask(barcode, opStatus, amount, opType, orderItemId, extendType, false);
@@ -472,7 +472,7 @@ public class OutLineController {
                        manualCheckOut(barcode);
                        manualCheckOut(barcode);
 
 
                        barcodeByOut = barcodeManager.save(barcodeByOut);
                        barcodeByOut = barcodeManager.save(barcodeByOut);
-
+                       pidBarcode.updateExtraData(barcode.getPosName(),null);
 
 
                        int extendType = StringUtils.isNotBlank(barcode.getOrderItemId()) ? ExtendType.VIRTUAL_PICKING_DETAIL : ExtendType.VIRTUAL_CHECKOUT;
                        int extendType = StringUtils.isNotBlank(barcode.getOrderItemId()) ? ExtendType.VIRTUAL_PICKING_DETAIL : ExtendType.VIRTUAL_CHECKOUT;
                        generateTask(barcode, opStatus, amount, opType, orderItemId, extendType, false);
                        generateTask(barcode, opStatus, amount, opType, orderItemId, extendType, false);
@@ -492,6 +492,7 @@ public class OutLineController {
                    }
                    }
                }
                }
            }
            }
+
            pidBarcode = barcodeManager.save(pidBarcode);
            pidBarcode = barcodeManager.save(pidBarcode);
 
 
            StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);
            StoragePos pos = BoxHandleUtil.locOnePos(pidBarcode);

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

@@ -148,13 +148,15 @@ public class ManualGrPutInController {
 
 
         Barcode barcode = codeResolve.resolveCode(boxStr);
         Barcode barcode = codeResolve.resolveCode(boxStr);
         if (barcode != null){
         if (barcode != null){
-            StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
-            if (pos != null){
-                barcode = pos.getBarcode();
-                barcode.setStatus(BARCODE_STATUS.OUT_NORMAL); //设置成 不在库
-                barcodeManager.save(barcode);
-                pos.setBarcode(barcode);
-                storagePosManager.save(pos);
+            if (barcode.getStatus() == BARCODE_STATUS.IN_STORE) {
+                StoragePos pos = storagePosManager.getByBarcode(barcode.getBarcode());
+                if (pos != null) {
+                    barcode = pos.getBarcode();
+                    barcode.setStatus(BARCODE_STATUS.OUT_NORMAL); //设置成 不在库
+                    barcodeManager.save(barcode);
+                    pos.setBarcode(barcode);
+                    storagePosManager.save(pos);
+                }
             }
             }
         }
         }
 
 

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

@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -185,4 +186,20 @@ public class ManualLineController {
         DataLog dataLog = taskService.addPutInTaskToExecute(storage, boxBarcode, pos, lineNo+"_out");
         DataLog dataLog = taskService.addPutInTaskToExecute(storage, boxBarcode, pos, lineNo+"_out");
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
+
+
+    @ApiOperation("获取料串目的地接口")
+    @RequestMapping("/material/api/getDestination")
+    @AnonymousAccess
+    public ResultBean getDestination(@RequestBody Map<String, String> paramMap) {
+
+        String materialStr = paramMap.get("materialStr");
+        String loc = paramMap.get("loc");
+        log.info("获取料串目的地,料串为:" + materialStr + ",位置为:" + loc);
+
+        Map<String, String> resultMap = new HashMap<>();
+        resultMap.put("destination", "C2-3F-BG");
+        resultMap.put("materialStr", materialStr);
+        return ResultBean.newOkResult(resultMap);
+    }
 }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/util/BoxHandleUtil.java

@@ -356,6 +356,12 @@ public class BoxHandleUtil {
 
 
     public static StoragePos locOnePos(Barcode boxBarcode) {
     public static StoragePos locOnePos(Barcode boxBarcode) {
 
 
+        //判断信息是否在已经在库位中(出入库只改变料箱位置状态,不从StoragePos表中清除)
+        StoragePos pos = storagePosManager.getByBarcode(boxBarcode.getBarcode());
+        if (pos != null) {
+            return pos;
+        }
+
         //默认只差第一个隔口
         //默认只差第一个隔口
         String barcode = boxBarcode.getBarcode();
         String barcode = boxBarcode.getBarcode();
         String binCodeStr = barcode + "-01";
         String binCodeStr = barcode + "-01";
@@ -371,13 +377,6 @@ public class BoxHandleUtil {
 
 
         boxBarcode.setWarehouseCode(warehouseCode);
         boxBarcode.setWarehouseCode(warehouseCode);
 
 
-
-        //判断信息是否在已经在库位中(出入库只改变料箱位置状态,不从StoragePos表中清除)
-        StoragePos pos = storagePosManager.getByBarcode(boxBarcode.getBarcode());
-        if (pos != null) {
-            return pos;
-        }
-
         List<String> cidList = new ArrayList<>();
         List<String> cidList = new ArrayList<>();
         List<Storage> storageList = new ArrayList<>();
         List<Storage> storageList = new ArrayList<>();
         for (Storage storage : dataCache.getAllStorage().values()) {
         for (Storage storage : dataCache.getAllStorage().values()) {
@@ -437,11 +436,12 @@ public class BoxHandleUtil {
                 if (barcode != null) {
                 if (barcode != null) {
                     boxStr = barcode.getBarcode();
                     boxStr = barcode.getBarcode();
                     String endStr = code.substring(code.length() - 1);  //得到是A、B面
                     String endStr = code.substring(code.length() - 1);  //得到是A、B面
-                    /*if (boxSideMap.get(boxStr) != null) {
-                        endStr = boxSideMap.get(boxStr);
-                    } else {
+                    if ("A".equals(endStr) || "B".equals(endStr)){
                         boxSideMap.put(boxStr, endStr);
                         boxSideMap.put(boxStr, endStr);
-                    }*/
+                    }
+                    if (boxSideMap.get(boxStr) != null){
+                        endStr = boxSideMap.get(boxStr);
+                    }
                     List<Barcode> subCodeList = barcode.getSubCodeList();
                     List<Barcode> subCodeList = barcode.getSubCodeList();
                     if (subCodeList == null){
                     if (subCodeList == null){
                         subCodeList = new ArrayList<>();
                         subCodeList = new ArrayList<>();

src/main/resources/config/application-prod.yml

@@ -11,8 +11,8 @@ login:
 spring:
 spring:
   data:
   data:
     mongodb:
     mongodb:
-      host: 127.0.0.1
-#      host: 10.68.27.88      # 主机地址
+      #host: 127.0.0.1
+      host: 10.68.27.88      # 主机地址
       port: 27017           # 端口
       port: 27017           # 端口
       database: smf  #原材料仓数据库
       database: smf  #原材料仓数据库