1.AGV出库回调-备货单不再直接修改出库单出库状态

2.PDA释放出库位-备货单出库释放出库位并且修改出库单出库状态

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -616,36 +616,12 @@ public class PdaController {
 
     /**
      * PDA库位释放
-     * 若释放库位为出库位，则移动出库位库存至LOC_SORTATION_CACHE（AGV出库完成后，人工拉走出库位货物，扫描库位码）
-     * 若释放其余库位，则清空库位
+     * 1.将出库位库存移动到分拣区
+     * 2.将出库位库存直接删除（备货单完成）
      */
     @PostMapping("/base/locationRelease")
     public AjaxResult locationRelease(@RequestBody BasLocationForm basLocationForm) {
-        BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(basLocationForm.getLocationNo(), Constant.WAREHOUSE_ID);
-        if (baseLocationInfo == null) {
-            return AjaxResult.error("不存在此库位！");
-        }
-        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattByLocationId(baseLocationInfo.getId());
-        if (invLotLocIdLotattVOS.size() == 0) {
-            return AjaxResult.error("不存在对应释放库存！");
-        }
-        // 查出对应出库单
-        InvLotLocIdLotattVO invLotLocIdLotattVO = invLotLocIdLotattVOS.get(0);
-        // 如果lotatt15为空，并且出库的库存lotatt14不为空，说明是备货完成出库，就需要删除库存
-        if (StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt15())
-                && StringUtils.isNotEmpty(invLotLocIdLotattVO.getLotatt14())) {
-            // todo 删除备货虚拟库位的库存，根据出库单号查询仓储外备货区，如果有的话清除
-            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
-
-        }
-        if (StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt15())) {
-            // 说明是移库，直接删除库存
-            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
-        }
-        String lotatt15 = invLotLocIdLotattVO.getLotatt15();
-        WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(lotatt15);
-        // 转移库存到出库虚拟区
-        return invLotLocIdService.releaseLocation(basLocationForm.getLocationNo(), Constant.WAREHOUSE_ID, "PDA");
+        return invLotLocIdService.locationRelease(basLocationForm);
     }
     //endregion
 

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -864,34 +864,12 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         lotAtt.setLotatt07(palletNo);
         List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvByInvLotatt(lotAtt);
         for (InvLotLocId inv : invLotLocIdList) {
-
             InvLotAtt invLotAtt = invLotAttService.selectInvLotAttByLotnum(inv.getLotnum());
 
-            // 修改入库单状态，这边写的不是很严谨，但是不影响主体业务
-            WmsDocAsnDetails query = new WmsDocAsnDetails();
-            query.setAsnNo(invLotAtt.getLotatt08());
-            query.setSku(invLotAtt.getSku());
-            List<WmsDocAsnDetails> detailsList = wmsDocAsnDetailsMapper.selectWmsDocAsnDetailsList(query);
-            if (detailsList != null && detailsList.size() > 0) {
-                for (WmsDocAsnDetails de : detailsList) {
-                    if (de.getExpectedQty().compareTo(de.getReceivedQty()) != 0) {
-                        continue;
-                    }
-                    de.setLineStatus(Constant.ASN_STS.STS60.getValue());
-                    wmsDocAsnDetailsMapper.updateWmsDocAsnDetails(de);
-                }
-            }
             //修改头单状态
             String asnStatus = Constant.ASN_STS.STS99.getValue();
-            WmsDocAsnDetails detailsQuery = new WmsDocAsnDetails();
-            detailsQuery.setAsnNo(invLotAtt.getLotatt08());
-            List<WmsDocAsnDetails> detailsCheckList = wmsDocAsnDetailsMapper.selectWmsDocAsnDetailsList(detailsQuery);
-            for (WmsDocAsnDetails d : detailsCheckList) {
-                if (!d.getLineStatus().equals(Constant.ASN_STS.STS60.getValue())) {
-                    asnStatus = Constant.ASN_STS.STS50.getValue();
-                    break;
-                }
-            }
+
+
             WmsDocAsnHeader headerUpdate = new WmsDocAsnHeader();
             headerUpdate.setAsnNo(invLotAtt.getLotatt08());
             headerUpdate.setAsnStatus(asnStatus);

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/IInvLotLocIdService.java

@@ -14,6 +14,7 @@ import com.ruoyi.ams.inv.domain.form.InvLotLocIdForm;
 import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.form.BasLocationForm;
 import com.ruoyi.base.domain.vo.BaseLocationLotattVO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.apache.ibatis.annotations.Param;
@@ -334,12 +335,19 @@ public interface IInvLotLocIdService {
     AjaxResult saveOrUpdate(InvLotLocId invLotLocId);
 
     /**
-     * PDA库位释放
+     * PDA库位移动到分拣区
      * 1，释放的是出库位，移动出库位库存至分拣缓存位
-     * 2，释放其余库位，直接清空库位
      */
     AjaxResult releaseLocation(String locationFrom, Long warehouseId, String updateBy);
 
+    /**
+     * PDA出库位置释放
+     *
+     * @param basLocationForm
+     * @return
+     */
+    AjaxResult locationRelease(BasLocationForm basLocationForm);
+
     /**
      * 备货组盘的时候，一个托盘只能备货一个出库单
      *

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -16,10 +16,13 @@ import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.mapper.InvLotAttMapper;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
+import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
+import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseLocationZone;
+import com.ruoyi.base.domain.form.BasLocationForm;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -64,6 +67,8 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     private IBusinessService iBusinessService;
     @Autowired
     private RedisCache redisCache;
+    @Autowired
+    private IWmsDocOrderHeaderService wmsDocOrderHeaderService;
 
     /**
      * 查询库位库存信息
@@ -812,7 +817,7 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
                 invLotLocIdMapper.updateLocation(Long.parseLong(invLotLocId.getLocationId()), Constant.LOC_SORTATION_CACHE);
             }
         } else {
-            deleteInvLotLocIdById(baseLocationInfo.getId());
+            return AjaxResult.error("出库缓存区的库位才可释放！");
         }
         adjLocationIsEmpty(locationFrom, Constant.WAREHOUSE_ID, updateBy);
         //修改托盘库位绑定关系
@@ -825,6 +830,44 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         return AjaxResult.success("操作成功");
     }
 
+    @Override
+    public AjaxResult locationRelease(BasLocationForm basLocationForm) {
+        BaseLocationInfo baseLocationInfo = baseLocationInfoService.selectBaseLocationInfoByIdOrNo(basLocationForm.getLocationNo(), Constant.WAREHOUSE_ID);
+        if (baseLocationInfo == null) {
+            return AjaxResult.error("不存在此库位！");
+        }
+        List<InvLotLocIdLotattVO> invLotLocIdLotattVOS = invLotLocIdService.selectInvLocIdLotattByLocationId(baseLocationInfo.getId());
+        if (invLotLocIdLotattVOS.size() == 0) {
+            return AjaxResult.error("不存在对应释放库存！");
+        }
+        // 查出对应出库单
+        InvLotLocIdLotattVO invLotLocIdLotattVO = invLotLocIdLotattVOS.get(0);
+        // 如果lotatt15为空，并且出库的库存lotatt14不为空，说明是备货完成的托盘
+        // 就需要删除库存
+        if (StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt15())
+                && StringUtils.isNotEmpty(invLotLocIdLotattVO.getLotatt14())) {
+            WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(invLotLocIdLotattVO.getLotatt14());
+            if (!wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())
+                    && !wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS98.getValue())) {
+                return AjaxResult.error("备货单还未备货完成，不可直接出库！" + invLotLocIdLotattVO.getLotatt14());
+            }
+            // 修改备货单出库状态
+            wmsDocOrderHeaderService.modifyAssignmentStockTaskStatusComplete(invLotLocIdLotattVO.getLotatt14()
+                    , baseLocationInfo.getId(), invLotLocIdLotattVO.getLotatt07(), true);
+            // 清除库存
+            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
+
+        }
+        if (StringUtils.isEmpty(invLotLocIdLotattVO.getLotatt15())) {
+            // 说明是移库，直接删除库存
+            return invLotLocIdService.clear(baseLocationInfo.getId().toString(), Constant.WAREHOUSE_ID, "PDA");
+        }
+        String lotatt15 = invLotLocIdLotattVO.getLotatt15();
+        WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(lotatt15);
+        // 转移库存到出库虚拟区
+        return invLotLocIdService.releaseLocation(basLocationForm.getLocationNo(), Constant.WAREHOUSE_ID, "PDA");
+    }
+
     @Override
     public AjaxResult checkPalletIsOnlyOrderNo(String palletNoTo, String orderNo) {
         InvLocIdSearchFrom invLocIdSearchFrom = new InvLocIdSearchFrom();

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/ActAllocationDetailsServiceImpl.java

@@ -254,6 +254,14 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
     @Transactional
     @Override
     public AjaxResult modifyAssignmentStockTaskStatusPickingComplete(String orderNo, Long locationId, String palletNo) {
+        WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
+        if (!wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())) {
+            return AjaxResult.success();
+        }
+        if (wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS23.getValue())
+                || wmsDocOrderHeader.getOrderStatus().equals(Constant.ORDER_STS.STS98.getValue())) {
+            return AjaxResult.success();
+        }
         ActAllocationDetailsFrom actAllocationQuery = new ActAllocationDetailsFrom();
         actAllocationQuery.setOrderNo(orderNo);
         actAllocationQuery.setLocationId(locationId);

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -217,9 +217,8 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                 // 修改分配明细为任务完成21
                 actAllocationDetailsService.modifyAssignmentTaskStatus(wcsTask.getExt6()
                         ,Long.valueOf(wcsTask.getLocationFrom()), wcsTask.getExt5());
-                // 修改备货单（1 如果非备货完成状态：分配明细为拣货完成40
-                //         （2）如果备货完成状态：出库单修改为部分出库，完全出库98,99
-                wmsDocOrderHeaderService.modifyAssignmentStockTaskStatus(wcsTask.getExt6()
+                // 修改备货单:分配明细为拣货完成40
+                actAllocationDetailsService.modifyAssignmentStockTaskStatusPickingComplete(wcsTask.getExt6()
                         ,Long.valueOf(wcsTask.getLocationFrom()), wcsTask.getExt5());
                 // 修改库内理货（1）库内理货不生成分配明细所以不修改分配状态（2）出库单状态为完成98,99
                 wmsDocOrderHeaderService.modifyTheTallyStatusInTheWarehouse(wcsTask.getExt6()