1.料串位置缓存到数据库

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

@@ -496,7 +496,7 @@ public class CDeviceController {
     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) {
+                                                @RequestParam(value = "currentLoc",required = false) String currentLoc) {
         //1.解析条码内容
         //1.解析条码内容
         //Barcode binCode = codeResolve.resolveOneValideBarcode(boxStr);
         //Barcode binCode = codeResolve.resolveOneValideBarcode(boxStr);
 
 
@@ -528,6 +528,10 @@ public class CDeviceController {
             return ResultBean.newErrorResult(-1, "", "未找到可以出库的物料");
             return ResultBean.newErrorResult(-1, "", "未找到可以出库的物料");
         }
         }
 
 
+        //更新料串缓存信息
+        log.info("先清空:"+materialStr+"位置缓存的信息");
+        MaterialLocUtil.updateStackerLoc(materialStr,"",null);
+
         List<Barcode> barcodeList = new ArrayList<>();
         List<Barcode> barcodeList = new ArrayList<>();
         for (Barcode subCode : subCodeList) {
         for (Barcode subCode : subCodeList) {
             if (boxStr.equals(subCode.getPosName())){
             if (boxStr.equals(subCode.getPosName())){
@@ -694,9 +698,6 @@ public class CDeviceController {
         barcode.setBarSource("");
         barcode.setBarSource("");
         barcodeManager.saveBarcode(barcode);
         barcodeManager.saveBarcode(barcode);
 
 
-        //更新料串缓存信息
-        MaterialLocUtil.updateStackerLoc(materialStr,"",null);
-
         Map<String,String> resultMap = new HashMap<>();
         Map<String,String> resultMap = new HashMap<>();
         resultMap.put("binCode",boxStr);
         resultMap.put("binCode",boxStr);
         resultMap.put("seq",seq+"");
         resultMap.put("seq",seq+"");

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

@@ -61,7 +61,7 @@ public class MaterialLocUtil {
         materialLoc.setUpdateDate(new Date());
         materialLoc.setUpdateDate(new Date());
 
 
         stackerLocMap.put(stackerCode, materialLoc);
         stackerLocMap.put(stackerCode, materialLoc);
-        //dataCache.updateCache(CACHE_STACKER_LOC, stackerLocMap);
+        dataCache.updateCache(CACHE_STACKER_LOC, stackerLocMap);
     }
     }
 
 
     public static String getStackerDestination(String stackerCode){
     public static String getStackerDestination(String stackerCode){