半成品入库验证箱号时, 只判断结果, 不需要保存信息

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

@@ -88,22 +88,7 @@ public class LineController {
         }
         }
         try {
         try {
             ValidCartonResult result = LuxsanApi.validCarton(new ValidCartonRequest("", scanCartonId, CommonUtil.plantCode));
             ValidCartonResult result = LuxsanApi.validCarton(new ValidCartonRequest("", scanCartonId, CommonUtil.plantCode));
-            //设置barcode的其他参数
-            barcode.setPlantCode(result.getPLANT());
-            barcode.setCartonId(result.getCARTON_ID());
-            barcode.setPalletId(result.getPALLET_ID());
-            barcode.setPn(result.getPN());
-            barcode.setModelFamily(result.getMODEL_FAMILY());
-            barcode.setMaterialType(result.getMATERIAL_TYPE());
-            barcode.setWarehouseCode(result.getWAREHOUSE_CODE());
-            barcode.setHold(result.getHOLD());
-            barcode.setQty(result.getQTY());
-            barcode.setFullQty(result.getFULL_QTY());
-            barcode.setPackType(result.getPACK_TYPE());
-            barcode.setCreateAt(result.getCREATE_AT());
-            barcode.setRegion(result.getREGION());
-            barcode.setStatus(result.getSTATUS());
-            barcode = barcodeManager.save(barcode);
+
         } catch (Exception e) {
         } catch (Exception e) {
             return ResultBean.newErrorResult(-1, "", e.getMessage());
             return ResultBean.newErrorResult(-1, "", e.getMessage());
         }
         }
@@ -133,7 +118,7 @@ public class LineController {
         } else {
         } else {
             //2.请求接口判断是否过账
             //2.请求接口判断是否过账
             try {
             try {
-                String palletId = barcode.getPalletId();
+                String palletId = barcode.getScanCartonId();
                 FetchPalletInfoResult fetchPalletInfo = null;
                 FetchPalletInfoResult fetchPalletInfo = null;
                 List<FetchPalletInfoResult> fetchPalletList = LuxsanApi.fetchPalletInfo(new FetchPalletInfoRequest("", CommonUtil.plantCode, Arrays.asList(palletId)));
                 List<FetchPalletInfoResult> fetchPalletList = LuxsanApi.fetchPalletInfo(new FetchPalletInfoRequest("", CommonUtil.plantCode, Arrays.asList(palletId)));
                 for (FetchPalletInfoResult result : fetchPalletList) {
                 for (FetchPalletInfoResult result : fetchPalletList) {
@@ -146,7 +131,24 @@ public class LineController {
                     if (fetchPalletInfo.getSTATUS() != PalletEnum.INVENTORY_IN_WAREHOUSE) {
                     if (fetchPalletInfo.getSTATUS() != PalletEnum.INVENTORY_IN_WAREHOUSE) {
                         return ResultBean.newErrorResult(-1, "", fetchPalletInfo.getPALLET_ID() + "不是在库库存状态,不允许入库");
                         return ResultBean.newErrorResult(-1, "", fetchPalletInfo.getPALLET_ID() + "不是在库库存状态,不允许入库");
                     }
                     }
+                    //设置barcode的其他参数
+                    barcode.setPlantCode(fetchPalletInfo.getPLANT());
+                    barcode.setCartonId(fetchPalletInfo.getPALLET_ID());
+                    barcode.setPalletId(fetchPalletInfo.getPALLET_ID());
+                    barcode.setPn(fetchPalletInfo.getMATERIAL_CODE());
+                    barcode.setModelFamily(fetchPalletInfo.getMODEL_FAMILY());
+                    barcode.setMaterialType(fetchPalletInfo.getMATERIAL_TYPE());
+                    barcode.setWarehouseCode(fetchPalletInfo.getWAREHOUSE_CODE());
+                    barcode.setHold(fetchPalletInfo.getHOLD());
+                    barcode.setQty(fetchPalletInfo.getQTY());
+                    //barcode.setFullQty(fetchPalletInfo.getFULL_QTY());
+                    barcode.setPackType(fetchPalletInfo.getPACK_TYPE());
+                    barcode.setCreateAt(fetchPalletInfo.getCREATED_TIME());
+                    //barcode.setRegion(fetchPalletInfo.getREGION());
+                    barcode.setStatus(fetchPalletInfo.getSTATUS());
+                    barcode = barcodeManager.save(barcode);
                 }
                 }
+
             } catch (Exception e) {
             } catch (Exception e) {
                 return ResultBean.newErrorResult(-1, "", e.getMessage());
                 return ResultBean.newErrorResult(-1, "", e.getMessage());
             }
             }
@@ -258,4 +260,31 @@ public class LineController {
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
+    @ApiOperation("手动完成任务")
+    @RequestMapping("/finishedInTask")
+    @AnonymousAccess
+    public ResultBean bindCartonId(String boxId){
+        log.info("手动完成箱号["+boxId+"]的任务");
+        //1.解析条码
+        Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
+        if (barcode == null) {
+            return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
+        }
+        for (DataLog queueTask : taskService.getQueueTasks()) {
+            if(queueTask.isPutInTask() && queueTask.getBarcode().equals(boxId)){
+                //完成入库任务
+                finishedPutInTask(queueTask);
+                return ResultBean.newOkResult("");
+            }
+        }
+        return ResultBean.newErrorResult(-1,"error.noTask","未找到该料箱的入库任务");
+    }
+
+    private void finishedPutInTask(DataLog queueTask){
+        queueTask.setStatus(OP_STATUS.FINISHED.name());
+        //TODO: 保存库存, 通知WMS
+        taskService.moveTaskToFinished(queueTask);
+
+    }
+
 }
 }