From d59136a945b947a1b30e9c70564e8363230aac58 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 8 Aug 2023 16:05:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=96=99=E8=AE=A1=E5=88=92=E7=AE=A1?= =?UTF-8?q?=E7=90=86(=E8=AE=A1=E5=88=92=E5=AF=BC=E5=87=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProWetMaterialPlanController.java | 7 +++-- .../plan/domain/ProWetMaterialPlanDetail.java | 12 ++------ .../com/op/plan/mapper/ProOrderMapper.java | 1 - .../ProWetMaterialPlanDetailMapper.java | 8 ++++++ .../IProWetMaterialPlanDetailService.java | 16 +++++++++++ .../ProWetMaterialPlanDetailServiceImpl.java | 28 +++++++++++++++++++ .../impl/ProWetMaterialPlanServiceImpl.java | 2 +- .../plan/ProWetMaterialPlanDetailMapper.xml | 10 +++++++ 8 files changed, 70 insertions(+), 14 deletions(-) create mode 100644 op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java create mode 100644 op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProWetMaterialPlanController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProWetMaterialPlanController.java index f6c0ed946..a3bebd108 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProWetMaterialPlanController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProWetMaterialPlanController.java @@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletResponse; import com.op.plan.domain.ProOrderWorkorder; import com.op.plan.domain.ProWetMaterialPlanDetail; +import com.op.plan.service.IProWetMaterialPlanDetailService; import com.op.system.api.RemoteUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -30,6 +31,8 @@ import com.op.common.core.web.page.TableDataInfo; public class ProWetMaterialPlanController extends BaseController { @Autowired private IProWetMaterialPlanService proWetMaterialPlanService; + @Autowired + private IProWetMaterialPlanDetailService proWetMaterialPlanDetailService; /** * 通过主计划id检验是否可以修改（所有都未接料） @@ -137,8 +140,8 @@ public class ProWetMaterialPlanController extends BaseController { @Log(title = "湿料计划管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, ProWetMaterialPlan proWetMaterialPlan) { - List list = proWetMaterialPlanService.selectProWetMaterialPlanList(proWetMaterialPlan); - ExcelUtil util = new ExcelUtil(ProWetMaterialPlan.class); + List list = proWetMaterialPlanDetailService.selectProWetMaterialPlanDetailList(proWetMaterialPlan); + ExcelUtil util = new ExcelUtil(ProWetMaterialPlanDetail.class); util.exportExcel(response, list, "湿料计划管理数据"); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProWetMaterialPlanDetail.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProWetMaterialPlanDetail.java index 05d4e0f9c..11c78762e 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProWetMaterialPlanDetail.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProWetMaterialPlanDetail.java @@ -33,23 +33,19 @@ public class ProWetMaterialPlanDetail extends BaseEntity { private String workorderId; /** */ - @Excel(name = "") private String atrr1; /** */ - @Excel(name = "") private String atrr2; /** */ - @Excel(name = "") private String atrr3; /** 1接料完成0未接料 */ - @Excel(name = "1接料完成0未接料") + @Excel(name = "是否接料",readConverterExp = "N=未接料,Y=已接料") private String status; /** 料罐id */ - @Excel(name = "料罐id") private String bucketId; /** 料罐编码 */ @@ -57,11 +53,9 @@ public class ProWetMaterialPlanDetail extends BaseEntity { private String bucketCode; /** 物料编码 */ - @Excel(name = "物料编码") private String materialCode; /** 物料id */ - @Excel(name = "物料id") private String materialId; /** 物料名称 */ @@ -73,11 +67,9 @@ public class ProWetMaterialPlanDetail extends BaseEntity { private String productName; /** 班次id */ - @Excel(name = "班次id") private Long shiftId; /** 班次编码 */ - @Excel(name = "班次编码") private String shiftCode; /** 班次简称 */ @@ -86,7 +78,7 @@ public class ProWetMaterialPlanDetail extends BaseEntity { /** 计划日期 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd") + @Excel(name = "计划日期", width = 30, dateFormat = "yyyy-MM-dd",sort = 1) private Date planTime; // 工单编码 diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java index ecc52c18b..3b04b30c9 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderMapper.java @@ -6,7 +6,6 @@ import com.op.plan.domain.Convert; import com.op.plan.domain.ProLine; import com.op.plan.domain.ProOrder; import com.op.plan.domain.ProShift; -import com.baomidou.dynamic.datasource.annotation.DS; import com.op.plan.domain.*; import com.op.system.api.model.SapProOrder; import org.apache.ibatis.annotations.Mapper; diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java index 446859116..36683ee0f 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWetMaterialPlanDetailMapper.java @@ -1,6 +1,7 @@ package com.op.plan.mapper; +import com.op.plan.domain.ProWetMaterialPlan; import com.op.plan.domain.ProWetMaterialPlanDetail; import org.apache.ibatis.annotations.Mapper; @@ -85,4 +86,11 @@ public interface ProWetMaterialPlanDetailMapper { List selectProWetMaterialPlanDetailByOrderId(String id); List selectDetailListById(String id); + + /** + * 导出湿料计划-通过日期范围 + * @param proWetMaterialPlan + * @return + */ + List selectWetPlanList(ProWetMaterialPlan proWetMaterialPlan); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java new file mode 100644 index 000000000..602bbd166 --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProWetMaterialPlanDetailService.java @@ -0,0 +1,16 @@ +package com.op.plan.service; + +import com.op.plan.domain.ProWetMaterialPlan; +import com.op.plan.domain.ProWetMaterialPlanDetail; + +import java.util.List; + +public interface IProWetMaterialPlanDetailService { + + /** + * 导出湿料计划 + * @param proWetMaterialPlan + * @return + */ + List selectProWetMaterialPlanDetailList(ProWetMaterialPlan proWetMaterialPlan); +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java new file mode 100644 index 000000000..4a3675d23 --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanDetailServiceImpl.java @@ -0,0 +1,28 @@ +package com.op.plan.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.plan.domain.ProWetMaterialPlan; +import com.op.plan.domain.ProWetMaterialPlanDetail; +import com.op.plan.mapper.ProWetMaterialPlanDetailMapper; +import com.op.plan.service.IProWetMaterialPlanDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ProWetMaterialPlanDetailServiceImpl implements IProWetMaterialPlanDetailService { + @Autowired + private ProWetMaterialPlanDetailMapper proWetMaterialPlanDetailMapper; + + /** + * 导出湿料计划 + * @param proWetMaterialPlan + * @return + */ + @Override + @DS("#header.poolName") + public List selectProWetMaterialPlanDetailList(ProWetMaterialPlan proWetMaterialPlan) { + return proWetMaterialPlanDetailMapper.selectWetPlanList(proWetMaterialPlan); + } +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java index 40bb1e2ca..e043679d8 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWetMaterialPlanServiceImpl.java @@ -36,7 +36,7 @@ import static com.op.common.core.web.domain.AjaxResult.success; /** * 湿料计划管理Service业务层处理 * - * @author zxl + * @author wws * @date 2023-07-24 */ @Service diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml index bdd07d433..fa4c9a1e4 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProWetMaterialPlanDetailMapper.xml @@ -95,6 +95,16 @@ where wet_material_plan_id = #{id} + + insert into pro_wet_material_plan_detail