1.拆包机bug解决 2.桶装空托出库增加日志

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/ams/InvLotLocIdController.java

@@ -3,7 +3,6 @@ package com.ruoyi.web.controller.warewms.ams;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.druid.util.StringUtils;
-import com.google.common.collect.Lists;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
 import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdAdjForm;
@@ -27,6 +26,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -110,8 +110,7 @@ public class InvLotLocIdController extends BaseController {
     @Log(title = "移动空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
     @PostMapping("/moveEmptyPallet")
     public AjaxResult moveEmptyPallet(@RequestParam String locationId, @RequestParam String moveType) {
-        Constant.MoveType moveTypeEnum = Constant.MoveType.MOVE_IN;
-        List<String> moveTypeList = Lists.newArrayList(moveTypeEnum.values()).stream().map(item -> item.getType()).collect(Collectors.toList());
+        List<String> moveTypeList = Arrays.stream(Constant.MoveType.values()).map(item -> item.getType()).collect(Collectors.toList());
         Assert.isTrue(CollectionUtil.contains(moveTypeList, moveType), "args [moveType] is illegal");
         return StringUtils.equals(moveType, Constant.MoveType.MOVE_IN.getType())
                 ? this.handleEmptyPalletIn(locationId) : this.handleEmptyPalletOut(locationId) ;
@@ -120,6 +119,7 @@ public class InvLotLocIdController extends BaseController {
     @Log(title = "出空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
     @PostMapping("/moveEmptyPalletOut")
     private AjaxResult handleEmptyPalletOut(@RequestParam String locationId) {
+        log.info("handleEmptyPalletOut input location id: {}", locationId);
         BaseLocationInfo baseLocationInfo = iBucketLocInvService.allocateLocationInfo();
         if (ObjectUtil.isNull(baseLocationInfo)) {
             log.warn("InvLotLocIdController-handleEmptyPalletOut baseLocationInfo is null");
@@ -131,6 +131,7 @@ public class InvLotLocIdController extends BaseController {
     @Log(title = "入空托(桶装物料场景专用)", businessType = BusinessType.UPDATE)
     @PostMapping("/moveEmptyPalletIn")
     private AjaxResult handleEmptyPalletIn(@RequestParam String locationId) {
+        log.info("handleEmptyPalletIn input location id: {}", locationId);
         BaseLocationInfo baseLocationInfo = iBucketLocInvService.selectLocationInfo();
         if (ObjectUtil.isNull(baseLocationInfo)) {
             log.warn("InvLotLocIdController-handleEmptyPalletIn baseLocationInfo is null");

warewms-ams/src/main/java/com/ruoyi/ams/xuankuang/facade/impl/UnpackingMachineFacadeImpl.java

@@ -26,7 +26,8 @@ public class UnpackingMachineFacadeImpl implements IUnpackingMachineFacade {
 
     @Override
     public Boolean unpackingMachineOpen(String lineId, boolean[] booleans){
-        Assert.isTrue(verifyLineOpenStatus(lineId, booleans), "method [verifyLineOpenStatus] return false ");
+        //Assert.isTrue(verifyLineOpenStatus(lineId, booleans), "method [verifyLineOpenStatus] return false ");
+        verifyLineOpenStatus(lineId, booleans);
         Assert.isTrue(unpackingMachineSubClientWrite(lineId), "method [unpackingMachineSubClientWrite] return false ");
         wmsCallback(lineId);
         stirringTankClientWrite(lineId);