Merge remote-tracking branch 'origin/smf-core-21088' into smf-core-21088

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

@@ -14,5 +14,5 @@ public class ShipCancelUpshelfRequest {
     private String TICKET_CODE;
 
     //标签码
-    private String PALLET_ID;
+    private String LABEL_ID;
 }

src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/common/controller/WcsController.java

@@ -65,20 +65,20 @@ public class WcsController {
         String ticketCode = paramMap.get("TICKET_CODE");
         log.info("wms砍单通知自动仓,工厂代码为:" + plantCode + ",出货单为:" + ticketCode);
 
-        String msgtx = "S";
-        String msgty = "";
+        String msgty = "S";
+        String msgtx = "";
         try {
             String resultStr = HttpHelper.postJson(LuxsanApi.cancelOdnUrl, paramMap);
             log.info("wms砍单通知自动仓,转发结果为:" + resultStr);
         } catch (ApiException e) {
             e.printStackTrace();
-            msgtx = "E";
-            msgty = e.getMessage();
+            msgty = "E";
+            msgtx = e.getMessage();
         }
 
         WcsResult wcsResult = new WcsResult();
-        wcsResult.setMSGTX(msgtx);
         wcsResult.setMSGTY(msgty);
+        wcsResult.setMSGTX(msgtx);
         return wcsResult;
     }
 }

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

@@ -15,11 +15,14 @@ import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.device.util.DataCache;
+import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
+import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.TaskService;
+import com.neotel.smfcore.custom.lizhen.agvBox.util.BoxUtil;
 import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.BrandQtyRequest;
 import com.neotel.smfcore.custom.luxsan.api.bean.request.NewLabelToCellRequest;
@@ -42,10 +45,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @ApiOperation("手动GR入库")
 @Slf4j
@@ -74,6 +74,9 @@ public class ManualGrPutInController {
     @Autowired
     private IComponentManager componentManager;
 
+    @Autowired
+    private ILiteOrderItemManager liteOrderItemManager;
+
 
     @ApiOperation("获取GR已过账的列表")
     @RequestMapping("/grStatus")
@@ -363,6 +366,31 @@ public class ManualGrPutInController {
             return ResultBean.newErrorResult(-1, "smfcore.error.barcode.invalid", "条码无效");
         }
 
+        //1.清理要出库的数据
+        List<Barcode> newSubCodeList = new ArrayList<>();
+
+        List<Barcode> subCodeList = boxBarcode.getSubCodeList();
+        if (subCodeList != null && !subCodeList.isEmpty()){
+            for (Barcode barcode : subCodeList) {
+                if (barcode.isOut()){
+                    String orderItemId = barcode.getOrderItemId();
+                    barcode.setOdn("");
+                    barcode.setOrderId("");
+                    barcode.setOrderItemId("");
+                    barcode.setOut(false);
+                    barcode = barcodeManager.save(barcode);
+
+                    generateTask(barcode,OP_STATUS.CANCEL.name(),barcode.getAmount(),OP.CHECKOUT,orderItemId);
+
+                }
+                newSubCodeList.add(barcode);
+            }
+        }
+
+        boxBarcode.setSubCodeList(newSubCodeList);
+        boxBarcode = barcodeManager.save(boxBarcode);
+
+
         //1.判断是否有正在入库的任务
         for (DataLog dataLog : taskService.getAllTasks()) {
             if (!dataLog.isCancel() && !dataLog.isFinished() && dataLog.getBarcode().equals(boxBarcode.getBarcode())) {
@@ -437,4 +465,38 @@ public class ManualGrPutInController {
         dataLog.setWarehouseCode(barcode.getWarehouseCode());
         taskService.updateFinishedTask(dataLog);
     }
+
+
+    private DataLog generateTask(Barcode barcode, String opStatus, int opQty, int opType, String orderItemId) {
+        //生成任务
+        DataLog task = new DataLog();
+        task.setStatus(opStatus);
+        task.setPartNumber(barcode.getPartNumber());
+        task.setBarcode(barcode.getBarcode());
+        task.setNum(opQty);
+        task.setType(opType);
+        task.setPosName(barcode.getPosName());
+        task.setOperator(SecurityUtils.getCurrentUsername());
+        task.setDateCode(barcode.getDateCode());
+        task.setBatchInfo(barcode.getBatch());
+        task.setProvider(barcode.getProvider());
+        task.setProviderNumber(barcode.getProviderNumber());
+        task.setKeeperCode(barcode.getKeeperCode());
+        task.setSubSourceId(orderItemId);
+        task.setWarehouseCode(barcode.getWarehouseCode());
+        if (StringUtils.isNotBlank(orderItemId)) {
+            LiteOrderItem orderItem = liteOrderItemManager.get(orderItemId);
+            if (orderItem != null) {
+                task.setSourceName(orderItem.getOrderNo());
+                task.setLine(orderItem.getLine());
+                task.setMo(orderItem.getMo());
+                task.setSide(orderItem.getSide());
+                task.setPlantCode(orderItem.getPlantCode());
+                task.setOrderNo(orderItem.getOrderNo());
+                task.setManualUpload(orderItem.isManualUpload());
+            }
+        }
+        taskService.updateFinishedTask(task);
+        return task;
+    }
 }

src/main/resources/config/application-21088prod.yml

@@ -157,7 +157,7 @@ api:
   binMove: http://10.68.30.22:8082/api/mlb/BinMove
 
   #砍单回库
-  shipCancelUpshelf: http://10.68.30.22:8082/api/mlb/ShipCancelUpshelf
+  shipCancelUpshelf: http://10.68.30.22:8082/api/mlb/CancelShelf
 
   #单据退库上架
   ticketUp: http://10.68.30.22:8082/api/mlb/ticketLabelToCell

src/main/resources/config/application-21088test.yml

@@ -157,7 +157,7 @@ api:
   binMove: http://10.42.220.171:8082/api/mlb/BinMove
 
   #砍单回库
-  shipCancelUpshelf: http://10.42.220.171:8082/api/mlb/ShipCancelUpshelf
+  shipCancelUpshelf: http://10.42.220.171:8082/api/mlb/CancelShelf
 
   #单据退库上架
   ticketUp: http://10.42.220.171:8082/api/mlb/ticketLabelToCell