1.尾料仓功能优化

src/main/java/com/neotel/smfcore/core/device/handler/impl/TailingMaterialBoxHandler.java

@@ -168,6 +168,7 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"柜体", posName});
             return ResultBean.newErrorResult(-1, "smfcore.valueNotExist", "{0}[{1}]不存在", new String[]{"柜体", posName});
         }
         }
         Barcode posBarcode = getPosBarcode(pos);
         Barcode posBarcode = getPosBarcode(pos);
+        posBarcode.setPutInTime(System.currentTimeMillis());
         //判断和放入的是否一样
         //判断和放入的是否一样
         List<Barcode> subCodeList = posBarcode.getSubCodeList();
         List<Barcode> subCodeList = posBarcode.getSubCodeList();
         if (subCodeList != null && !subCodeList.isEmpty()) {
         if (subCodeList != null && !subCodeList.isEmpty()) {
@@ -227,7 +228,6 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
         //找到最早入库的物料信息
         //找到最早入库的物料信息
         StoragePos pos = null;
         StoragePos pos = null;
         Barcode barcode = null;
         Barcode barcode = null;
-        int amount = 0;
         for (StoragePos storagePos : storagePosList) {
         for (StoragePos storagePos : storagePosList) {
             if (pos == null) {
             if (pos == null) {
                 pos = storagePos;
                 pos = storagePos;
@@ -235,7 +235,6 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
             Barcode posBarcode = storagePos.getBarcode();
             Barcode posBarcode = storagePos.getBarcode();
             List<Barcode> subCodeList = posBarcode.getSubCodeList();
             List<Barcode> subCodeList = posBarcode.getSubCodeList();
             for (Barcode subCode : subCodeList) {
             for (Barcode subCode : subCodeList) {
-                amount = subCode.getAmount() + amount;
                 if (barcode == null) {
                 if (barcode == null) {
                     barcode = subCode;
                     barcode = subCode;
                 }
                 }
@@ -248,6 +247,17 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
         log.info("找到最早入库的库位为:" + pos.getPosName() + ",入库日期为:" + barcode.getPutInDate(), "开始亮灯");
         log.info("找到最早入库的库位为:" + pos.getPosName() + ",入库日期为:" + barcode.getPutInDate(), "开始亮灯");
         opPosLight("open", pos, putInColor);
         opPosLight("open", pos, putInColor);
 
 
+        int amount = 0;
+        Barcode posBarcode = pos.getBarcode();
+        if (posBarcode != null){
+            List<Barcode> subCodeList = posBarcode.getSubCodeList();
+            if (subCodeList != null && !subCodeList.isEmpty()){
+                for (Barcode subCode : subCodeList) {
+                    amount = subCode.getAmount() + amount;
+                }
+            }
+        }
+
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         resultMap.put("posName", pos.getPosName());
         resultMap.put("posName", pos.getPosName());
         resultMap.put("partNumber", partNumber);
         resultMap.put("partNumber", partNumber);
@@ -369,6 +379,14 @@ public class TailingMaterialBoxHandler extends BaseDeviceHandler {
         Barcode barcode = pos.getBarcode();
         Barcode barcode = pos.getBarcode();
         if (barcode == null) {
         if (barcode == null) {
             barcode = barcodeManager.findByBarcode(pos.getPosName());
             barcode = barcodeManager.findByBarcode(pos.getPosName());
+            if (barcode != null){
+                String id = barcode.getId();
+                barcode = new Barcode();
+                barcode.setId(id);
+                barcode.setBarcode(pos.getPosName());
+                barcode.setAmount(0);
+                barcodeManager.save(barcode);
+            }
         }
         }
         if (barcode == null) {
         if (barcode == null) {
             barcode = new Barcode();
             barcode = new Barcode();