手动出入库逻辑

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
@@ -176,11 +177,11 @@ public class SpBoxCheckOutController {
         boxBarcode.updateSubCodes(gekouBarcode);
 
 
-//        //5.寻找空库位
-//        StoragePos pos = SpBoxUtil.locOnePos(boxBarcode);
-//        if (pos == null){
-//            return ResultBean.newErrorResult(-1,"",boxStr+"未找到可用的库位");
-//        }
+        //5.寻找空库位
+        StoragePos pos = SpBoxUtil.locOnePos(boxBarcode);
+        if (pos == null){
+            return ResultBean.newErrorResult(-1,"",boxStr+"未找到可用的库位");
+        }
 
         log.info("reelOutBox : boxStr=" + boxStr + ",codeStr=" + rellCodeStr + ",binCodeStr=" + gekouCodeStr + "出库完成，数量" + codeBarcode.getQty() + "，剩余数量：" + gekouBarcode.getAmount());
         //6.生成出库任务
@@ -197,10 +198,11 @@ public class SpBoxCheckOutController {
             dataLog.setSourceName(liteOrder.getOrderNo());
         }
         taskService.updateFinishedTask(dataLog);
+        boxBarcode.setStatus(BARCODE_STATUS.OUT_NORMAL);
 
-//        pos.setBarcode(boxBarcode);
-//        pos.setUsed(true);
-//        storagePosManager.save(pos);
+        pos.setBarcode(boxBarcode);
+        pos.setUsed(true);
+        storagePosManager.save(pos);
         barcodeManager.save(gekouBarcode);
         barcodeManager.save(boxBarcode);
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.core.barcode.enums.BARCODE_STATUS;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
@@ -242,12 +243,12 @@ public class SpBoxPutInController {
         gekouBarcode.setPartNumber(codeBarcode.getPartNumber());
         gekouBarcode.setAmount(gekouBarcode.getAmount() + codeBarcode.getQty());
         boxBarcode.updateSubCodes(gekouBarcode);
-
-//        //5.寻找空库位
-//        StoragePos pos = SpBoxUtil.locOnePos(boxBarcode);
-//        if (pos == null){
-//            return ResultBean.newErrorResult(-1,"",boxStr+"未找到可用的库位");
-//        }
+        boxBarcode.setStatus(BARCODE_STATUS.OUT_NORMAL);
+        //5.寻找空库位
+        StoragePos pos = SpBoxUtil.locOnePos(boxBarcode);
+        if (pos == null){
+            return ResultBean.newErrorResult(-1,"",boxStr+"未找到可用的库位");
+        }
 
         log.info("reelToBox 入库成功 : boxStr=" + boxStr + ",codeStr=" + rellCodeStr + ",binCodeStr=" + gekouCodeStr + "，数量：" + codeBarcode.getQty()+",当前数量："+gekouBarcode.getAmount());
         //6.生成入库任务
@@ -261,8 +262,8 @@ public class SpBoxPutInController {
         dataLog.setType(OP.PUT_IN);
 
 
-//        pos.setBarcode(boxBarcode);
-//        pos.setUsed(true);
+        pos.setBarcode(boxBarcode);
+        pos.setUsed(true);
         if (finish && isOrderPutIn) {
             //  调用入库接口
             if (baseNo.getClass().equals(SpareNo.class)) {
@@ -292,6 +293,7 @@ public class SpBoxPutInController {
                 returnNoManager.save(returnInventoryNo);
             }
         }
+        storagePosManager.save(pos);
         barcodeManager.save(gekouBarcode);
         barcodeManager.save(boxBarcode);
         taskService.updateFinishedTask(dataLog);