入库问题提交

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -1155,7 +1155,11 @@ public class TaskService {
         //记录在库时长
         task.setInStoreTime(barcode.getInStoreMiniute());
 
+
+        if (barcode != null && barcode.getBarcode().equals(task.getBarcode())) {
+
             barcode = barcodeManager.get(barcode.getId());
+
             if (barcode != null) {
                 //二维码状态
                 barcode.setUsed(true);
@@ -1176,8 +1180,7 @@ public class TaskService {
             storagePos.setBarcode(null);
             storagePos.setUsed(false);
             storagePosManager.save(storagePos);
-
-
+        }
         log.info(task.getBarcode() + "出库完成,清空仓位: " + storagePos.getId() + "[" + storagePos.getPosName() + "]");
         //更新缓存中的库存信息
         dataCache.updateInventory(storagePos, barcode);

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

@@ -538,7 +538,7 @@ public class WarehouseController {
         //判断是否盘点完成
         boolean finished = BoxUtil.isInventoryFinished(boxStr);
         if (!finished) {
-            return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
+            //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
         }
         boxBarcode.setInventory(false);
         boxBarcode = barcodeManager.save(boxBarcode);

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

@@ -9,6 +9,8 @@ public class ReturnTower {
 
     private String materialStr;
 
+    private String partNumber;
+
     private String warehouseCode;
 
     private String provider;

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

@@ -11,6 +11,8 @@ public class StorTransfer {
 
     private String warehouseCode;
 
+    private String partNumber;
+
     private String provider;
 
     private int w;

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

@@ -831,7 +831,7 @@ public class CDeviceController {
 
             if (MaterialUtil.storTransfer(stackerId)) {
                 StorTransfer storTransfer = MaterialUtil.getStorTransferInfo(stackerId);
-                partNumber = storTransfer.getMaterialStr();
+                partNumber = storTransfer.getPartNumber();
                 provider = storTransfer.getProvider();
             } else if (MaterialUtil.ticketTransfer(stackerId)){
                 TicketTransfer ticketTransfer = MaterialUtil.getTicketTransferInfo(stackerId);
@@ -848,7 +848,7 @@ public class CDeviceController {
                 dateStr = bindGrInfo.getGrDate();
             } else if (MaterialUtil.returnTower(stackerId)){
                 ReturnTower returnTower = MaterialUtil.getReturnTowerInfo(stackerId);
-                partNumber = returnTower.getMaterialStr();
+                partNumber = returnTower.getPartNumber();
                 provider = returnTower.getProvider();
             }
 

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

@@ -99,7 +99,7 @@ public class ReturnTowerController {
             h = 32;
         }
 
-        ReturnTower returnTower = new ReturnTower(materialStr,warehouseCode,barcode.getProvider(),reelSize,h);
+        ReturnTower returnTower = new ReturnTower(materialStr,barcode.getPartNumber(),warehouseCode,barcode.getProvider(),reelSize,h);
 
         //1.判断料仓信息是否在储位转移中
         Map<String, ReturnTower> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_RETURN_TOWER);

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

@@ -92,7 +92,7 @@ public class StorTransferController {
             h = 32;
         }
 
-        StorTransfer storTransfer = new StorTransfer(materialStr,warehouseCode,barcode.getProvider(),reelSize,h);
+        StorTransfer storTransfer = new StorTransfer(materialStr,warehouseCode,barcode.getPartNumber(),barcode.getProvider(),reelSize,h);
 
         //1.判断料仓信息是否在储位转移中
         Map<String, StorTransfer> cacheMap = dataCache.getCache(CacheNameUtil.CHCHE_STOR_TRANSFER);

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

@@ -367,7 +367,7 @@ public class ManualGrPutInController {
         //判断盘点是否完成
         boolean finished = BoxUtil.isInventoryFinished(boxStr);
         if (!finished) {
-            return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
+            //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
         }
 
         //1.清理要出库的数据
@@ -516,6 +516,7 @@ public class ManualGrPutInController {
         dataLog.setBatchInfo(barcode.getBatch());
         dataLog.setSourceName(barcode.getBarSource());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        dataLog.setOperator(SecurityUtils.getLoginUsername());
         taskService.updateFinishedTask(dataLog);
     }
 }

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

@@ -3,6 +3,7 @@ package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller.manual;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.DateUtil;
+import com.neotel.smfcore.common.utils.SecurityUtils;
 import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.api.SmfApi;
 import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
@@ -239,6 +240,7 @@ public class ManualReturnTowerController {
         dataLog.setBatchInfo(barcode.getBatch());
         dataLog.setSourceName(barcode.getBarSource());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        dataLog.setOperator(SecurityUtils.getLoginUsername());
         taskService.updateFinishedTask(dataLog);
     }
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/third/ManualLineController.java

@@ -138,7 +138,7 @@ public class ManualLineController {
 
             boolean finished = BoxUtil.isInventoryFinished(boxBarcode.getBarcode());
             if (!finished) {
-                return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
+                //return ResultBean.newErrorResult(-1, "", boxStr + "盘点未完成,请继续盘点");
             }
 
             //1.清理要出库的数据