From 6f8b00b007e281dfe7fd18d2d6af8922575e3edc Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Mon, 17 Feb 2025 09:22:50 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90=E8=A6=81=E6=B1=82?= =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=A1=8C=E5=92=8C=E5=85=A8=E9=83=A8=E8=A1=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=9B=B4=E5=A4=9A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93=E7=B1=BB=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=87=BA=E6=89=80=E6=9C=89=E5=92=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=AF=BC=E5=87=BA=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E5=AF=BC=E5=87=BA=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E6=98=8E=E7=BB=86=E6=96=B9=E6=B3=95?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E6=A0=B9=E6=8D=AE=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=8F=B7=E6=95=B0=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E9=9B=86?= =?UTF-8?q?=E5=90=88=E6=96=B9=E6=B3=95=20=E6=96=B0=E5=A2=9E=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E9=9B=86=E5=90=88=E6=9F=A5=E8=AF=A2=E5=BC=80=E5=8F=91=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8D=95=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpDevelopModifyorderController.java | 11 +- .../domain/vo/ExportDevelopModifyorderVo.java | 137 ++++++++++++++++++ .../ErpDevelopModifyorderDetailMapper.java | 6 + .../IErpDevelopModifyorderService.java | 6 + .../ErpDevelopModifyorderServiceImpl.java | 67 +++++++++ .../erp/ErpDevelopModifyorderDetailMapper.xml | 8 + .../developModifyOrder.html | 2 +- 7 files changed, 232 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ExportDevelopModifyorderVo.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java index 9b406d36..189185c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/controller/ErpDevelopModifyorderController.java @@ -9,6 +9,7 @@ import com.ruoyi.erp.domain.ErpMaterial; import com.ruoyi.erp.domain.ErpMaterialVo; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderRemindVo; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo; +import com.ruoyi.erp.domain.vo.ExportDevelopModifyorderVo; import com.ruoyi.erp.service.IErpMaterialService; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.purchase.service.IPurchasePlanService; @@ -119,8 +120,9 @@ public class ErpDevelopModifyorderController extends BaseController { @ResponseBody public AjaxResult exportAll(ErpDevelopModifyorderVo erpDevelopModifyorderVo) { List list = erpDevelopModifyorderService.selectErpDevelopModifyorderList(erpDevelopModifyorderVo); - ExcelUtil util = new ExcelUtil(ErpDevelopModifyorderVo.class); - return util.exportExcel(list, "开发修改单数据"); + List exportDevelopModifyorderVos = erpDevelopModifyorderService.exportDevelopModifyorderList(list); + ExcelUtil util = new ExcelUtil(ExportDevelopModifyorderVo.class); + return util.exportExcel(exportDevelopModifyorderVos, "开发修改单数据"); } @@ -133,8 +135,9 @@ public class ErpDevelopModifyorderController extends BaseController { @ResponseBody public AjaxResult export(@RequestBody String[] developOrderCodes) { List list = erpDevelopModifyorderService.selectErpDevelopModifyorderListByCodes(developOrderCodes); - ExcelUtil util = new ExcelUtil(ErpDevelopModifyorderVo.class); - return util.exportExcel(list, "开发修改单数据"); + List exportDevelopModifyorderVos = erpDevelopModifyorderService.exportDevelopModifyorderList(list); + ExcelUtil util = new ExcelUtil(ExportDevelopModifyorderVo.class); + return util.exportExcel(exportDevelopModifyorderVos, "开发修改单数据"); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ExportDevelopModifyorderVo.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ExportDevelopModifyorderVo.java new file mode 100644 index 00000000..689374f7 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/vo/ExportDevelopModifyorderVo.java @@ -0,0 +1,137 @@ +package com.ruoyi.erp.domain.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** +* 导出开发修改单明细 +* */ +@Data +public class ExportDevelopModifyorderVo { + + /** 开发修改单号 */ + @Excel(name = "开发修改单号") + private String developOrderCode; + + /** 生产单号 */ + @Excel(name = "生产单号") + private String makeNo; + + /** 料号 */ + @Excel(name = "料号") + private String materialNo; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 品牌 */ + @Excel(name = "品牌") + private String materialBrand; + + /** 描述 */ + @Excel(name = "描述") + private String materialDescribe; + + /** 加工方式 */ + @Excel(name = "加工方式",dictType = "processMethod") + private String materialProcessMethod; + + /** 工程员 */ + private Long userId; + + /** 工程员姓名 */ + @Excel(name = "工程员") + private String userName; + + /** 采购入库状态（0待采购、1采购中、2待暂收、3部分暂收、4全部暂收、5已暂收、6待入库、7部分入库、8全部入库、9已入库） */ + @Excel(name = "采购入库状态",dictType = "eceiptStatus") + private String purchaseStorageStatus; + + /** 品质状态 （0待品质、1部分品质、2全部品质）*/ + @Excel(name = "品质状态",dictType = "qualityStatus") + private String qualityStatus; + + /** 审核状态 （0待审核、1审核通过、2审核拒绝）*/ + @Excel(name = "审核状态",dictType = "auditStatus") + private String auditStatus; + + /** 确认状态 （0待确认、1部分确认、2已确认）*/ + @Excel(name = "确认状态",dictType = "completeStatus") + private String completeStatus; + + /** 完成状态 （0待完成、1已完成）*/ + @Excel(name = "完成状态",dictType = "finshStatus") + private String finshStatus; + + /** 使用状态 （0否、1是、2已作废）*/ + @Excel(name = "使用状态",dictType = "useStatus") + private String useStatus; + + /** 订单类型(0客户订单、1研发订单、2其他订单)*/ + @Excel(name = "订单类型",dictType = "sys_order_type") + private String orderType; + + /** 修改完成时间 */ + @Excel(name = "修改完成时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date updateFinishTime; + + /** 修改前说明 */ + @Excel(name = "修改前说明") + private String beforeUpdateRemark; + + @Excel(name = "修改后说明") + /** 修改后说明 */ + private String afterUpdateRemark; + + + + /** 料号 */ + @Excel(name = "采购料号") + private String cgMaterialNo; + + /** 物料名称 */ + @Excel(name = "采购物料名称") + private String cgMaterialName; + + /** 物料单位 */ + @Excel(name = "采购物料单位") + private String cgMaterialUnit; + + /** 物料品牌 */ + @Excel(name = "采购物料品牌") + private String cgMaterialBrand; + + /** 物料描述 */ + @Excel(name = "采购物料描述") + private String cgMaterialDescribe; + + /** 加工方式 */ + @Excel(name = "采购物料加工方式") + private String cgMaterialProcessMethod; + + + /** 订单数量 */ + @Excel(name = "订单数量") + private Integer materialNum; + + + @Excel(name = "领料数量") + private Integer pickNum; + + /** 已领料数量 */ + @Excel(name = "已领料数量") + private Integer hasPickNum; + + /** 可用库存数 */ + @Excel(name = "可用库存数") + private Integer availableStockNum; + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderDetailMapper.java index 993dbd51..67bf9235 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpDevelopModifyorderDetailMapper.java @@ -89,4 +89,10 @@ public interface ErpDevelopModifyorderDetailMapper * 检查开发修改单子表是否引用了物料 * */ int checkMaterialIsReferencedByDevelopModifyorderDetail(String materialNo); + + /** + * 根据开发修改单号查询开发修改单详情物料信息 + * */ + List selectDevelopModifyorderDetailListByCodes(List collectDevelopOrderCodes); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java index 5349ab3d..44d695fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/IErpDevelopModifyorderService.java @@ -5,6 +5,7 @@ import com.ruoyi.erp.domain.ErpDevelopModifyorder; import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderRemindVo; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo; +import com.ruoyi.erp.domain.vo.ExportDevelopModifyorderVo; import com.ruoyi.system.domain.SysSalesOrder; import org.activiti.engine.runtime.ProcessInstance; @@ -110,4 +111,9 @@ public interface IErpDevelopModifyorderService * 根据开发修改单号查询提醒人员列表 * */ List getErpDevelopRemindPeopleList(String developOrderCode); + + /** + * 导出开发修改单列表 + * */ + List exportDevelopModifyorderList(List list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java index 8041e927..9297ceae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpDevelopModifyorderServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.erp.service.impl; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; import com.github.pagehelper.Page; import com.ruoyi.common.core.domain.entity.SysUser; @@ -14,6 +16,7 @@ import com.ruoyi.erp.domain.ErpDevelopModifyorderDetail; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderMaterialVo; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderRemindVo; import com.ruoyi.erp.domain.vo.ErpDevelopModifyorderVo; +import com.ruoyi.erp.domain.vo.ExportDevelopModifyorderVo; import com.ruoyi.erp.mapper.ErpDevelopModifyorderDetailMapper; import com.ruoyi.process.general.service.IProcessService; import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper; @@ -388,6 +391,70 @@ public class ErpDevelopModifyorderServiceImpl implements IErpDevelopModifyorderS } + /** + * 导出开发修改单数据明细 + * */ + @Override + public List exportDevelopModifyorderList(List list) { + // 获取所有的开发修改单号 + List collectDevelopOrderCodes = list.stream().map(ErpDevelopModifyorderVo::getDevelopOrderCode).collect(Collectors.toList()); + + // 根据开发修改单号查询对应的详情列表 + List developModifyorderDetailList = developModifyorderDetailMapper.selectDevelopModifyorderDetailListByCodes(collectDevelopOrderCodes); + + // 创建一个开发修改订单VO的Map，键为开发修改单号 + Map erpDevelopModifyorderVoMap = list.stream() + .collect(Collectors.toMap(ErpDevelopModifyorderVo::getDevelopOrderCode, Function.identity())); + + // 初始化导出列表 + List exportDevelopModifyorderVos = new ArrayList<>(); + + for (ErpDevelopModifyorderDetail detail : developModifyorderDetailList) { + ExportDevelopModifyorderVo exportVo = new ExportDevelopModifyorderVo(); + + // 从ErpDevelopModifyorderDetail填充数据 + exportVo.setCgMaterialNo(detail.getMaterialNo()); + exportVo.setCgMaterialName(detail.getMaterialName()); + exportVo.setCgMaterialUnit(detail.getMaterialUnit()); + exportVo.setCgMaterialBrand(detail.getMaterialBrand()); + exportVo.setCgMaterialDescribe(detail.getMaterialDescribe()); + exportVo.setCgMaterialProcessMethod(detail.getMaterialProcessMethod()); + exportVo.setMaterialNum(detail.getMaterialNum()); + exportVo.setPickNum(detail.getPickNum()); + exportVo.setHasPickNum(detail.getHasPickNum()); + exportVo.setAvailableStockNum(detail.getAvailableStockNum()); + + // 从ErpDevelopModifyorder填充数据，通过开发修改单号进行关联 + ErpDevelopModifyorderVo modifyorderVo = erpDevelopModifyorderVoMap.get(detail.getDevelopOrderCode()); + if (modifyorderVo != null) { + exportVo.setDevelopOrderCode(modifyorderVo.getDevelopOrderCode()); + exportVo.setMakeNo(modifyorderVo.getMakeNo()); + exportVo.setMaterialNo(modifyorderVo.getMaterialNo()); + exportVo.setMaterialName(modifyorderVo.getMaterialName()); + exportVo.setMaterialBrand(modifyorderVo.getMaterialBrand()); + exportVo.setMaterialDescribe(modifyorderVo.getMaterialDescribe()); + exportVo.setMaterialProcessMethod(modifyorderVo.getMaterialProcessMethod()); + exportVo.setUserId(modifyorderVo.getUserId()); + exportVo.setUserName(modifyorderVo.getUserName()); + exportVo.setPurchaseStorageStatus(modifyorderVo.getPurchaseStorageStatus()); + exportVo.setQualityStatus(modifyorderVo.getQualityStatus()); + exportVo.setAuditStatus(modifyorderVo.getAuditStatus()); + exportVo.setCompleteStatus(modifyorderVo.getCompleteStatus()); + exportVo.setFinshStatus(modifyorderVo.getFinshStatus()); + exportVo.setUseStatus(modifyorderVo.getUseStatus()); + exportVo.setOrderType(modifyorderVo.getOrderType()); + exportVo.setUpdateFinishTime(modifyorderVo.getUpdateFinishTime()); + exportVo.setBeforeUpdateRemark(modifyorderVo.getBeforeUpdateRemark()); + exportVo.setAfterUpdateRemark(modifyorderVo.getAfterUpdateRemark()); + } + + // 添加到结果列表 + exportDevelopModifyorderVos.add(exportVo); + } + + return exportDevelopModifyorderVos; + } + /** * 创建售后单审核流程 * @param applyTitle diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml index a9a64801..2b3e9176 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpDevelopModifyorderDetailMapper.xml @@ -57,6 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) from erp_develop_modifyorder_detail where material_no = #{materialNo} + + insert into erp_develop_modifyorder_detail diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html index 38635647..619068ae 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html +++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html @@ -70,7 +70,7 @@
-
+