From 7ac148857bbfb33e8c64be0e1822be1ac231a761 Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Tue, 8 Apr 2025 13:09:15 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=88=B0=E8=B4=A7=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cim/idm/dao/DeliveryDao.java | 5 +- .../com/cim/idm/model/dto/PurchaseDto.java | 18 ++++++ .../model/vo/MaterialReceiveRequestVo.java | 46 +++++++++++++++ .../com/cim/idm/service/IDeliveryService.java | 3 +- .../idm/service/Impl/DeliveryServiceImpl.java | 3 +- .../resources/com/cim/idm/dao/DeliveryDao.xml | 59 +++++++++++++++++-- 6 files changed, 125 insertions(+), 9 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java index 30febf6..79cf7cc 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java @@ -5,6 +5,7 @@ import com.cim.idm.model.po.MaterialReceiveDelivery; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PurchaseDto; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; +import com.cim.idm.model.vo.MaterialReceiveRequestVo; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,8 +33,8 @@ public interface DeliveryDao { /** * 获取采购订单 */ - List getPurchase(@Param("dto") PurchaseDto dto, - @Param("typeList") List typeList); + List getPurchase(@Param("dto") PurchaseDto dto, + @Param("typeList") List typeList); /** * 获取入库详情 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java index b016cf2..2b83afd 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java @@ -7,6 +7,24 @@ public class PurchaseDto { // siteName private String siteName; + // 组织 + private String erpFactory; + // 单号名称 private String receiveRequestName; + + // 订单状态 + private String receiveRequestState; + + // 料号 + private String materialSpecName; + + // 品名 + private String descCn; + + // 开始时间 + private String fromDate; + + // 结束时间 + private String toDate; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java new file mode 100644 index 0000000..78369ae --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/MaterialReceiveRequestVo.java @@ -0,0 +1,46 @@ +package com.cim.idm.model.vo; + +import lombok.Data; + +@Data +public class MaterialReceiveRequestVo { + + // 工厂 + private String siteName; + // 订单编号 + private String receiveRequestName; + // 出入库类型编码 + private String receiveRequestType; + // 单据日期 + private String orderDate; + // 供应商编号 + private String supplierNo; + // 最后操作名称 + private String lastEventName; + // 最后操作时间 + private String lastEventTime; + // 最后操作人 + private String lastEventUser; + // 最后操作注释 + private String lastEventComment; + // 创建日期 + private String supplierName; + // 组织 + private String erpFactory; + // 组织(CN) + private String orgName; + // 料号 + private String materialSpecName; + // 品名 + private String descCn; + // 创建日期 + private String createTime; + // 订单状态 + private String receiveRequestState; + + private String oemSiteName; + private String oemSiteInCharge; + private String lastEventTimeKey; + private String systemType; + private String purchaseOrderGroup; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java index bc50581..9dbfc11 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java @@ -5,6 +5,7 @@ import com.cim.idm.model.po.MaterialReceiveDelivery; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PageDto; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; +import com.cim.idm.model.vo.MaterialReceiveRequestVo; import com.cim.idm.model.vo.ReceiveDetailVo; import com.github.pagehelper.PageInfo; @@ -23,7 +24,7 @@ public interface IDeliveryService { * @param dto 请求 * @return 采购订单 */ - PageInfo getPurchase(PageDto dto); + PageInfo getPurchase(PageDto dto); /** * 获取采购单明细及批次 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java index fd693a4..79c7f32 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java @@ -10,6 +10,7 @@ import com.cim.idm.model.dto.DeliveryRelationDto; import com.cim.idm.model.po.MaterialReceiveDelivery; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; +import com.cim.idm.model.vo.MaterialReceiveRequestVo; import com.cim.idm.model.vo.ReceiveDetailVo; import com.cim.idm.service.IDeliveryService; import com.github.pagehelper.PageInfo; @@ -51,7 +52,7 @@ public class DeliveryServiceImpl implements IDeliveryService { } @Override - public PageInfo getPurchase(PageDto dto) { + public PageInfo getPurchase(PageDto dto) { PageMethod.startPage(dto.getPageNum(), dto.getPageSize()); PurchaseDto purchaseDto = JSON.toJavaObject(dto.getParams(), PurchaseDto.class); return new PageInfo<>(deliveryDao.getPurchase(purchaseDto, ReceiveTypeEnums.getPurchase())); diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index 5d6f4ce..52754a0 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -15,15 +15,64 @@ SELECT * FROM dual - + SELECT DISTINCT m.SITENAME, m.RECEIVEREQUESTNAME, m.RECEIVEREQUESTTYPE, m.ORDERDATE, m.SUPPLIERNO, + m.LASTEVENTNAME, m.LASTEVENTTIME, m.LASTEVENTUSER, m.LASTEVENTCOMMENT, s.SUPPLIERNAME, + STOCKORGNO ERPFACTORY, o.ORGNAME, ms.MATERIALSPECNAME, ms.DESC_CN, d.CREATETIME, + CASE WHEN m.RECEIVEREQUESTSTATE = 'Completed' THEN '完成' ELSE '未完成' END RECEIVEREQUESTSTATE, + m.OEMSITENAME, m.OEMSITEINCHARGE, m.LASTEVENTTIMEKEY, m.SYSTEMTYPE, m.PURCHASEORDERGROUP + FROM MATERIALRECEIVEREQUEST m + LEFT JOIN SUPPLIER s ON s.SUPPLIERNO = m.SUPPLIERNO + LEFT JOIN MATERIALRECEIVEREQUESTDETAIL d ON m.RECEIVEREQUESTNAME = d.RECEIVEREQUESTNAME + LEFT JOIN MATERIALSPEC ms ON d.MATERIALSPECNAME = ms.MATERIALSPECNAME + LEFT JOIN ORG o ON STOCKORGNO = o.ORGNO + WHERE m.SITENAME = #{dto.siteName} + AND m.RECEIVEREQUESTTYPE IN #{type} + + AND m.STOCKORGNO = #{dto.erpFactory} + - AND RECEIVEREQUESTNAME LIKE '%'||#{dto.receiveRequestName}||'%' + AND m.RECEIVEREQUESTNAME LIKE '%'||#{dto.receiveRequestName}||'%' + + + AND m.RECEIVEREQUESTSTATE = #{dto.receiveRequestState} + + + AND ms.MATERIALSPECNAME LIKE '%'||#{dto.materialSpecName}||'%' + + + AND ms.DESC_CN LIKE '%'||#{dto.descCn}||'%' + + + AND m.ORDERDATE BETWEEN TO_DATE( #{dto.fromDate}, 'YYYY/MM/DDHH24MISS' ) + AND TO_DATE( #{dto.toDate}, 'YYYY/MM/DDHH24MISS' )