From 8c9ebde6d30c2428bae68e3bfcec7ddffb4273cd Mon Sep 17 00:00:00 2001 From: zhangke Date: Tue, 26 Aug 2025 09:03:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E7=89=A9=E6=96=99=E7=9A=84=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/QCReceiptController.java | 21 +++++++++++++ .../nflg/wms/common/pojo/qo/QCReceiptQO.java | 20 +++++++++--- .../common/pojo/vo/QCReceiveTaskItemVO.java | 11 ------- .../repository/entity/WmsQcReceiveItem.java | 15 --------- .../repository/mapper/WmsQcReceiveMapper.java | 3 +- .../service/impl/WmsQcReceiveServiceImpl.java | 3 +- .../resources/mapper/WmsPoReceiptMapper.xml | 23 ++++---------- .../resources/mapper/WmsQcReceiveMapper.xml | 31 ++++++------------- 8 files changed, 56 insertions(+), 71 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java index 79206b78..e197976e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QCReceiptController.java @@ -20,6 +20,11 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 质检物料入库单 + * @param request + * @return + */ @RestController @RequestMapping("qc") public class QCReceiptController { @@ -33,12 +38,23 @@ public class QCReceiptController { @Resource private SrmMaterialReceiptScanCodesRepository srmMaterialReceiptCanCodesRepository; + + /** + * 质检物料入库单列表 + * @param request + * @return + */ @PostMapping("search") @ApiMark(moduleName = "质检物料入库单", apiName = "入库列表") public ApiResult> search(@Valid @RequestBody QCReceiptQO request) { return ApiResult.success(qcReceiveService.search(request)); } + /** + * 质检物料入库单详情 + * @param inId + * @return + */ @GetMapping("getItems") @ApiMark(moduleName = "质检物料入库单", apiName = "入库详情") public ApiResult> search(@RequestParam Long inId) { @@ -46,6 +62,11 @@ public class QCReceiptController { .lambdaQuery().eq(WmsQcReceiveItem::getReceiveId, inId).list())); } + /** + * 质检物料入库单扫码详情 + * @param orderItemId + * @return + */ @GetMapping("getScanCodes") @ApiMark(moduleName = "质检物料入库单", apiName = "获取扫码的详情信息") public ApiResult> getScanCodes(@RequestParam String orderItemId) { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiptQO.java index 390405ca..45852919 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiptQO.java @@ -4,9 +4,11 @@ import cn.hutool.core.date.DateTime; import lombok.Data; import lombok.experimental.Accessors; +import java.time.LocalDate; + @Data @Accessors(chain = true) -public class QCReceiptQO extends PageQO { +public class QCReceiptQO extends SearchBaseQO { /** * 送货单号 @@ -26,22 +28,30 @@ public class QCReceiptQO extends PageQO { /** * 送货开始时间 */ - private DateTime deliveryStartDate; + private LocalDate deliveryStartDate; /** * 送货结束时间 */ - private DateTime deliveryEndDate; + private LocalDate deliveryEndDate; + + public LocalDate getDeliveryEndDate() { + return deliveryEndDate == null ? null : deliveryEndDate.plusDays(1); + } /** * 收货开始时间 */ - private DateTime receiveStartDate; + private LocalDate receiveStartDate; /** * 收货结束时间 */ - private DateTime receiveEndDate; + private LocalDate receiveEndDate; + + public LocalDate getReceiveEndDate() { + return receiveEndDate == null ? null : receiveEndDate.plusDays(1); + } /** * 入库单号 diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java index b8f5d729..5f6f75ca 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java @@ -121,15 +121,4 @@ public class QCReceiveTaskItemVO { */ private String materialDocYear; - /** - * 入库时间 - */ - private LocalDateTime updateTime; - - - /** - * 入库人姓名 - */ - private String updateUserName; - } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java index 87912b90..004ae4fe 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java @@ -141,19 +141,4 @@ public class WmsQcReceiveItem implements Serializable { * 物料年度凭证 */ private String materialDocYear; - - /** - * 入库时间 - */ - private LocalDateTime updateTime; - - /** - * 入库人ID - */ - private Long updateUserId; - - /** - * 入库人姓名 - */ - private String updateUserName; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveMapper.java index 36135812..802e4c6e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsQcReceiveMapper.java @@ -2,6 +2,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.qo.QCReceiptQO; import com.nflg.wms.common.pojo.vo.QCReceiptVO; import com.nflg.wms.common.pojo.vo.QCTaskVO; @@ -21,5 +22,5 @@ public interface WmsQcReceiveMapper extends BaseMapper { List getTasks(String orderNo); - IPage search(QCReceiptQO request); + IPage search(QCReceiptQO request, Page objectPage); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveServiceImpl.java index 8f016c45..0f55e25d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsQcReceiveServiceImpl.java @@ -1,6 +1,7 @@ package com.nflg.wms.repository.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.QCReceiptQO; import com.nflg.wms.common.pojo.vo.POReceiptVO; @@ -32,7 +33,7 @@ public class WmsQcReceiveServiceImpl extends ServiceImpl search(QCReceiptQO request) { - return baseMapper.search(request); + return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); } } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml index eaf8146d..88e67e4d 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptMapper.xml @@ -19,46 +19,35 @@ wms_srm_order b on a.order_no=b.note_num left join user_supplier c on b.supplier_num=c.supplier_code - + and a.in_num like concat('%', #{request.inNum}, '%') - - + and b.note_num like concat('%', #{request.orderNo}, '%') - - - and b.supplier_num =#{request.supplierNum} + + and b.supplier_num = #{request.supplierNum} - - and a.create_time >= #{request.receiveStartDate} - and a.create_time <= #{request.receiveEndDate} - and b.delivery_note_date >= - #{request.deliveryStartDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler} + #{request.deliveryStartDate} - and b.delivery_note_date <= - #{request.deliveryEndDate, jdbcType=TIMESTAMP, javaType=java.time.LocalDate, typeHandler=org.apache.ibatis.type.LocalDateTypeHandler} + #{request.deliveryEndDate} - - and a.update_time >= #{request.inStartDate} - and a.update_time <= #{request.inEndDate} - order by a.create_time desc diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml index 273d4065..fae7a09d 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml @@ -41,38 +41,27 @@ wms_srm_order b on a.order_no = b.note_num left join user_supplier c on b.supplier_num = c.supplier_code - - and a.in_num like concat('%', #{request.inNum}, '%') + + and a.in_no like concat('%', #{request.inNum}, '%') - - + and b.note_num like concat('%', #{request.orderNo}, '%') - - + and b.supplier_num =#{request.supplierNum} - - and EXISTS (select 1 from wms_srm_order_item where a.id=wms_srm_order_item.order_id and - wms_srm_order_item.item_code like concat('%', #{request.itemCode}, '%') - - - + and a.create_time >= #{request.receiveStartDate} - - + and a.create_time < #{request.receiveEndDate} - - - and a.delivery_note_date >= #{request.deliveryStartDate} + + and b.delivery_note_date >= #{request.deliveryStartDate} - - - and a.delivery_note_date < #{request.deliveryEndDate} + + and b.delivery_note_date < #{request.deliveryEndDate} - order by a.create_time desc