备货bug修复

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

@@ -614,7 +614,7 @@ public class PdaController {
      */
     @PostMapping("/docOrder/groupDiskCheck")
     public AjaxResult groupDiskCheck(@RequestBody GroupDiskFrom groupDiskFrom) {
-        return wmsDocOrderHeaderService.groupDiskBHCheck(groupDiskFrom);
+        return wmsDocOrderHeaderService.syncGroupDiskBHCheck(groupDiskFrom);
     }
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/StatusUpdateServiceImpl.java

@@ -61,7 +61,7 @@ public class StatusUpdateServiceImpl implements StatusUpdateService {
                 }
             }
 
-            wcsTaskService.callBack(result.getTaskNo(), result.getState(), result.getCarNo());
+            wcsTaskService.syncCallBack(result.getTaskNo(), result.getState(), result.getCarNo());
 
             amsTask.setSystemStatus(result.getState());
             amsTaskService.updateAmsTask(amsTask);

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

@@ -95,9 +95,10 @@ public interface IInvLotAttService
     /**
      * 获取托盘产品数量
      * @param palletNo
+     * @param locationId
      * @return
      */
-    BigDecimal queryPalletTotal(String palletNo);
+    BigDecimal queryPalletTotal(String palletNo, String locationId);
 
     /**
      * 新增批次属性

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

@@ -415,12 +415,14 @@ public interface IInvLotLocIdService {
      */
     InvLotLocId queryInvLotLocIdByLotnum(String lotnum);
 
+    List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList);
+
     /**
      * 根据批次lotnum查询对应库存库位信息
      * @param lotnumList
      * @return
      */
-    List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList);
+    List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList, String locationId);
 
     /**
      * 修改库位库存信息

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

@@ -194,9 +194,9 @@ public class InvLotAttServiceImpl implements IInvLotAttService {
      * @return
      */
     @Override
-    public BigDecimal queryPalletTotal(String palletNo){
+    public BigDecimal queryPalletTotal(String palletNo, String locationId){
         List<InvLotAtt> invLotAttList = queryInvLotAtt(palletNo);
-        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()));
+        List<InvLotLocId> invLotLocIdList = invLotLocIdService.queryInvLotLocIdByLotnum(invLotAttList.stream().map(InvLotAtt::getLotnum).collect(Collectors.toList()), locationId);
         return invLotLocIdList.stream().map(InvLotLocId::getQty).reduce(BigDecimal.ZERO, BigDecimal::add);
     }
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.ams.inv.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -1110,7 +1111,7 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
     public List<InvLotLocIdSurplusQtyDTO> buildInvLotLocIdSurplusQtyDTOList(List<String> skuList){
         List<InvLotLocId> invLotLocIdList = queryInvLotLocIdBySkuList(skuList);
         if (CollectionUtil.isEmpty(invLotLocIdList)) return Lists.newArrayList();
-        return invLotLocIdList.stream().filter(item -> ObjectUtil.isNotNull(item.getQty())).map(item -> {
+        return invLotLocIdList.stream().filter(item -> ObjectUtil.isNotNull(item.getQty()) && NumberUtil.isGreater(item.getQty().subtract(item.getQtyallocated()), BigDecimal.ZERO)).map(item -> {
             InvLotLocIdSurplusQtyDTO invLotLocIdSurplusQtyDTO = ConvertUtils.sourceToTarget(item, InvLotLocIdSurplusQtyDTO.class);
             invLotLocIdSurplusQtyDTO.setSurplusQty(ObjectUtil.isNotNull(item.getQtyallocated()) ? item.getQty().subtract(item.getQtyallocated()) : item.getQty());
             return invLotLocIdSurplusQtyDTO;
@@ -1145,7 +1146,18 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
      */
     @Override
     public List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList){
-        return invLotLocIdMapper.selectList(Wrappers.<InvLotLocId>lambdaQuery().in(InvLotLocId::getLotnum, lotnumList));
+        return queryInvLotLocIdByLotnum(lotnumList, null);
+    }
+
+    /**
+     * 根据批次lotnum查询对应库存库位信息
+     * @param lotnumList
+     * @return
+     */
+    @Override
+    public List<InvLotLocId> queryInvLotLocIdByLotnum(List<String> lotnumList, String locationId){
+        return invLotLocIdMapper.selectList(Wrappers.<InvLotLocId>lambdaQuery().in(InvLotLocId::getLotnum, lotnumList)
+                .eq(StringUtils.isNotBlank(locationId), InvLotLocId::getLocationId, locationId));
     }
 
     /**

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

@@ -431,6 +431,8 @@ public interface IWmsDocOrderHeaderService {
      */
     AjaxResult syncPdaUnbind(UnbindDTO unbindDTO);
 
+    AjaxResult syncGroupDiskBHCheck(GroupDiskFrom groupDiskFrom);
+
     /**
      * PDA理货备货并发控制
      * @param pdaGroupDiskDTO

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

@@ -2745,6 +2745,14 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return wmsDocOrderHeaderService.pdaUnbind(unbindDTO);
     }
 
+    /**
+     * PDA解绑物料并发控制
+     */
+    @Override
+    public synchronized AjaxResult syncGroupDiskBHCheck(GroupDiskFrom groupDiskFrom){
+        return wmsDocOrderHeaderService.groupDiskBHCheck(groupDiskFrom);
+    }
+
     /**
      * PDA理货备货并发控制
      */
@@ -2863,7 +2871,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     public AjaxResult pdaGroupDisk(PdaGroupDiskDTO pdaGroupDiskDTO) {
         GroupDiskConvertDTO groupDiskConvertDTO = buildGroupDiskConvertDTO(pdaGroupDiskDTO);
         String locationId = invLotLocGroupDisk(groupDiskConvertDTO);
-        BigDecimal palletTotal = invLotAttService.queryPalletTotal(groupDiskConvertDTO.getPalletTo());
+        BigDecimal palletTotal = invLotAttService.queryPalletTotal(groupDiskConvertDTO.getPalletTo(), locationId);
         if (StringUtils.isBlank(groupDiskConvertDTO.getWmsOrderNo())) return AjaxResult.success("组盘成功！托盘数量： " + palletTotal);
         groupDiskConvertDTO.setLocationId(locationId);
         wmsDocOrderGroupDisk(groupDiskConvertDTO);
@@ -2906,11 +2914,11 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         InvLotLocId invLotLocId = invLotLocIdService.queryInvLotLocIdByLotnum(unbindDTO.getLotnum());
         Long locationId = unbindWmsBox(unbindDTO.getPalletTo(), unbindDTO.getPalletFrom());
         unbindInvLotLoc(unbindDTO.getLotnum(), locationId, unbindDTO.getPalletFrom(), unbindDTO.getSku());
-        if (StringUtils.isBlank(unbindDTO.getErpNo())) return AjaxResult.success("托盘：" + unbindDTO.getPalletTo() + "解绑成功！托盘数量： " + invLotAttService.queryPalletTotal(unbindDTO.getPalletTo()));
+        if (StringUtils.isBlank(unbindDTO.getErpNo())) return AjaxResult.success("托盘：" + unbindDTO.getPalletTo() + "解绑成功！托盘数量： " + invLotAttService.queryPalletTotal(unbindDTO.getPalletTo(), locationId.toString()));
         // 删除条码扫描记录
         erpBarcodesService.untieRecordErpBarcodeListAsnSo(unbindDTO.getErpNo(), null, unbindDTO.getSn());
         unbindWmsDocOrder(unbindDTO.getErpNo(), invLotLocId.getQty(), unbindDTO.getSku());
-        return AjaxResult.success("托盘：" + unbindDTO.getPalletTo() + "解绑成功！托盘数量： " + invLotAttService.queryPalletTotal(unbindDTO.getPalletTo()));
+        return AjaxResult.success("托盘：" + unbindDTO.getPalletTo() + "解绑成功！托盘数量： " + invLotAttService.queryPalletTotal(unbindDTO.getPalletTo(), locationId.toString()));
     }
 
     private List<WmsDocOrderDetails> getWmsDocOrderDetailsList(List<String> orderList, String orderType){
@@ -3008,8 +3016,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                     reversePickInventoryMatchDTO.getQty(), palletMatchLogList);
             invLotAttPalletTotalDTOList.addAll(invLotAttPalletTotalList);
         }
-        LinkedList<Object> result = ListUtil.toLinkedList(flag, invLotAttPalletTotalDTOList);
-        return result;
+        return ListUtil.toLinkedList(flag, invLotAttPalletTotalDTOList);
     }
 
     /**
@@ -3151,11 +3158,12 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         String orderNo = StringUtils.isNotBlank(groupDiskConvertDTO.getWmsOrderNo()) ? groupDiskConvertDTO.getWmsOrderNo() : null;
         //创建新批次
         InvLotLocId invLotLocId = invLotLocIdList.stream().findFirst().orElseThrow(() -> new BaseException("库位库存信息丢失！"));
+        BigDecimal qtyAllocated = ObjectUtil.isNotNull(invLotLocId.getQtyallocated()) ? invLotLocId.getQtyallocated() : BigDecimal.ZERO;
+        BigDecimal invLotLocQty = invLotLocId.getQty().subtract(qtyAllocated);
+        Assert.isTrue(NumberUtil.isGreater(invLotLocQty, BigDecimal.ZERO), "该产品已备货！");
         String asnNo = invLotAttList.stream().filter(item -> item.getLotnum().equals(invLotLocId.getLotnum())).map(InvLotAtt::getLotatt08).findFirst().orElseThrow(() -> new BaseException("此批次入库信息丢失！"));
         String sku = groupDiskConvertDTO.getSku();
         invLotAttService.insertInvLotAtt(buildInvLotAtt(groupDiskConvertDTO.getLotNum(), groupDiskConvertDTO.getPalletTo(), orderNo, groupDiskConvertDTO.getSn(), sku, asnNo));
-        BigDecimal qtyAllocated = ObjectUtil.isNotNull(invLotLocId.getQtyallocated()) ? invLotLocId.getQtyallocated() : BigDecimal.ZERO;
-        BigDecimal invLotLocQty = invLotLocId.getQty().subtract(qtyAllocated);
         //验证托盘相关信息并获取指向托盘库位信息
         String locationId = verifyInvLotAndGetLocationId(groupDiskConvertDTO.getPalletTo(), groupDiskConvertDTO.getSn(), orderNo);
         locationId = StringUtils.isNotBlank(locationId) ? locationId : invLotLocId.getLocationId();

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

@@ -1,12 +1,11 @@
 package com.ruoyi.ams.task.service;
 
-import java.util.List;
-
-import com.ruoyi.ams.agv.ndc.entity.CallbackResult;
 import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.ams.task.dto.WcsTaskLocationDTO;
 import com.ruoyi.common.core.domain.AjaxResult;
 
+import java.util.List;
+
 /**
  * AGV任务Service接口
  *
@@ -136,6 +135,8 @@ public interface IWcsTaskService {
      */
     List<WcsTaskLocationDTO> selectTaskByColNoAfter(String colNo, Long colIndex, Long zoneId, Long warehouseId);
 
+    AjaxResult syncCallBack(String taskNo, Integer state, Integer carNo);
+
     /**
      * 任务回调
      * @param taskNo

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

@@ -329,9 +329,14 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
         return wcsTaskMapper.selectTaskByColNoAfter(colNo, colIndex, zoneId, warehouseId);
     }
 
+    @Override
+    public synchronized AjaxResult syncCallBack(String taskNo, Integer state, Integer carNo) {
+        return wcsTaskService.callBack(taskNo, state, carNo);
+    }
+
     @Transactional
     @Override
-    public synchronized AjaxResult callBack(String taskNo, Integer state, Integer carNo) {
+    public AjaxResult callBack(String taskNo, Integer state, Integer carNo) {
         String updateBy = "NDC";
         log.info("agv回传------------->" + taskNo + "," + state);
         WcsTask wcsTask = wcsTaskService.selectWcsTaskByTaskNo(taskNo);