1.人工GR入库,卡控13/15寸料箱信息

2.提供接口给出库流水线,定时更新空箱/满箱数量

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

@@ -230,12 +230,20 @@ public class ManualGrPutInController {
         }
 
         if (13 == w){
-            if (!binCode.startsWith("C13") && !binCode.endsWith("-01")){
+            if (!binCode.startsWith("C13")){
                 return ResultBean.newErrorResult(-1,"","13寸的物料,请放入C13的01号料格中");
+            } else {
+                if (!binCode.endsWith("-01")){
+                    return ResultBean.newErrorResult(-1,"","13寸的物料,请放入C13的01号料格中");
+                }
             }
         } else if (15 == w){
-            if (!binCode.startsWith("C15") && !binCode.endsWith("-01")){
+            if (!binCode.startsWith("C15")){
                 return ResultBean.newErrorResult(-1,"","15寸的物料,请放入C15的01号料格中");
+            } else {
+                if (!binCode.endsWith("-01")){
+                    return ResultBean.newErrorResult(-1,"","15寸的物料,请放入C15的01号料格中");
+                }
             }
         } else if (7 == w){
             if (binCode.startsWith("C15")){

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

+package com.neotel.smfcore.custom.luxsan.factory_c.third;
+
+import com.google.common.collect.Maps;
+import com.neotel.smfcore.common.bean.ResultBean;
+import com.neotel.smfcore.common.utils.StringUtils;
+import com.neotel.smfcore.custom.luxsan.factory_c.third.bean.OutLineBoxNum;
+import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+@Slf4j
+@RequestMapping("/rawOutLine")
+public class RawOutLineController {
+
+
+    static Map<String, OutLineBoxNum> cacheBoxNumMap = Maps.newConcurrentMap();
+
+
+    @ApiOperation("修改出库分拣线上料箱数量")
+    @RequestMapping("/updateBoxNum")
+    @AnonymousAccess
+    public ResultBean updateBoxNum(@RequestBody OutLineBoxNum boxNum) {
+        log.info("收到出库流水线修改数量信息,编号为:"+boxNum.getLineNo()+"空箱子数量:"+boxNum.getEmptyBoxNum()+",满箱子数量:"+boxNum.getFullBoxNum());
+        String lineNo = boxNum.getLineNo();
+        if (StringUtils.isEmpty(lineNo)){
+            return ResultBean.newErrorResult(-1,"","线体编号不能为空");
+        }
+        cacheBoxNumMap.put(lineNo,boxNum);
+        return ResultBean.newOkResult("");
+    }
+
+    @ApiOperation("获取出库流水线的箱子数量详情")
+    @RequestMapping("/getLineBoxNum")
+    @AnonymousAccess
+    public ResultBean getLineBoxNum(String lineNo) {
+        if (StringUtils.isEmpty(lineNo)){
+            return ResultBean.newErrorResult(-1,"","线体编号不能为空");
+        }
+        OutLineBoxNum boxNum = cacheBoxNumMap.get(lineNo);
+        if (boxNum == null){
+            boxNum = new OutLineBoxNum(lineNo,0,0);
+        }
+        return ResultBean.newOkResult(boxNum);
+    }
+}

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

+package com.neotel.smfcore.custom.luxsan.factory_c.third.bean;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+public class OutLineBoxNum {
+
+    //出库缓存线为outLine01到outLine06
+    private String lineNo;
+
+    //空箱子数量
+    private int emptyBoxNum;
+
+    //满箱子数量
+    private int fullBoxNum;
+}