4.2.5

原材料条码采购新增和批量收料新增时判断采购订单是否为空

hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java

@@ -185,6 +185,9 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
 
         //校验此采购订单有没有合并过
         MesSaleOrderRelate querySaleOrderRelate = new MesSaleOrderRelate();
+        if (purchaseOrderId == null) {
+            throw new ServiceException("采购订单不能为空");
+        }
         querySaleOrderRelate.setPurchaseOrderId(purchaseOrderId);
         List<MesSaleOrderRelate> mesSaleOrderRelates = mesSaleOrderRelateMapper.selectMesSaleOrderRelateList(querySaleOrderRelate);
         if (mesSaleOrderRelates != null && !mesSaleOrderRelates.isEmpty()) {
@@ -538,8 +541,6 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
         }
 
 
-
-
         //查询采购订单 采购订单号不在原材料入库记录中当前日期入库的并且同一物料的采购订单，并且采购订单是采购入库完成的。
         List<MesPurchaseOrder> mesPurchaseOrderList = mesPurchaseOrderMapper.selectNotRawInstockPurchaseOrderList(dateStr);
         List<MesPurchaseOrder> autoStockPurchaseOrderList = new ArrayList<>();
@@ -611,7 +612,6 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
     }
 
 
-
     /**
      * 查询绑定销售订单的采购订单信息，join material
      *
@@ -625,7 +625,6 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
     }
 
 
-
     /**
      * 采购订单超时统计
      */
@@ -655,6 +654,7 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService {
 
     /**
      * 查询采购订单信息,Join order_bind 新增原材料条码
+     *
      * @param mesPurchaseOrder
      * @return
      */