From 30b2e7ec6ea3aa69206cdce44b5eadf6c1222728 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Mon, 27 Oct 2025 16:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81=E5=8C=BA?= =?UTF-8?q?=E4=BD=8D=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProOrderWorkorderController.java | 15 ++ .../com/op/plan/domain/ProductFillIn.java | 142 ++++++++++++++++++ .../plan/mapper/ProOrderWorkorderMapper.java | 2 + .../service/IProOrderWorkorderService.java | 2 + .../impl/ProOrderWorkorderServiceImpl.java | 7 + .../mapper/plan/ProOrderWorkorderMapper.xml | 32 ++++ 6 files changed, 200 insertions(+) create mode 100644 op-modules/op-plan/src/main/java/com/op/plan/domain/ProductFillIn.java diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index 50a71baf2..3956d1eb9 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -3,12 +3,14 @@ package com.op.plan.controller; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson2.JSONObject; import com.op.common.core.domain.ExcelCol; import com.op.common.core.exception.ServiceException; +import com.op.common.core.utils.ServletUtils; import com.op.common.core.utils.StringUtils; import com.op.common.core.utils.poi.ExcelMapUtil; import com.op.plan.domain.*; @@ -402,4 +404,17 @@ public class ProOrderWorkorderController extends BaseController { String m = "000000010101000115"; System.out.println(m.substring(7)); } + + @RequiresPermissions("mes:pro:workorder:productExport") + @Log(title = "导出成品区位填报表", businessType = BusinessType.EXPORT) + @PostMapping("/productExport") + public void productExport(HttpServletResponse response, ProOrderWorkorder proOrderWorkorder) { + String factoryCode = Objects.requireNonNull(ServletUtils.getRequest()).getHeader("PoolName"); + proOrderWorkorder.setFactoryCode(factoryCode.replace("ds_","")); + List list = proOrderWorkorderService.getProductFillInList(proOrderWorkorder); + ExcelUtil util = new ExcelUtil<>(ProductFillIn.class); + util.exportExcel(response, list, "物料区位信息"); + } + + } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/domain/ProductFillIn.java b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProductFillIn.java new file mode 100644 index 000000000..a93eee85a --- /dev/null +++ b/op-modules/op-plan/src/main/java/com/op/plan/domain/ProductFillIn.java @@ -0,0 +1,142 @@ +package com.op.plan.domain; + +import com.op.common.core.annotation.Excel; + +/** + * remark + * + * @author 019117 + * @date + */ +public class ProductFillIn { + + + /** + * 生产日期 + * **/ + @Excel(name = "生产日期") + private String productionDate; + + /** + * 工单号 + * **/ + @Excel(name = "工单号") + private String workOrderNumber; + + /** + * 物料编码 + * **/ + @Excel(name = "物料编码") + private String materialCode; + + /** + * 物料名称 + * **/ + @Excel(name = "物料名称") + private String materialName; + + /** + * 批次编码 + * **/ + @Excel(name = "批次编码") + private String batchCode; + + /** + * 批次数量 + * **/ + @Excel(name = "批次数量") + private String batchNumber; + + + /** + * 工厂编码 + * **/ + @Excel(name = "工厂编码") + private String factoryCode; + + + /** + * 地点 + * **/ + @Excel(name = "地点") + private String location; + + /** + * 区号 + * **/ + @Excel(name = "区号") + private String areaCode; + + + public String getProductionDate() { + return productionDate; + } + + public void setProductionDate(String productionDate) { + this.productionDate = productionDate; + } + + public String getWorkOrderNumber() { + return workOrderNumber; + } + + public void setWorkOrderNumber(String workOrderNumber) { + this.workOrderNumber = workOrderNumber; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getBatchCode() { + return batchCode; + } + + public void setBatchCode(String batchCode) { + this.batchCode = batchCode; + } + + public String getBatchNumber() { + return batchNumber; + } + + public void setBatchNumber(String batchNumber) { + this.batchNumber = batchNumber; + } + + public String getLocation() { + return location; + } + + public void setLocation(String location) { + this.location = location; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } +} diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index 2ec2c23d8..8bbcdfc11 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -268,5 +268,7 @@ public interface ProOrderWorkorderMapper { List getBPNBomList(ProOrderWorkorder proOrderWorkorder); List getPackType(@Param("workorderCodes")String[] workorderCodes); + + List getProductFillInList(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java index 270732040..298dc7dda 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/IProOrderWorkorderService.java @@ -162,4 +162,6 @@ public interface IProOrderWorkorderService { List getBPNBomList(ProOrderWorkorder proOrderWorkorder); List getPackType(String[] workorderIds); + + List getProductFillInList(ProOrderWorkorder proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 09a7230ff..e9cf6d15e 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -9,6 +9,7 @@ import com.op.common.core.domain.ExcelCol; import com.op.common.core.domain.R; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.ServletUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; @@ -1851,4 +1852,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { String s = "000800003044"; System.out.println(s.substring(3)); } + + @Override + @DS("#header.poolName") + public List getProductFillInList(ProOrderWorkorder proOrderWorkorder) { + return proOrderWorkorderMapper.getProductFillInList(proOrderWorkorder); + } } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index f80a8f33d..22c7bf620 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -1144,4 +1144,36 @@ and pow.del_flag = '0' + + +