入库码盘-出库单类型为备货单才能备货

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

@@ -30,6 +30,7 @@ import com.ruoyi.ams.lineCall.domain.form.LineCallListFrom;
 import com.ruoyi.ams.lineCall.domain.vo.LineCallVO;
 import com.ruoyi.ams.lineCall.service.ILineCallService;
 import com.ruoyi.ams.order.domain.ActAllocationDetails;
+import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.form.*;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
@@ -119,7 +120,7 @@ public class PdaController {
         }
         stockForm.setAsnNo(asnNoList);
         if (stockForm.getStockTag().equals("Y") || StringUtils.isNotEmpty(stockForm.getOrderNo())) {
-            return AjaxResult.error("码盘备货待开发！");
+//            return AjaxResult.error("码盘备货待开发！");
         }
         if (stockForm.getStockTag().equals("Y") && StringUtils.isEmpty(stockForm.getOrderNo())) {
             return AjaxResult.error("码盘备货必须输入出库单号");
@@ -130,6 +131,12 @@ public class PdaController {
             if (StringUtils.isEmpty(orderNo)) {
                 return AjaxResult.error("请扫描正确的出库单号");
             }
+            // 只有备货单才能备货
+            WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
+            if (wmsDocOrderHeader != null
+                    && wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())) {
+                return AjaxResult.error("出库单类型为备货单才能备货！");
+            }
             stockForm.setOrderNo(orderNo);
         }
         return wmsDocAsnHeaderService.doStock(stockForm);

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

@@ -294,7 +294,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             wmsBoxInfo.setBoxNo(stockForm.getPalletNo());
             wmsBoxInfo.setBoxState(1);
             wmsBoxInfo.setBoxType("pallet");
-            wmsBoxInfo.setIsFull(stockForm.getFullTag());
+//            wmsBoxInfo.setIsFull(stockForm.getFullTag());
             wmsBoxInfo.setIsEmpty("N");
             wmsBoxInfo.setLocationId(STAGE01);
             wmsBoxInfo.setCreateBy(loginUser.getUsername());
@@ -305,7 +305,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         } else {
             //判断已满拖的话不接收
             if (wmsBoxInfo.getIsFull() != null && wmsBoxInfo.getIsFull().equals("Y")) {
-                throw new ServiceException("该托盘已放满");
+//                throw new ServiceException("该托盘已放满");
             }
             wmsBoxInfo.setBoxState(1);//启用状态
             wmsBoxInfo.setIsFull(stockForm.getFullTag());