只有新建状态或订单池才能进行单据合并。

易文鹏
1 parent 3c165e0c
Showing 1 changed file with 4 additions and 1 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -514,8 +514,11 @@ public class ShipmentHeaderController extends BaseController {
             }
             if ("merge".equals(shipmentHeader.getShipmentType())) {
                 throw new ServiceException("单据类型为合并单据，不允许合并！！！");
-
             }
+            if (shipmentHeader.getLastStatus()>QuantityConstant.RECEIPT_HEADER_POOL || shipmentHeader.getFirstStatus()>QuantityConstant.RECEIPT_HEADER_POOL) {
+                throw new ServiceException("单据已被使用，不能合并，必须是新建状态或订单池！");
+            }
+
         });
         // 创建合并后的头表
         ShipmentHeader shipmentHeader = new ShipmentHeader();