diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml index c9e06aeb8..5911990b1 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/SkuMapper.xml @@ -183,6 +183,7 @@ JOIN client c ON s.owner_id = c.id WHERE c.id = #{clientId} AND po.erp_status IN ('1','2') + AND po.can_send = 1 AND poc.erp_status IN ('1','2') GROUP BY sku_id ) @@ -331,6 +332,7 @@ JOIN client c ON s.owner_id = c.id WHERE c.id = #{clientId} AND po.erp_status IN ('1','2') + AND po.can_send = 1 AND poc.erp_status IN ('1','2') GROUP BY sku_id ) @@ -411,6 +413,7 @@ JOIN client c ON s.owner_id = c.id WHERE c.id = #{clientId} AND po.erp_status IN ('1','2') + AND po.can_send = 1 AND poc.erp_status IN ('1','2') GROUP BY sku_id ) @@ -475,6 +478,7 @@ JOIN client c ON s.owner_id = c.id WHERE c.id = #{clientId} AND po.erp_status IN ('1','2') + AND po.can_send = 1 AND poc.erp_status IN ('1','2') GROUP BY sku_id ) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java index b450bcbc9..6f95ea3bc 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/purchase/PurchaseOrderServiceImpl.java @@ -206,6 +206,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl