From 244b8d7e6e5bc146768b9e2e9546b877c83bd491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Sat, 7 Feb 2026 17:22:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E7=9A=84BU?= =?UTF-8?q?G=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/MaterialBaseInfo.java | 35 +++++++++++++++---- .../repository/po/MaterialBaseInfoPO.java | 16 +++++++++ .../domain/pack/repository/po/PackPO.java | 4 +++ .../mapper/basic/pack/PackMapper.xml | 5 ++- .../service/CommonApplicationService.java | 8 +++++ .../src/main/resources/mapper/UserMapper.xml | 6 ++++ .../MaterialInventoryWarningImpl.java | 1 + .../MaterialBaseInfoMapper.xml | 1 + 8 files changed, 69 insertions(+), 7 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java index 32317c631..01955b43f 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java @@ -158,6 +158,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ @ApiModelProperty("单位数量") @Excel(name = "单位数量") + @TableField(exist = false) private BigDecimal unitNumber; @ApiModelProperty("是否公用: 1-是 2-否") @@ -190,36 +191,42 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("商品名称") @Excel(name = "商品名称") + @TableField(exist = false) private String commodityName; /** * 商品编码 */ @ApiModelProperty("商品编码") @Excel(name = "商品编码") + @TableField(exist = false) private String commodityNo; /** * 料号 */ @ApiModelProperty("料号") @Excel(name = "料号") + @TableField(exist = false) private String materialNo; /** * 规格型号 */ @ApiModelProperty("规格型号") @Excel(name = "规格型号") + @TableField(exist = false) private String specificationModel; /** * Invoice No */ @ApiModelProperty("Invoice No") @Excel(name = "Invoice No") + @TableField(exist = false) private String invoiceNo; /** * 升 */ @ApiModelProperty("升") @Excel(name = "升") + @TableField(exist = false) private String liter; /** @@ -227,6 +234,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("尺寸") @Excel(name = "尺寸") + @TableField(exist = false) private String size; /** @@ -234,20 +242,23 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("申报单位") @Excel(name = "申报单位") + @TableField(exist = false) private String declareUnit; /** - * Batch Ref NO’s + * Batch Ref NO's */ - @ApiModelProperty("Batch Ref NO’s") - @Excel(name = "Batch Ref NO’s") + @ApiModelProperty("Batch Ref NO's") + @Excel(name = "Batch Ref NO's") + @TableField(exist = false) private String batchRefNo; /** - * Sheet Ref NO’s + * Sheet Ref NO's */ - @ApiModelProperty("Sheet Ref NO’s") - @Excel(name = "Sheet Ref NO’s") + @ApiModelProperty("Sheet Ref NO's") + @Excel(name = "Sheet Ref NO's") + @TableField(exist = false) private String sheetRefNo; /** @@ -255,6 +266,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("原产国") @Excel(name = "原产国") + @TableField(exist = false) private String countryOfOrigin; /** @@ -262,6 +274,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("箱号/卡板号") @Excel(name = "箱号/卡板号") + @TableField(exist = false) private String casePalletNo; /** @@ -276,6 +289,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("申报数量") @Excel(name = "申报数量") + @TableField(exist = false) private Double declareQuantity; /** @@ -283,6 +297,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("箱数") @Excel(name = "箱数") + @TableField(exist = false) private Double caseCount; /** @@ -290,6 +305,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("件数") @Excel(name = "件数") + @TableField(exist = false) private Double pieceCount; /** @@ -297,6 +313,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("出库数量") @Excel(name = "出库数量") + @TableField(exist = false) private Double outboundQuantity; /** @@ -304,6 +321,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("总净重(KG)") @Excel(name = "总净重(KG)") + @TableField(exist = false) private Double totalNetWeight; /** @@ -311,6 +329,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("总毛重(KG)") @Excel(name = "总毛重(KG)") + @TableField(exist = false) private Double totalGrossWeight; /** @@ -318,6 +337,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("总体积(CBM)") @Excel(name = "总体积(CBM)") + @TableField(exist = false) private Double totalVolume; /** @@ -325,12 +345,14 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("总面积(SQM)") @Excel(name = "总面积(SQM)") + @TableField(exist = false) private Double totalArea; /** * 总价 */ @ApiModelProperty("总价") @Excel(name = "总价") + @TableField(exist = false) private Double totalAmount; /** @@ -338,6 +360,7 @@ public class MaterialBaseInfo extends BaseVOEntity{ */ @ApiModelProperty("单位") @Excel(name = "单位") + @TableField(exist = false) private String unit; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index 59f88b973..a93bec1f0 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -5,6 +5,7 @@ import com.mhd.basic.domain.batch.repository.po.BatchPO; import com.mhd.common.core.annotation.Excel; import com.mhd.common.core.handler.ListTypeHandler; import com.mhd.common.core.web.domain.BaseVOEntity; +import com.mhd.system.api.domain.*; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -360,4 +361,19 @@ public class MaterialBaseInfoPO extends BaseVOEntity{ @ApiModelProperty("法定第二单位") private String statutorySecondUnit; + @ApiModelProperty("商品规则") + private MaterialGoodsRuleFeign materialGoodsRule; + + @ApiModelProperty("公共信息") + private MaterialCommonFeign materialCommon; + + @ApiModelProperty("仓库控制信息") + private MaterialWarehouseControlFeign materialWarehouseControl; + + @ApiModelProperty("库存预警信息") + private List materialInventoryWarningList; + + @ApiModelProperty("条码信息") + private List materialBarCodeList; + } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/repository/po/PackPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/repository/po/PackPO.java index 066989566..049b1e7bf 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/repository/po/PackPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/pack/repository/po/PackPO.java @@ -68,6 +68,10 @@ public class PackPO extends BaseVOEntity{ @Excel(name = "是否作废: 1-否 2-是") private Integer nullify; + @ApiModelProperty("包装单位（取第一条包装详情的单位名称）") + @Excel(name = "包装单位") + private String unitName; + @ApiModelProperty("包装明细") private List packDetailList; diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/pack/PackMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/pack/PackMapper.xml index bc92e8e9f..08261b84a 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/pack/PackMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/pack/PackMapper.xml @@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -27,7 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select pack_id, organization_id, organization_name, top_organization_id, shipper_id, shipper_name, pack_code, pack_name, remark, opening_up, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from pack + select a.pack_id, a.organization_id, a.organization_name, a.top_organization_id, a.shipper_id, a.shipper_name, a.pack_code, a.pack_name, a.remark, a.opening_up, a.nullify, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, + (SELECT b.name FROM (SELECT name, pack_id FROM pack_detail WHERE pack_id = a.pack_id AND del_flag = 1 ORDER BY pack_detail_id) b WHERE ROWNUM = 1) as unit_name + from pack a diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/CommonApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/CommonApplicationService.java index 323f849e3..04c8c3236 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/CommonApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/CommonApplicationService.java @@ -157,6 +157,10 @@ public class CommonApplicationService { UserDO queryAccount = new UserDO(); queryAccount.setTopOrganizationId(topOrganizationId); queryAccount.setUserAccount(userDO.getUserAccount()); + // 如果指定了角色，只检查相同角色的用户 + if (StrUtil.isNotEmpty(userDO.getRoleCode())) { + queryAccount.setRoleCode(userDO.getRoleCode()); + } userPo = userDomainService.findByTopOrganizationIdAndUserAccount(queryAccount); } //根据手机号查询 @@ -165,6 +169,10 @@ public class CommonApplicationService { UserDO queryPhone = new UserDO(); queryPhone.setTopOrganizationId(topOrganizationId); queryPhone.setUserPhone(userDO.getUserPhone()); + // 如果指定了角色，只检查相同角色的用户 + if (StrUtil.isNotEmpty(userDO.getRoleCode())) { + queryPhone.setRoleCode(userDO.getRoleCode()); + } userPoTwo = userDomainService.findByTopOrganizationIdAndUserPhone(queryPhone); } //根据身份证号查询 diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index ad56a81f1..b9e38a167 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -140,6 +140,9 @@ and a.top_organization_id = #{topOrganizationId} and a.user_account = #{userAccount} + + and a.role_code = #{roleCode} + and a.user_id != #{userId} @@ -183,6 +186,9 @@ and a.user_phone = #{userPhone} and a.top_organization_id = #{topOrganizationId} + + and a.role_code = #{roleCode} + and a.user_id != #{userId} diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventoryWarning/repository/persistence/MaterialInventoryWarningImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventoryWarning/repository/persistence/MaterialInventoryWarningImpl.java index 09d3cdd7d..5cecad1f1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventoryWarning/repository/persistence/MaterialInventoryWarningImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventoryWarning/repository/persistence/MaterialInventoryWarningImpl.java @@ -92,6 +92,7 @@ public class MaterialInventoryWarningImpl extends ServiceImpl + order by create_time desc