盘点功能 优化提交

src/main/java/com/neotel/smfcore/core/barcode/rest/bean/dto/BarcodeDto.java

@@ -291,4 +291,9 @@ public class BarcodeDto implements Serializable {
 
     @ApiModelProperty("标签id")
     private String labelId;
+
+    //出库异常信息
+    private String outExpInfo = "";
+
+    private Map<String,String> extraDataMap = new HashMap<>();
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/util/CommonUtil.java

@@ -12,4 +12,6 @@ public class CommonUtil {
     private void setPlantCode(String code){
         CommonUtil.plantCode = code;
     }
+
+    public static String outExpPrefix = "Out_Exp";
 }

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

@@ -391,6 +391,20 @@ public class ManualGrPutInController {
         }
 
         boxBarcode.setSubCodeList(newSubCodeList);
+
+        //清除标记
+        Map<String, String> extraDataMap = boxBarcode.getExtraDataMap();
+        if (extraDataMap != null && !extraDataMap.isEmpty()){
+            Map<String, String> resultMap = new HashMap<>();
+            for (String  key: extraDataMap.keySet()) {
+                if (key.startsWith(CommonUtil.outExpPrefix)){
+                    continue;
+                }
+                resultMap.put(key,extraDataMap.get(key));
+            }
+            boxBarcode.setExtraDataMap(resultMap);
+        }
+
         boxBarcode = barcodeManager.save(boxBarcode);
 
         //同时更新pos表