1.新增出料口

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/LineController.java

@@ -169,7 +169,13 @@ public class LineController {
     public synchronized ResultBean fetchPalletInfo(@RequestBody Map<String, String> paramMap) {
     public synchronized ResultBean fetchPalletInfo(@RequestBody Map<String, String> paramMap) {
 
 
         String boxId = paramMap.get("cartonId");
         String boxId = paramMap.get("cartonId");
-        log.info("线体第二个扫码枪扫描到箱号["+boxId+"],判断过账是否完成");
+        String loc = paramMap.get("loc");
+        log.info("线体第二个扫码枪扫描到箱号["+boxId+"],判断过账是否完成,位置为:"+loc);
+        if (StringUtils.isNotEmpty(loc)){
+            if (!loc.equals(TaskLocUtil.IN_2)){
+                return ResultBean.newErrorResult(-1,"","传入的位置信息应为:"+TaskLocUtil.IN_2);
+            }
+        }
         //1.解析条码
         //1.解析条码
         Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
         Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
         if (barcode == null) {
         if (barcode == null) {
@@ -291,6 +297,9 @@ public class LineController {
 
 
         //4.生成入库任务
         //4.生成入库任务
         String boxLoc = TaskLocUtil.IN;
         String boxLoc = TaskLocUtil.IN;
+        if (StringUtils.isNotEmpty(loc)){
+            boxLoc = loc;
+        }
         taskService.addPutInTaskToExecute(storage, barcode, pos,boxLoc);
         taskService.addPutInTaskToExecute(storage, barcode, pos,boxLoc);
 
 
         CacheUtil.clearBindInfo(barcode.getBarcode());
         CacheUtil.clearBindInfo(barcode.getBarcode());