From 76e82f635a6ea353b133b42ac353a342f671d08a Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Tue, 14 Apr 2026 20:52:03 +0800 Subject: [PATCH] =?UTF-8?q?wms=20=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=84=E7=A0=81=E5=95=86=E5=93=81=E5=AF=B9=E7=85=A7=E8=A1=A8?= =?UTF-8?q?-=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CopyCodeReferenceApplicationService.java | 20 +++++++++++++++++++ .../facade/ICopyCodeReferenceService.java | 4 ++++ .../mapper/CopyCodeReferenceMapper.java | 4 ++++ .../persistence/CopyCodeReferenceImpl.java | 14 ++++++++++++- .../repository/po/CopyCodeReferencePO.java | 4 ++++ .../repository/todo/CopyCodeReferenceDO.java | 13 ++++++++++++ .../CopyCodeReferenceDomainService.java | 6 ++++++ .../CopyCodeReferenceDTO.java | 7 +++++-- .../CopyCodeReferenceApi.java | 16 ++++++++++----- .../CopyCodeReferenceMapper.xml | 18 ++++++++++++++++- 10 files changed, 97 insertions(+), 9 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/CopyCodeReference/CopyCodeReferenceApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/CopyCodeReference/CopyCodeReferenceApplicationService.java index dd8a97e77..9d5f5fe1f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/CopyCodeReference/CopyCodeReferenceApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/CopyCodeReference/CopyCodeReferenceApplicationService.java @@ -1,12 +1,16 @@ package com.mhd.wms.application.service.CopyCodeReference; +import com.mhd.common.security.utils.SecurityUtils; +import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.copyCodeReference.repository.todo.CopyCodeReferenceDO; import com.mhd.wms.domain.copyCodeReference.service.CopyCodeReferenceDomainService; +import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; @Service @@ -16,8 +20,24 @@ public class CopyCodeReferenceApplicationService { public List queryList(CopyCodeReferenceDO copyCodeReferenceDO) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + if (loginUser != null){ + Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId(); + if (topOrganizationId != null && topOrganizationId != 1){ + copyCodeReferenceDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); + } + } List list = copyCodeReferenceDomainService.queryList(copyCodeReferenceDO); return list; } + + public List queryWeightList(CopyCodeReferenceDTO dto) { + List list = copyCodeReferenceDomainService.queryWeightList(dto); + for(int i = 0;i < list.size();i++) { + list.get(i).setSerialNumber(i+1); + } + return list; + + } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/facade/ICopyCodeReferenceService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/facade/ICopyCodeReferenceService.java index 01a4deede..28b8e5dee 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/facade/ICopyCodeReferenceService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/facade/ICopyCodeReferenceService.java @@ -3,11 +3,15 @@ package com.mhd.wms.domain.copyCodeReference.repository.facade; import com.baomidou.mybatisplus.extension.service.IService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.copyCodeReference.repository.todo.CopyCodeReferenceDO; +import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; +import java.math.BigDecimal; import java.util.List; public interface ICopyCodeReferenceService extends IService { List queryList(CopyCodeReferenceDO copyCodeReferenceDO); + + List queryWeightList(CopyCodeReferenceDTO dto); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/mapper/CopyCodeReferenceMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/mapper/CopyCodeReferenceMapper.java index 9969c31fc..3dfc6810a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/mapper/CopyCodeReferenceMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/mapper/CopyCodeReferenceMapper.java @@ -3,12 +3,16 @@ package com.mhd.wms.domain.copyCodeReference.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.copyCodeReference.repository.todo.CopyCodeReferenceDO; +import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; import org.apache.ibatis.annotations.Mapper; +import java.math.BigDecimal; import java.util.List; @Mapper public interface CopyCodeReferenceMapper extends BaseMapper { List queryList(CopyCodeReferenceDO copyCodeReferenceDO); + + List queryWeightList(CopyCodeReferenceDTO dto); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/persistence/CopyCodeReferenceImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/persistence/CopyCodeReferenceImpl.java index 332217553..1ece4b790 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/persistence/CopyCodeReferenceImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/persistence/CopyCodeReferenceImpl.java @@ -8,12 +8,17 @@ import com.mhd.wms.domain.copyCodeReference.repository.todo.CopyCodeReferenceDO; import com.mhd.wms.domain.inMaterialDetailSerialNumber.entity.InMaterialDetailSerialNumber; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.facade.IInMaterialDetailSerialNumberService; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.mapper.InMaterialDetailSerialNumberMapper; +import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.Collections; import java.util.List; + +@Slf4j @Service public class CopyCodeReferenceImpl extends ServiceImpl implements ICopyCodeReferenceService { @@ -23,8 +28,15 @@ public class CopyCodeReferenceImpl extends ServiceImpl queryList(CopyCodeReferenceDO copyCodeReferenceDO) { - List l = copyCodeReferenceMapper.queryList(copyCodeReferenceDO); + //List l = copyCodeReferenceMapper.queryList(copyCodeReferenceDO); // log.info() return copyCodeReferenceMapper.queryList(copyCodeReferenceDO); } + + @Override + public List queryWeightList(CopyCodeReferenceDTO dto) { + List a = copyCodeReferenceMapper.queryWeightList(dto); + log.info("{}",a); + return copyCodeReferenceMapper.queryWeightList(dto); + } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/po/CopyCodeReferencePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/po/CopyCodeReferencePO.java index e5c4efb11..e5e5a54b9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/po/CopyCodeReferencePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/po/CopyCodeReferencePO.java @@ -61,5 +61,9 @@ public class CopyCodeReferencePO extends BaseVOEntity { @Excel(name = "托盘号") private String boxPalletNo; + @ApiModelProperty("物料状态") + @Excel(name = "物料状态") + private String materialStatusName; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/todo/CopyCodeReferenceDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/todo/CopyCodeReferenceDO.java index d9f573450..46447e17e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/todo/CopyCodeReferenceDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/repository/todo/CopyCodeReferenceDO.java @@ -1,5 +1,6 @@ package com.mhd.wms.domain.copyCodeReference.repository.todo; +import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,4 +25,16 @@ public class CopyCodeReferenceDO extends BaseVOEntity { @ApiModelProperty("托盘号") private String containerCode; + @ApiModelProperty("组织表ID") + @Excel(name = "组织表ID") + private Long organizationId; + + @ApiModelProperty("组织名称") + @Excel(name = "组织名称") + private String organizationName; + + @ApiModelProperty("一级组织表ID") + @Excel(name = "一级组织表ID") + private Long topOrganizationId; + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/service/CopyCodeReferenceDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/service/CopyCodeReferenceDomainService.java index 380d868bb..29859ed83 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/service/CopyCodeReferenceDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/copyCodeReference/service/CopyCodeReferenceDomainService.java @@ -4,9 +4,11 @@ package com.mhd.wms.domain.copyCodeReference.service; import com.mhd.wms.domain.copyCodeReference.repository.facade.ICopyCodeReferenceService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; import com.mhd.wms.domain.copyCodeReference.repository.todo.CopyCodeReferenceDO; +import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.List; @Service @@ -18,4 +20,8 @@ public class CopyCodeReferenceDomainService { public List queryList(CopyCodeReferenceDO copyCodeReferenceDO) { return copyCodeReferenceService.queryList(copyCodeReferenceDO); } + + public List queryWeightList(CopyCodeReferenceDTO dto) { + return copyCodeReferenceService.queryWeightList(dto); + } } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java index 548c3fef0..ae59b649e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/copyCodeReference/CopyCodeReferenceDTO.java @@ -1,13 +1,14 @@ package com.mhd.wms.interfaces.dto.copyCodeReference; +import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "潮妈商品对照表请求DTO") +@ApiModel(value = "抄码商品对照表请求DTO") public class CopyCodeReferenceDTO extends BaseVOEntity { private static final long serialVersionUID = 1L; @@ -24,6 +25,8 @@ public class CopyCodeReferenceDTO extends BaseVOEntity { private String batchNumber; @ApiModelProperty("托盘号") - private String containerCode; + private String boxPalletNo; + + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/copyCodeReference/CopyCodeReferenceApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/copyCodeReference/CopyCodeReferenceApi.java index 655e470c2..1c6c18bd7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/copyCodeReference/CopyCodeReferenceApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/copyCodeReference/CopyCodeReferenceApi.java @@ -2,6 +2,7 @@ package com.mhd.wms.interfaces.facadeApi.copyCodeReference; import com.mhd.common.core.web.controller.BaseController; +import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.wms.application.service.CopyCodeReference.CopyCodeReferenceApplicationService; import com.mhd.wms.domain.copyCodeReference.repository.po.CopyCodeReferencePO; @@ -10,11 +11,10 @@ import com.mhd.wms.interfaces.assember.copyCodeReference.CopyCodeReferenceAssemb import com.mhd.wms.interfaces.dto.copyCodeReference.CopyCodeReferenceDTO; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.List; @RestController @@ -32,13 +32,19 @@ public class CopyCodeReferenceApi extends BaseController { */ @ApiOperation("查询抄码商品对照表列表") @GetMapping("/list") - public TableDataInfo list(CopyCodeReferenceDTO dto) { - CopyCodeReferenceDO copyCodeReferenceDO = copyCodeReferenceAssembler.toDO(dto); + public TableDataInfo list(CopyCodeReferenceDTO copyCodeReferenceDTO) { + CopyCodeReferenceDO copyCodeReferenceDO = copyCodeReferenceAssembler.toDO(copyCodeReferenceDTO); startPage(); List list = copyCodeReferenceApplicationService.queryList(copyCodeReferenceDO); return getDataTable(list); } + @ApiOperation("打印-查询重量列表") + @PostMapping("/queryWeightList") + public AjaxResult queryWeightList(@RequestBody CopyCodeReferenceDTO dto) { + List weightList = copyCodeReferenceApplicationService.queryWeightList(dto); + return AjaxResult.success(weightList); + } } diff --git a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml index 9fb41d209..d393ef24e 100644 --- a/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml +++ b/mhd_wms/src/main/resources/mapper/copyCodeReference/CopyCodeReferenceMapper.xml @@ -15,6 +15,7 @@ + @@ -31,7 +32,8 @@ mi.net_weight, mi.shipper_name, mi.lot_number, - mi.box_pallet_no + mi.box_pallet_no, + mi.material_status_name FROM material_inventory mi LEFT JOIN material_base_info mbi ON mi.material_base_info_id = mbi.material_base_info_id LEFT JOIN shelf_material_detail ssd ON mi.material_detail_id = ssd.material_detail_id @@ -53,6 +55,20 @@ AND mi.container_code = #{containerCode} + order by mi.create_time desc + + + \ No newline at end of file