From c322ddd3a92e2b2e1a5a133b943a4814084c4ce3 Mon Sep 17 00:00:00 2001 From: gaowdong Date: Tue, 22 Jul 2025 14:43:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=B3=E8=81=94=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ims/service/impl/ReportPlanServiceImpl.java | 12 ++++++------ .../main/resources/mapper/ims/ReportPlanMapper.xml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java index c816a1d..6b82d44 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java @@ -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); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml index 65f623c..f0c4296 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml @@ -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 ipp.del_flag = '0' - and ipp.status = '2' + and ipp.purchase_date = ]]> #{startDateTime} @@ -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 iog.del_flag = '0' - and iog.order_status = '2' + and iog.create_time = ]]> #{startDateTime}