From 8b363e5698390e5be91fe0e46fe6ba340bd7c3ff Mon Sep 17 00:00:00 2001 From: gaowdong Date: Thu, 17 Jul 2025 09:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86-=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...troller.java => ReportPlanController.java} | 13 ++--- ...nPlanMapper.java => ReportPlanMapper.java} | 4 +- ...anService.java => IReportPlanService.java} | 3 +- .../service/impl/InspectGoodsServiceImpl.java | 3 + .../service/impl/ReportPlanServiceImpl.java | 33 +++++++++++ .../impl/ReportProductionPlanServiceImpl.java | 55 ------------------- ...ionPlanMapper.xml => ReportPlanMapper.xml} | 2 +- 7 files changed, 44 insertions(+), 69 deletions(-) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/{ReportProductionPlanController.java => ReportPlanController.java} (72%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/{ReportProductionPlanMapper.java => ReportPlanMapper.java} (79%) rename bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/{IReportProductionPlanService.java => IReportPlanService.java} (82%) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java delete mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportProductionPlanServiceImpl.java rename bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/{ReportProductionPlanMapper.xml => ReportPlanMapper.xml} (97%) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportProductionPlanController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportPlanController.java similarity index 72% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportProductionPlanController.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportPlanController.java index 0d9e406..0292e5a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportProductionPlanController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/ReportPlanController.java @@ -1,13 +1,10 @@ package com.bonus.canteen.core.ims.controller; -import com.bonus.canteen.core.ims.domain.param.ProductionPlanQuery; import com.bonus.canteen.core.ims.domain.param.ReportProductionPlanQuery; import com.bonus.canteen.core.ims.domain.param.ReportPurchasePlanQuery; -import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO; -import com.bonus.canteen.core.ims.service.IProductionPlanService; -import com.bonus.canteen.core.ims.service.IReportProductionPlanService; +import com.bonus.canteen.core.ims.service.IReportPlanService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.page.TableDataInfo; import io.swagger.annotations.Api; @@ -30,16 +27,16 @@ import java.util.List; @Api(tags = "生产计划主接口") @RestController @RequestMapping("/report") -public class ReportProductionPlanController extends BaseController { +public class ReportPlanController extends BaseController { @Autowired - private IReportProductionPlanService reportProductionPlanService; + private IReportPlanService reportPlanService; @ApiOperation(value = "查询生产计划报表") //@RequiresPermissions("ims:plan:list") @PostMapping("/ims_production_plan/list") public TableDataInfo list(@RequestBody @Valid ReportProductionPlanQuery productionPlan) { startPage(); - List list = reportProductionPlanService.selectProductionPlanList(productionPlan); + List list = reportPlanService.selectProductionPlanList(productionPlan); return getDataTable(list); } @@ -48,7 +45,7 @@ public class ReportProductionPlanController extends BaseController { @PostMapping("/ims_purchase_plan/list") public TableDataInfo list(@RequestBody @Valid ReportPurchasePlanQuery productionPlan) { startPage(); - List list = reportProductionPlanService.selectPurchasePlanList(productionPlan); + List list = reportPlanService.selectPurchasePlanList(productionPlan); return getDataTable(list); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportProductionPlanMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportPlanMapper.java similarity index 79% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportProductionPlanMapper.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportPlanMapper.java index f05345e..83235fe 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportProductionPlanMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/ReportPlanMapper.java @@ -1,9 +1,7 @@ package com.bonus.canteen.core.ims.mapper; -import com.bonus.canteen.core.ims.domain.ProductionPlan; import com.bonus.canteen.core.ims.domain.param.ReportProductionPlanQuery; import com.bonus.canteen.core.ims.domain.param.ReportPurchasePlanQuery; -import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO; @@ -15,7 +13,7 @@ import java.util.List; * @author xsheng * @date 2025-07-14 */ -public interface ReportProductionPlanMapper { +public interface ReportPlanMapper { List selectProductionPlanList(ReportProductionPlanQuery productionPlan); List selectPurchasePlanList(ReportPurchasePlanQuery productionPlan); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportProductionPlanService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportPlanService.java similarity index 82% rename from bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportProductionPlanService.java rename to bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportPlanService.java index c23bb74..dd81092 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportProductionPlanService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IReportPlanService.java @@ -1,7 +1,6 @@ package com.bonus.canteen.core.ims.service; import com.bonus.canteen.core.ims.domain.param.*; -import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO; import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO; @@ -13,7 +12,7 @@ import java.util.List; * @author xsheng * @date 2025-07-14 */ -public interface IReportProductionPlanService { +public interface IReportPlanService { List selectProductionPlanList(ReportProductionPlanQuery productionPlan); List selectPurchasePlanList(ReportPurchasePlanQuery productionPlan); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java index f704be3..8f23bf7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java @@ -94,6 +94,9 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService { inspectGoods.setInspectGoodsId(null); inspectGoods.setCreateTime(DateUtils.getNowDate()); inspectGoods.setCreateBy(SecurityUtils.getUsername()); + if(StringUtils.isNotBlank(inspectGoods.getRelateOrderGoodsId())) { + inspectGoods.setInspector(StringUtils.EMPTY); + } try { String inspectGoodsCode = NoGenerateUtils.generateInspectGoodsCode(); inspectGoods.setInspectGoodsCode(inspectGoodsCode); 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 new file mode 100644 index 0000000..cc92e15 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportPlanServiceImpl.java @@ -0,0 +1,33 @@ +package com.bonus.canteen.core.ims.service.impl; + +import com.bonus.canteen.core.ims.domain.param.*; +import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO; +import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO; +import com.bonus.canteen.core.ims.mapper.ReportPlanMapper; +import com.bonus.canteen.core.ims.service.IReportPlanService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 生产计划主Service业务层处理 + * + * @author xsheng + * @date 2025-07-14 + */ +@Service +public class ReportPlanServiceImpl implements IReportPlanService { + @Autowired + private ReportPlanMapper reportPlanMapper; + + @Override + public List selectProductionPlanList(ReportProductionPlanQuery productionPlan) { + return reportPlanMapper.selectProductionPlanList(productionPlan); + } + + @Override + public List selectPurchasePlanList(ReportPurchasePlanQuery productionPlan) { + return reportPlanMapper.selectPurchasePlanList(productionPlan); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportProductionPlanServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportProductionPlanServiceImpl.java deleted file mode 100644 index c5c20a7..0000000 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/ReportProductionPlanServiceImpl.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.bonus.canteen.core.ims.service.impl; - -import cn.hutool.core.collection.CollUtil; -import com.bonus.canteen.core.ims.domain.ProductionPlan; -import com.bonus.canteen.core.ims.domain.ProductionPlanDetail; -import com.bonus.canteen.core.ims.domain.ProductionPurchaseOrder; -import com.bonus.canteen.core.ims.domain.param.*; -import com.bonus.canteen.core.ims.domain.vo.ProductionPlanDetailVO; -import com.bonus.canteen.core.ims.domain.vo.ProductionPlanVO; -import com.bonus.canteen.core.ims.domain.vo.ReportProductionPlanVO; -import com.bonus.canteen.core.ims.domain.vo.ReportPurchasePlanVO; -import com.bonus.canteen.core.ims.enums.SupplierOrderGenerateTypeEnum; -import com.bonus.canteen.core.ims.mapper.ProductionPlanDetailMapper; -import com.bonus.canteen.core.ims.mapper.ProductionPlanMapper; -import com.bonus.canteen.core.ims.mapper.ReportProductionPlanMapper; -import com.bonus.canteen.core.ims.service.IProductionPlanDetailService; -import com.bonus.canteen.core.ims.service.IProductionPlanService; -import com.bonus.canteen.core.ims.service.IProductionPurchaseOrderService; -import com.bonus.canteen.core.ims.service.IReportProductionPlanService; -import com.bonus.canteen.core.ims.utils.NoGenerateUtils; -import com.bonus.common.core.exception.ServiceException; -import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.security.utils.SecurityUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * 生产计划主Service业务层处理 - * - * @author xsheng - * @date 2025-07-14 - */ -@Service -public class ReportProductionPlanServiceImpl implements IReportProductionPlanService { - @Autowired - private ReportProductionPlanMapper reportProductionPlanMapper; - - @Override - public List selectProductionPlanList(ReportProductionPlanQuery productionPlan) { - return reportProductionPlanMapper.selectProductionPlanList(productionPlan); - } - - @Override - public List selectPurchasePlanList(ReportPurchasePlanQuery productionPlan) { - return reportProductionPlanMapper.selectPurchasePlanList(productionPlan); - } -} diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportProductionPlanMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml similarity index 97% rename from bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportProductionPlanMapper.xml rename to bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml index 3c97507..909285f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportProductionPlanMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/ReportPlanMapper.xml @@ -2,7 +2,7 @@ - +