From ae91f2449cb1fe012caa90451261eefaf1d51833 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Thu, 3 Jul 2025 15:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E6=A3=80=E6=8A=A5=E8=A1=A8=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AF=BC=E5=87=BA=E3=80=81=E6=96=B0=E5=A2=9E=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E6=8A=A5=E6=A3=80=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsRawOrderInController.java | 14 ++ .../java/com/op/wms/domain/WmsRawOrderIn.java | 65 ++++++ .../op/wms/domain/query/OrderCheckQuery.java | 89 ++++++++ .../com/op/wms/domain/vo/OrderCheckVo.java | 209 ++++++++++++++++++ .../op/wms/mapper/WmsRawOrderInMapper.java | 4 + .../op/wms/service/IWmsRawOrderInService.java | 7 + .../impl/WmsRawOrderInServiceImpl.java | 13 ++ .../mapper/wms/WmsRawOrderInMapper.xml | 41 ++++ 8 files changed, 442 insertions(+) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java index dc200425f..64404c2b0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java @@ -5,6 +5,8 @@ import javax.servlet.http.HttpServletResponse; import com.op.wms.domain.OdsProcureOrder; import com.op.wms.domain.WmsProductPut; +import com.op.wms.domain.query.OrderCheckQuery; +import com.op.wms.domain.vo.OrderCheckVo; import com.op.wms.service.IOdsProcureOrderService; import com.op.wms.service.IWmsProductPutService; import org.springframework.beans.factory.annotation.Autowired; @@ -138,6 +140,18 @@ public class WmsRawOrderInController extends BaseController { return getDataTable(list); } + /** + * 报检报表导出 + * **/ + @RequiresPermissions("wms:odsRawOrderBJ:export") + @Log(title = "报检报表导出", businessType = BusinessType.EXPORT) + @PostMapping("/exportBJ") + public void exportBJ(HttpServletResponse response, OrderCheckQuery query) { + List list = wmsRawOrderInService.getOrderCheckList(query); + ExcelUtil util = new ExcelUtil(OrderCheckVo.class); + util.exportExcel(response, list, "报检报表数据"); + } + /** * pda上查询包材到货单已暂时列表 */ diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java index f3a5f2ade..550a1da4f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsRawOrderIn.java @@ -364,6 +364,71 @@ public class WmsRawOrderIn extends BaseEntity { private String checkManCode; private String checkManName; + /** + * 检验任务号 + * **/ + private String checkNo; + + /** + * 报检开始时间 + * **/ + private String checkTimeStart; + + /** + * 报检结束时间 + * **/ + private String checkTimeEnd; + + /** + * 收货开始时间 + * **/ + private String deliveryTimeStart; + + /** + * 收货结束时间 + * **/ + private String deliveryTimeEnd; + + public String getCheckNo() { + return checkNo; + } + + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + + public String getDeliveryTimeStart() { + return deliveryTimeStart; + } + + public void setDeliveryTimeStart(String deliveryTimeStart) { + this.deliveryTimeStart = deliveryTimeStart; + } + + public String getDeliveryTimeEnd() { + return deliveryTimeEnd; + } + + public void setDeliveryTimeEnd(String deliveryTimeEnd) { + this.deliveryTimeEnd = deliveryTimeEnd; + } + public String getProcureCode() { return procureCode; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java new file mode 100644 index 000000000..a7197b9cb --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/query/OrderCheckQuery.java @@ -0,0 +1,89 @@ +package com.op.wms.domain.query; + +/** + * remark + * + * @author 019117 + * @date + */ +public class OrderCheckQuery { + + /** + * 送货单号 + * **/ + private String orderNo; + + /** + * 采购单号 + * **/ + private String procureCode; + + /** + * 物料编码 + * **/ + private String materialCode; + + /** + * 物料描述 + * **/ + private String materialDesc; + + /** + * 报检日期查询条件(开始) + * **/ + private String checkTimeStart; + + /** + * 报检日期查询条件(结束) + * **/ + private String checkTimeEnd; + + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getProcureCode() { + return procureCode; + } + + public void setProcureCode(String procureCode) { + this.procureCode = procureCode; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialDesc() { + return materialDesc; + } + + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java new file mode 100644 index 000000000..90e6b66a8 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/vo/OrderCheckVo.java @@ -0,0 +1,209 @@ +package com.op.wms.domain.vo; + +import com.op.common.core.annotation.Excel; + +/** + * remark + * + * @author 019117 + * @date + */ +public class OrderCheckVo { + + /** + * 送货单号 + * **/ + @Excel(name = "送货单号") + private String orderNo; + + /** + * 采购单号 + * **/ + @Excel(name = "采购单号") + private String procureCode; + + /** + * 物料编码 + * **/ + @Excel(name = "物料编码") + private String materialCode; + + /** + * 物料名称 + * **/ + @Excel(name = "物料名称") + private String materialDesc; + + /** + * 实收数量 + * **/ + @Excel(name = "实收数量") + private Integer actualQuantity; + + /** + * 报检时间 + * **/ + @Excel(name = "报检时间") + private String checkTime; + + /** + * 报检任务号 + * **/ + @Excel(name = "检验任务编号") + private String checkNo; + + /** + * 报检人 + * **/ + @Excel(name = "报检人") + private String applyPerson; + + /** + * 暂收时间 + * **/ + @Excel(name = "暂收时间") + private String temporaryTime; + + /** + * 质检开始时间 + * **/ + @Excel(name = "质检开始时间") + private String checkStartTime; + + /** + * 质检结束时间 + * **/ + @Excel(name = "质检结束时间") + private String checkEndTime; + + /** + * 检验人 + * **/ + @Excel(name = "检验人") + private String checkPerson; + + /** + * 105收货时间 + * **/ + @Excel(name = "收货时间") + private String receiveTime105; + + /** + * 收货人 + * **/ + @Excel(name = "收货人") + private String receivePerson105; + + + public String getOrderNo() { + return orderNo; + } + + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getProcureCode() { + return procureCode; + } + + public void setProcureCode(String procureCode) { + this.procureCode = procureCode; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialDesc() { + return materialDesc; + } + + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + + public Integer getActualQuantity() { + return actualQuantity; + } + + public void setActualQuantity(Integer actualQuantity) { + this.actualQuantity = actualQuantity; + } + + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getCheckNo() { + return checkNo; + } + + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getApplyPerson() { + return applyPerson; + } + + public void setApplyPerson(String applyPerson) { + this.applyPerson = applyPerson; + } + + public String getTemporaryTime() { + return temporaryTime; + } + + public void setTemporaryTime(String temporaryTime) { + this.temporaryTime = temporaryTime; + } + + public String getCheckStartTime() { + return checkStartTime; + } + + public void setCheckStartTime(String checkStartTime) { + this.checkStartTime = checkStartTime; + } + + public String getCheckEndTime() { + return checkEndTime; + } + + public void setCheckEndTime(String checkEndTime) { + this.checkEndTime = checkEndTime; + } + + public String getCheckPerson() { + return checkPerson; + } + + public void setCheckPerson(String checkPerson) { + this.checkPerson = checkPerson; + } + + public String getReceiveTime105() { + return receiveTime105; + } + + public void setReceiveTime105(String receiveTime105) { + this.receiveTime105 = receiveTime105; + } + + public String getReceivePerson105() { + return receivePerson105; + } + + public void setReceivePerson105(String receivePerson105) { + this.receivePerson105 = receivePerson105; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java index a928030b2..3998a5d9b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java @@ -4,6 +4,8 @@ import java.util.List; import com.op.wms.domain.WmsRawOrderIn; import com.op.wms.domain.WmsToWCSDTO; +import com.op.wms.domain.query.OrderCheckQuery; +import com.op.wms.domain.vo.OrderCheckVo; import org.apache.ibatis.annotations.Param; /** @@ -77,4 +79,6 @@ public interface WmsRawOrderInMapper { List getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn); + List getOrderCheckList(OrderCheckQuery query); + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java index b0a868b10..560a3053f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java @@ -3,6 +3,8 @@ package com.op.wms.service; import java.util.List; import com.op.wms.domain.WmsRawOrderIn; +import com.op.wms.domain.query.OrderCheckQuery; +import com.op.wms.domain.vo.OrderCheckVo; /** * 包材到货单Service接口 @@ -65,4 +67,9 @@ public interface IWmsRawOrderInService { * pda上查询包材到货单已暂时列表 */ List getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn); + + /** + * 获取报检报表列表 + * **/ + List getOrderCheckList(OrderCheckQuery query); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java index 958c9d635..e2f923ab8 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java @@ -3,6 +3,8 @@ package com.op.wms.service.impl; import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; +import com.op.wms.domain.query.OrderCheckQuery; +import com.op.wms.domain.vo.OrderCheckVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.op.wms.mapper.WmsRawOrderInMapper; @@ -122,4 +124,15 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService { } return wmsRawOrderInList; } + + /** + * 获取报检报表列表 + * + * @param query 查询条件 + **/ + @Override + @DS("#header.poolName") + public List getOrderCheckList(OrderCheckQuery query) { + return wmsRawOrderInMapper.getOrderCheckList(query); + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml index a219e0af8..e5a147ae6 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml @@ -67,6 +67,7 @@ + @@ -567,6 +568,7 @@ ods_procure_order.Create_Date , qc_check_task.create_time createtime, qc_check_task.check_time checktime, + qc_check_task.check_no checkNo, qc_check_task.check_man_code checkManCode, qc_check_task.check_man_name checkManName, wms_raw_order_in.accounting_time accountingtime, @@ -585,6 +587,8 @@ and ods_procure_order.Material_Code like concat('%', #{materialCode}, '%') and ods_procure_order.Material_Desc = #{materialDesc} + and CONVERT(varchar(16), qc_check_task.create_time, 120) >= #{checkTimeStart} + and #{checkTimeEnd} >= CONVERT(varchar(16), qc_check_task.create_time, 120) ORDER BY ods_procure_order.Create_Date DESC @@ -661,4 +665,41 @@ ORDER BY wms_raw_order_in.gmt_create DESC + + +