-
…销、外贸未锁规合同无需生产和需要生产订货单都统计、经销、外贸、加工标准合同需要生产订货单2、库存订单明细：经销、外贸库存合同需要生产订货单3、未锁规格订单明细：经销、外贸未锁规合同-无需生产订货单 只统计已审核通过的订单数据
-
# Conflicts: # xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/order/PurchaseOrderInfoServiceImpl.java # xingyun-sc/src/main/java/com/lframework/xingyun/sc/service/order/PurchaseOrderInfoService.java
-
# Conflicts: # xingyun-sc/src/main/resources/templates/purchaseOrderTemplate.xlsx # xingyun-sc/src/main/resources/templates/purchaseOrderTemplateForProduction.xlsx