半成品接口增加参数

半成品增加手动完成出库任务链接

src/main/java/com/neotel/smfcore/custom/luxsan/api/bean/request/PalletUpdateRequest.java

@@ -17,4 +17,9 @@ public class PalletUpdateRequest {
     private String BIN_CODE;
     private String BIN_CODE;
     // 业务类型
     // 业务类型
     private String BIZ_TYPE;
     private String BIZ_TYPE;
+
+    /**
+     * 工厂代码
+     */
+    private String PLANT_CODE;
 }
 }

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

@@ -281,11 +281,11 @@ public class LineController {
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
-    @ApiOperation("手动完成任务")
+    @ApiOperation("手动完成入库任务")
     @RequestMapping("/finishedInTask")
     @RequestMapping("/finishedInTask")
     @AnonymousAccess
     @AnonymousAccess
-    public ResultBean bindCartonId(String boxId){
-        log.info("手动完成箱号["+boxId+"]的任务");
+    public ResultBean finishedInTask(String boxId){
+        log.info("手动完成箱号["+boxId+"]的入库任务");
         //1.解析条码
         //1.解析条码
         Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
         Barcode barcode = codeResolve.resolveOneValideBarcode("=2x2="+boxId);
         if (barcode == null) {
         if (barcode == null) {
@@ -298,7 +298,67 @@ public class LineController {
                 return ResultBean.newOkResult("");
                 return ResultBean.newOkResult("");
             }
             }
         }
         }
-        return ResultBean.newErrorResult(-1,"error.noTask","未找到该料箱的入库任务");
+        return ResultBean.newErrorResult(-1,"error.noTask","未找到该料箱["+boxId+"]的入库任务");
+    }
+
+    @ApiOperation("手动完成出库任务")
+    @RequestMapping("/finishedOutTask")
+    @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.isCheckOutTask() && queueTask.getBarcode().equals(boxId)){
+                //完成入库任务
+                finishedOutTask(queueTask);
+                return ResultBean.newOkResult("");
+            }
+        }
+        return ResultBean.newErrorResult(-1,"error.noTask","未找到该料箱["+boxId+"]的出库任务");
+    }
+
+    private void finishedOutTask(DataLog queueTask){
+
+        Barcode barcode = barcodeManager.findByBarcode(queueTask.getBarcode());
+        //通知WMS
+        PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
+        palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
+        palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
+        //上架是SWC, 下架是SWCT
+        palletUpdateRequest.setBIN_CODE("SWCT");
+        palletUpdateRequest.setBIZ_TYPE("M");
+        palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
+        LuxsanApi.palletUpdate(palletUpdateRequest);
+
+
+        //已完成,从库存中清除,并且从完成队列中清除
+        StoragePos storagePos = storagePosManager.get(queueTask.getPosId());
+        if (barcode != null) {
+            //二维码状态
+            barcode.setUsed(true);
+
+            barcode.setUsedDate(new Date());
+            //仓位状态
+            barcode.setCheckOutDate(new Date(), "");
+            //barcode.setPosName("");
+            barcode.setOrderItemId("");
+            barcode.setOrderId("");
+            barcode.setLockName("");
+            barcode.setLockId("");
+            barcodeManager.save(barcode);
+        }
+
+        storagePos.setBarcode(null);
+        storagePos.setUsed(false);
+        storagePosManager.save(storagePos);
+
+        queueTask.setStatus(OP_STATUS.FINISHED.name());
+        taskService.moveTaskToFinished(queueTask);
+
     }
     }
 
 
     private void finishedPutInTask(DataLog queueTask){
     private void finishedPutInTask(DataLog queueTask){
@@ -308,8 +368,10 @@ public class LineController {
         PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
         PalletUpdateRequest palletUpdateRequest = new PalletUpdateRequest();
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
         palletUpdateRequest.setREQUEST_ID(System.currentTimeMillis()+"");
         palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
         palletUpdateRequest.setPALLET_LIST(Lists.newArrayList(barcode.getPalletId()));
-        palletUpdateRequest.setBIN_CODE(queueTask.getPosName());
+        //上架是SWC, 下架是SWCT
+        palletUpdateRequest.setBIN_CODE("SWC");
         palletUpdateRequest.setBIZ_TYPE("M");
         palletUpdateRequest.setBIZ_TYPE("M");
+        palletUpdateRequest.setPLANT_CODE(CommonUtil.plantCode);
         LuxsanApi.palletUpdate(palletUpdateRequest);
         LuxsanApi.palletUpdate(palletUpdateRequest);