修改格口数量功能优化

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpBoxPutInController.java

@@ -55,7 +55,7 @@ public class SpBoxPutInController {
         String currentRfid = station.getCurrentRfid();
         if (ObjectUtil.isEmpty(currentRfid)) {
             if (LuxsanSpApi.Debug) {
-                currentRfid = "CS0130A";
+                currentRfid = "CS1607A";
             }
         }
 //        log.info("getStationInfo工位上"+currentRfid);
@@ -111,6 +111,9 @@ public class SpBoxPutInController {
     public ResultBean updateSubCount(@RequestBody Map<String, String> paramMap) throws Exception {
         String boxStr = paramMap.get("boxStr").trim();
         Integer subNum = Integer.parseInt(paramMap.get("subNum").trim());
+        if(ObjectUtil.isEmpty(boxStr)){
+            return ResultBean.newErrorResult(-1, "", "未找到有效的料箱条码");
+        }
         //解析料箱信息
         Barcode boxBarcode = codeResolve.resolveOneValideBarcode("=2x2=" + boxStr);
         if (boxBarcode == null) {
@@ -118,20 +121,32 @@ public class SpBoxPutInController {
         }
 
         //判断料箱是否有料
-        if (boxBarcode.getSubCodeList() != null && boxBarcode.getSubCodeList().size() > 0) {
-            return ResultBean.newErrorResult(-1, "", "料箱不为空，无法修改格口数量");
+        if (boxBarcode.getSubCodeList() != null && boxBarcode.getSubCodeList().size() > 0 && boxBarcode.getMaxSubNum() > subNum) {
+            //格口数量不能小于当前物料数量
+            if (boxBarcode.getSubCodeList().size() > subNum) {
+                return ResultBean.newErrorResult(-1, "", "料箱已有" + boxBarcode.getSubCodeList().size() + "个物料，无法修改格口数量为" + subNum);
+            }
+            for (int index = subNum + 1; index <= boxBarcode.getMaxSubNum(); index++) {
+                //判断是否已有数据
+                String subCode = boxBarcode.getBarcode() + "-" + index;
+                Barcode gekouB = boxBarcode.getSubCodeByGeKou(subCode);
+                if (gekouB != null) {
+                    return ResultBean.newErrorResult(-1, "", "料箱格口" + subCode + "已有料，无法修改格口数量为" + subNum);
+                }
+            }
         }
 
         if (subNum <= 0 && subNum > 10) {
             return ResultBean.newErrorResult(-1, "", "请输入正确的格口数量（1-10）");
         }
 
+        log.info("修改料箱" + boxBarcode.getBarcode() + "(原来格口数量：" + boxBarcode.getMaxSubNum() + ")的格口数量为：" + subNum);
         boxBarcode.setMaxSubNum(subNum);
         barcodeManager.save(boxBarcode);
 
         //更改库位中的条码
         StoragePos pos = storagePosManager.getByBarcode(boxBarcode.getBarcode());
-        if(pos!=null){
+        if (pos != null) {
             pos.setBarcode(boxBarcode);
             storagePosManager.save(pos);
         }