出入库增加入料机构名称

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

@@ -142,6 +142,7 @@ public class CDeviceController {
         String binCodeStr = paramMap.get("binCode");  //料格
         String binCodeStr = paramMap.get("binCode");  //料格
         String codeStr = paramMap.get("codeStr");  //物料条码
         String codeStr = paramMap.get("codeStr");  //物料条码
         String materialStr = paramMap.get("materialStr"); //料串信息
         String materialStr = paramMap.get("materialStr"); //料串信息
+        String currentLoc = paramMap.get("currentLoc"); //当前位置
 
 
         log.info("物料放入料格,料格为:"+binCodeStr+",物料条码为:"+codeStr+",料串信息为:"+materialStr);
         log.info("物料放入料格,料格为:"+binCodeStr+",物料条码为:"+codeStr+",料串信息为:"+materialStr);
 
 
@@ -291,7 +292,7 @@ public class CDeviceController {
                 barcode.setPutInTime(System.currentTimeMillis());
                 barcode.setPutInTime(System.currentTimeMillis());
                 barcode = barcodeManager.save(barcode);
                 barcode = barcodeManager.save(barcode);
 
 
-                generatePutInTask(barcode, boxBarcode,OP_STATUS.FINISHED.name());
+                generatePutInTask(barcode, boxBarcode,OP_STATUS.FINISHED.name(),currentLoc);
                 boxBarcode.updateSubCodes(barcode);
                 boxBarcode.updateSubCodes(barcode);
                 boxBarcode.setAmount(boxBarcode.getAmount()+barcode.getAmount());
                 boxBarcode.setAmount(boxBarcode.getAmount()+barcode.getAmount());
                 barcodeManager.save(boxBarcode);
                 barcodeManager.save(boxBarcode);
@@ -494,7 +495,8 @@ public class CDeviceController {
     @AnonymousAccess
     @AnonymousAccess
     public synchronized ResultBean reelCheckOut(@RequestParam("boxStr") String boxStr,
     public synchronized ResultBean reelCheckOut(@RequestParam("boxStr") String boxStr,
                                                 @RequestParam("isNormal") boolean isNormal,
                                                 @RequestParam("isNormal") boolean isNormal,
-                                                @RequestParam("materialStr") String materialStr) {
+                                                @RequestParam("materialStr") String materialStr,
+                                                @RequestParam("currentLoc") String currentLoc) {
         //1.解析条码内容
         //1.解析条码内容
         //Barcode binCode = codeResolve.resolveOneValideBarcode(boxStr);
         //Barcode binCode = codeResolve.resolveOneValideBarcode(boxStr);
 
 
@@ -669,6 +671,9 @@ public class CDeviceController {
         dataLog.setProvider(barcode.getProvider());
         dataLog.setProvider(barcode.getProvider());
         dataLog.setProviderNumber(barcode.getProviderNumber());
         dataLog.setProviderNumber(barcode.getProviderNumber());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        if (StringUtils.isNotEmpty(currentLoc)){
+            dataLog.setCurrentLoc(currentLoc);
+        }
         taskService.updateFinishedTask(dataLog);
         taskService.updateFinishedTask(dataLog);
 
 
         //有出库,此料格就去除满格标志
         //有出库,此料格就去除满格标志
@@ -1075,7 +1080,7 @@ public class CDeviceController {
     }
     }
 
 
 
 
-    private void generatePutInTask(Barcode barcode, Barcode boxBarcode,String status) {
+    private void generatePutInTask(Barcode barcode, Barcode boxBarcode,String status,String currentLoc) {
 
 
         DataLog dataLog = new DataLog();
         DataLog dataLog = new DataLog();
         dataLog.setPosId(boxBarcode.getId());
         dataLog.setPosId(boxBarcode.getId());
@@ -1090,6 +1095,9 @@ public class CDeviceController {
         dataLog.setBatchInfo(barcode.getBatch());
         dataLog.setBatchInfo(barcode.getBatch());
         dataLog.setSourceName(barcode.getBarSource());
         dataLog.setSourceName(barcode.getBarSource());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
+        if (StringUtils.isNotEmpty(currentLoc)){
+            dataLog.setCurrentLoc(currentLoc);
+        }
         taskService.updateQueueTask(dataLog);
         taskService.updateQueueTask(dataLog);
     }
     }
 
 

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

@@ -88,6 +88,10 @@ public class StationController {
             cacheMap = Maps.newConcurrentMap();
             cacheMap = Maps.newConcurrentMap();
         }
         }
         String boxStr = cacheMap.get(station);
         String boxStr = cacheMap.get(station);
+        if (StringUtils.isEmpty(boxStr)){
+            return ResultBean.newErrorResult(-1,"",station+"对应的料箱信息不存在");
+        }
+
         boxStr = boxStr.toUpperCase(Locale.ROOT);
         boxStr = boxStr.toUpperCase(Locale.ROOT);
 
 
         //如果不是C07,C13,C15开头的 报错
         //如果不是C07,C13,C15开头的 报错

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

-package com.neotel.smfcore.custom.luxsan.factory_c.rawstor.controller.manual;
+package com.neotel.smfcore.custom.luxsan.factory_c.third;
 
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
@@ -70,7 +70,7 @@ public class ManualLineController {
             cacheMap = Maps.newConcurrentMap();
             cacheMap = Maps.newConcurrentMap();
         }
         }
         cacheMap.put(stationNo, boxCode);
         cacheMap.put(stationNo, boxCode);
-        dataCache.updateCache(CacheNameUtil.CHCHE_MANUAL_LINE_STATIONSTATUS, boxCode);
+        dataCache.updateCache(CacheNameUtil.CHCHE_MANUAL_LINE_STATIONSTATUS, cacheMap);
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }