bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购关联报表

This commit is contained in:
gaowdong 2025-07-22 14:43:50 +08:00
parent 01543291cf
commit c322ddd3a9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java
View File

@ -132,7 +132,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
if(Objects.nonNull(reportPurchasePlanQuery.getPurchasePlanCode())) {
PurchasePlan purchasePlanQuery = new PurchasePlan();
purchasePlanQuery.setPlanCode(reportPurchasePlanQuery.getPurchasePlanCode());
purchasePlanQuery.setStatus(2L);
// purchasePlanQuery.setStatus(2L);
return purchasePlanService.selectPurchasePlanList(purchasePlanQuery);
}else if(Objects.nonNull(reportPurchasePlanQuery.getOrderGoodsCode())) {
ProductionPurchaseOrder productionPurchaseOrderQuery = new ProductionPurchaseOrder();
@ -146,7 +146,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
if(CollUtil.isNotEmpty(purchasePlanCodeList)) {
PurchasePlan purchasePlanQuery = new PurchasePlan();
purchasePlanQuery.setPlanCodeList(purchasePlanCodeList);
purchasePlanQuery.setStatus(2L);
// purchasePlanQuery.setStatus(2L);
return purchasePlanService.selectPurchasePlanList(purchasePlanQuery);
}
}
@ -161,7 +161,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
if(CollUtil.isNotEmpty(purchasePlanCodeList)) {
PurchasePlan purchasePlanQuery = new PurchasePlan();
purchasePlanQuery.setPlanCodeList(purchasePlanCodeList);
purchasePlanQuery.setStatus(2L);
// purchasePlanQuery.setStatus(2L);
return purchasePlanService.selectPurchasePlanList(purchasePlanQuery);
}
}else {
@ -188,7 +188,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
if(Objects.nonNull(orderGoodsPlanQuery.getOrderGoodsCode())) {
OrderGoods orderGoodsQuery = new OrderGoods();
orderGoodsQuery.setOrderGoodsCode(orderGoodsPlanQuery.getOrderGoodsCode());
orderGoodsQuery.setOrderStatus(2L);
// orderGoodsQuery.setOrderStatus(2L);
return orderGoodsService.selectOrderGoodsList(orderGoodsQuery);
}else if(Objects.nonNull(orderGoodsPlanQuery.getPurchasePlanCode())) {
ProductionPurchaseOrder productionPurchaseOrderQuery = new ProductionPurchaseOrder();
@ -201,7 +201,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
.collect(Collectors.toList());
OrderGoods orderGoodsQuery = new OrderGoods();
orderGoodsQuery.setOrderGoodsCodeList(goodsOrderCodeList);
orderGoodsQuery.setOrderStatus(2L);
// orderGoodsQuery.setOrderStatus(2L);
return orderGoodsService.selectOrderGoodsList(orderGoodsQuery);
}
}else if(Objects.nonNull(orderGoodsPlanQuery.getProductionPlanCode())) {
@ -223,7 +223,7 @@ public class ReportPlanServiceImpl implements IReportPlanService {
.collect(Collectors.toList());
OrderGoods orderGoodsQuery = new OrderGoods();
orderGoodsQuery.setOrderGoodsCodeList(goodsOrderCodeList);
orderGoodsQuery.setOrderStatus(2L);
// orderGoodsQuery.setOrderStatus(2L);
return orderGoodsService.selectOrderGoodsList(orderGoodsQuery);
}
}

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml
View File

@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
total_num, purchase_budget_total, supplier_ids, approve_by, approve_time, approve_remark,
if_merge, deliver_goods_date, ipp.remark, ipp.create_by, ipp.create_time,
ipp.update_by, ipp.update_time, bc.canteen_name, bs.stall_name, ba.area_name
from (select distinct purchase_plan_id from ims_production_purchase_order where production_plan_id is not null) ippo
from (select distinct purchase_plan_id from ims_production_purchase_order where purchase_plan_id is not null) ippo
left join ims_purchase_plan ipp on ipp.plan_code = ippo.purchase_plan_id
left join sys_user su on ipp.purchase_user_id = su.user_id
left join basic_area ba on ba.area_id = ipp.area_id
@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join basic_stall bs on bs.stall_id = ipp.stall_id
<where>
ipp.del_flag = '0'
and ipp.status = '2'
<!-- and ipp.status = '2'-->
<if test="startDateTime != null">
and ipp.purchase_date <![CDATA[ >= ]]> #{startDateTime}
</if>
@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
confirm_time, confirm_remark, if_all_inspect, iog.remark, iog.create_by,
iog.create_time, iog.update_by, iog.update_time, isr.supplier_name, iwi.warehouse_name,
ba.area_name, bc.canteen_name, bs.stall_name, contract_code
from (select distinct goods_order_id from ims_production_purchase_order where production_plan_id is not null) ippo
from (select distinct goods_order_id from ims_production_purchase_order where goods_order_id is not null) ippo
left join ims_order_goods iog on iog.order_goods_code = ippo.goods_order_id
left join ims_supplier isr on isr.supplier_id = iog.supplier_id
left join ims_warehouse_info iwi on iwi.warehouse_id = iog.warehouse_id
@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join basic_stall bs on bs.stall_id = iog.stall_id
<where>
iog.del_flag = '0'
and iog.order_status = '2'
<!-- and iog.order_status = '2'-->
<if test="startDateTime != null">
and iog.create_time <![CDATA[ >= ]]> #{startDateTime}
</if>