From 308f79b804031831cda726d406ae4e4613ca6c59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Mon, 9 Feb 2026 16:53:46 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E4=BB=BB=E5=8A=A1BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/MaterialBarCodeFeign.java | 5 + .../Lease/LeaseApplicationService.java | 107 +++++++++++++----- .../mapper/basic/lease/LeaseMapper.xml | 3 + .../service/UserApplicationService.java | 10 +- .../service/UserWlhyDomainService.java | 4 + .../mhd/user/interfaces/facade/UserAPI.java | 4 + .../repository/po/MaterialBarCodePO.java | 6 + .../repository/todo/MaterialBarCodeDO.java | 5 + .../MaterialBaseInfoDomainService.java | 73 +++++++++++- .../materialBarCode/MaterialBarCodeDTO.java | 5 + 10 files changed, 188 insertions(+), 34 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBarCodeFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBarCodeFeign.java index b890b6a14..a322ec639 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBarCodeFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBarCodeFeign.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.math.BigDecimal; import java.util.List; /** @@ -66,6 +67,10 @@ public class MaterialBarCodeFeign extends BaseVOEntity{ @Excel(name = "名称") private String name; + @ApiModelProperty("数量") + @Excel(name = "数量") + private BigDecimal number; + @ApiModelProperty("备注") @Excel(name = "备注") private String remark; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java index c91db2035..f64ace339 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/Lease/LeaseApplicationService.java @@ -1,5 +1,6 @@ package com.mhd.basic.application.service.Lease; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -188,56 +189,98 @@ public class LeaseApplicationService { /** * 货主租赁明细 + * 定时任务：每天凌晨1点执行，计算前一天的货主租赁明细 */ @Scheduled(cron = "0 0 1 * * ?") public void shipperLeaseDetails() { + log.info("开始执行货主租赁明细定时任务"); + // 计算前一天的日期，将时间设置为当天的0点0分0秒，只保留日期部分 + final Date yesterday = DateUtil.beginOfDay(DateUtil.offsetDay(new Date(), -1)); + LeaseDO leaseDO = new LeaseDO(); - leaseDO.setTime(new Date()); - //查询租赁 + leaseDO.setTime(yesterday); + //查询有效期内的租赁 List leasePOS = queryList(leaseDO); -// List leasePOS = leaseDomainService.queryList(leaseDO); List entireUnit = leasePOS.stream() .filter(lease -> lease.getLeaseType().equals("整租")) .collect(Collectors.toList()); List casualRental = leasePOS.stream() .filter(lease -> lease.getLeaseType().equals("散租")) .collect(Collectors.toList()); - List shipperLeaseDetailsList = new ArrayList<>(); //建表后保存 - for (LeasePO en : entireUnit) {//整租 + + List shipperLeaseDetailsList = new ArrayList<>(); //需要保存或更新的数据 + List shipperLeaseDetailsToUpdate = new ArrayList<>(); //需要更新的数据 + + // 查询已存在的货主租赁明细数据（用于判断是新增还是更新） + ShipperLeaseDetailsDO queryDO = new ShipperLeaseDetailsDO(); + queryDO.setBusinessDate(yesterday); + List existingList = shipperLeaseDetailsService.queryList(queryDO); + // 构建已存在数据的Map，key为：业务日期+货主ID+仓库ID+租赁类型 + Map existingMap = existingList.stream() + .collect(Collectors.toMap( + item -> buildKey(yesterday, item.getShipperId(), item.getWarehouseId(), item.getLeaseType()), + item -> item, + (existing, replacement) -> existing // 如果有重复key，保留第一个 + )); + + // 处理整租 + for (LeasePO en : entireUnit) { + String key = buildKey(yesterday, en.getShipperId(), en.getWarehouseId(), en.getLeaseType()); ShipperLeaseDetails shipperLeaseDetails = new ShipperLeaseDetails(); BeanUtils.copyProperties(en, shipperLeaseDetails); - shipperLeaseDetails.setBusinessDate(new Date()); - shipperLeaseDetailsList.add(shipperLeaseDetails); + shipperLeaseDetails.setBusinessDate(yesterday); + + // 如果已存在，则更新；否则新增 + if (existingMap.containsKey(key)) { + ShipperLeaseDetailsPO existing = existingMap.get(key); + shipperLeaseDetails.setId(existing.getId()); + shipperLeaseDetailsToUpdate.add(shipperLeaseDetails); + } else { + shipperLeaseDetailsList.add(shipperLeaseDetails); + } } - //当前货主当前仓库，库存查询页面所有面积加起来就是散租面积 - for (LeasePO ca : casualRental) {//散租 + + // 处理散租：从租赁管理页面维护的面积，效期内的散租客户面积之和 + for (LeasePO ca : casualRental) { + String key = buildKey(yesterday, ca.getShipperId(), ca.getWarehouseId(), ca.getLeaseType()); ShipperLeaseDetails shipperLeaseDetails = new ShipperLeaseDetails(); BeanUtils.copyProperties(ca, shipperLeaseDetails); - shipperLeaseDetails.setBusinessDate(new Date()); - //物料库存 - MaterialInventoryDTO materialInventoryDTO = new MaterialInventoryDTO(); - materialInventoryDTO.setShipperId(ca.getShipperId()); - materialInventoryDTO.setWarehouseId(ca.getWarehouseId()); - AjaxResult ajaxResult = wmsServiceFeign.materialInventoryApiListAll(materialInventoryDTO); - BigDecimal area = BigDecimal.ZERO; - if(String.valueOf(ajaxResult.get("code")).equals("200")) { - JSONArray data = JSONObject.parseArray(JSON.toJSONString(ajaxResult.get("data"))); - for (Object datum : data) { - JSONObject json = (JSONObject) datum; - BigDecimal area1 = json.getBigDecimal("area"); - if (area1 == null) { - area1 = BigDecimal.ZERO; - } - area = area.add(area1); - } + shipperLeaseDetails.setBusinessDate(yesterday); + // 散租面积直接使用租赁管理页面维护的面积 + shipperLeaseDetails.setLeaseArea(ca.getLeaseArea()); + log.info("货主：{}，仓库：{}，散租面积：{}（来自租赁管理）", ca.getCargoOwnerName(), ca.getWarehouseName(), ca.getLeaseArea()); + + // 如果已存在，则更新；否则新增 + if (existingMap.containsKey(key)) { + ShipperLeaseDetailsPO existing = existingMap.get(key); + shipperLeaseDetails.setId(existing.getId()); + shipperLeaseDetailsToUpdate.add(shipperLeaseDetails); + } else { + shipperLeaseDetailsList.add(shipperLeaseDetails); } - shipperLeaseDetails.setLeaseArea(area); - shipperLeaseDetailsList.add(shipperLeaseDetails); } - // 保存货主租赁明细(新建表) + + // 批量新增货主租赁明细 if (shipperLeaseDetailsList.size() > 0) { shipperLeaseDetailsService.saveBatch(shipperLeaseDetailsList); + log.info("新增货主租赁明细{}条", shipperLeaseDetailsList.size()); } + + // 批量更新货主租赁明细 + if (shipperLeaseDetailsToUpdate.size() > 0) { + shipperLeaseDetailsService.updateBatchById(shipperLeaseDetailsToUpdate); + log.info("更新货主租赁明细{}条", shipperLeaseDetailsToUpdate.size()); + } + + log.info("货主租赁明细定时任务执行完成，业务日期：{}", DateUtil.formatDate(yesterday)); + } + + /** + * 构建唯一key：业务日期+货主ID+仓库ID+租赁类型 + */ + private String buildKey(Date businessDate, Long shipperId, Long warehouseId, String leaseType) { + String dateStr = DateUtil.formatDate(businessDate); + return dateStr + "_" + shipperId + "_" + warehouseId + "_" + leaseType; } /** @@ -247,9 +290,11 @@ public class LeaseApplicationService { * businessDateEnd 业务结束时间 */ public List warehouseOccupancyRate(ShipperLeaseDetailsDO shipperLeaseDetailsDO) { - //仓库id 和 开始结束时间作为查询条件 查数据库 差出来当前仓库所有的 + //仓库id 和 开始结束时间作为查询条件 查数据库 查出来当前仓库所有的 List shipperLeaseDetailsList = shipperLeaseDetailsService.queryList(shipperLeaseDetailsDO); - ShipperLeaseDetailsPO shipperLeaseDetailsPO = shipperLeaseDetailsList.get(0); + if (shipperLeaseDetailsList == null || shipperLeaseDetailsList.isEmpty()) { + return new ArrayList<>(); + } //按业务日期分组，并按日期排序 TreeMap> groupedByDate = shipperLeaseDetailsList.stream().collect( Collectors.groupingBy( diff --git a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml index e50d747e7..ebef601df 100644 --- a/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml +++ b/mhd-modules/mhd-system/src/main/resources/mapper/basic/lease/LeaseMapper.xml @@ -10,6 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java index 894fc935e..4008e8d23 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java @@ -2022,6 +2022,10 @@ public class UserApplicationService { */ @Transactional(rollbackFor = Exception.class) public int deleteByIds(List ids) { + // 检查ids是否为空 + if (ids == null || ids.isEmpty()) { + throw new ServiceException("删除的用户ID列表不能为空"); + } //获取登录人信息 LoginUser loginUser = SecurityUtils.getLoginUser(); if (ObjectUtil.isNull(loginUser)) { @@ -2042,8 +2046,10 @@ public class UserApplicationService { userDomainService.updateUser(userDO); } } - //同步删除网货的员工信息 - wlhyDomainService.deleteBatchPlatformUser(ids); + //同步删除网货的员工信息（只有当ids不为空时才调用） + if (!ids.isEmpty()) { + wlhyDomainService.deleteBatchPlatformUser(ids); + } return ids.size(); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserWlhyDomainService.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserWlhyDomainService.java index c1a03cc06..dff71b160 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserWlhyDomainService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserWlhyDomainService.java @@ -609,6 +609,10 @@ public class UserWlhyDomainService { * @return boolean */ public boolean deleteBatchPlatformUser(List szwlUserIds){ + // 检查ids是否为空 + if (szwlUserIds == null || szwlUserIds.isEmpty()) { + return true; // 如果列表为空，直接返回成功，避免SQL语法错误 + } //检查是否开启网货 boolean flag = checkSwitch(); if(!flag){ diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java index 897f5f6b0..277b1d5c0 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java +++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java @@ -366,6 +366,10 @@ public class UserAPI extends BaseController { @Log(title = "用户中台管理-删除", description ="批量删除用户",businessType = BusinessType.DELETE) @DeleteMapping("/removeByIds/{ids}") public AjaxResult removeByIds(@PathVariable List ids) { + // 检查ids是否为空 + if (ids == null || ids.isEmpty()) { + return error("删除的用户ID列表不能为空"); + } return toAjax(userApplicationService.deleteByIds(ids)); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/po/MaterialBarCodePO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/po/MaterialBarCodePO.java index 9882cc45f..988924de7 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/po/MaterialBarCodePO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/po/MaterialBarCodePO.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * 物料条码信息对象 material_bar_code @@ -66,6 +68,10 @@ public class MaterialBarCodePO extends BaseVOEntity { @Excel(name = "名称") private String name; + @ApiModelProperty("数量") + @Excel(name = "数量") + private BigDecimal number; + @ApiModelProperty("备注") @Excel(name = "备注") private String remark; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/todo/MaterialBarCodeDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/todo/MaterialBarCodeDO.java index 8a28146b1..7dd79635b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/todo/MaterialBarCodeDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBarCode/repository/todo/MaterialBarCodeDO.java @@ -5,6 +5,7 @@ import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; @@ -66,6 +67,10 @@ public class MaterialBarCodeDO extends BaseVOEntity { @Excel(name = "名称") private String name; + @ApiModelProperty("数量") + @Excel(name = "数量") + private BigDecimal number; + @ApiModelProperty("备注") @Excel(name = "备注") private String remark; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/service/MaterialBaseInfoDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/service/MaterialBaseInfoDomainService.java index 5a6cd9478..7fb4eda46 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/service/MaterialBaseInfoDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/service/MaterialBaseInfoDomainService.java @@ -116,9 +116,80 @@ public class MaterialBaseInfoDomainService { //获取库存预警 List materialInventoryWarningPOList = materialInventoryWarningService.getInfoByMaterialBaseInfoIds(materialBaseInfoId); materialBaseInfoPO.setMaterialInventoryWarningList(materialInventoryWarningPOList); - //获取条码信息 + + // 条码信息： + // 1）优先读取已维护的物料条码表 material_bar_code； + // 2）如果没有维护条码，则根据当前物料绑定的包装规格（packId）， + // 按包装明细的单位（EA/IP/CS/PL/OT 等）生成一份默认的条码信息列表， + // 其中条码字段留空，前端可编辑。 List materialBarCodePOList = materialBarCodeService.getInfoByMaterialBaseInfoIds(materialBaseInfoId); + if ((materialBarCodePOList == null || materialBarCodePOList.isEmpty()) && materialBaseInfoPO.getPackId() != null) { + try { + materialBarCodePOList = new ArrayList<>(); + // 常见单位代码；只生成在包装规格中实际存在的单位 + String[] unitCodes = {"EA", "IP", "CS", "PL", "OT"}; + for (String unitCode : unitCodes) { + AjaxResult packDetailResult = systemServiceFeign.getInfoByPackIdAndUnitCode(materialBaseInfoPO.getPackId(), unitCode); + if (!"200".equals(String.valueOf(packDetailResult.get("code"))) + || packDetailResult.get("data") == null) { + continue; + } + PackDetailFeignPO packDetailFeignPO = JSON.parseObject( + JSONObject.toJSONString(packDetailResult.get("data")), + PackDetailFeignPO.class); + // 如果包装明细没有维护名称或数量，则不生成对应的条码行 + if (packDetailFeignPO == null + || packDetailFeignPO.getName() == null + || packDetailFeignPO.getNumber() == null) { + continue; + } + MaterialBarCodePO barCodePO = new MaterialBarCodePO(); + // 物料、组织信息 + barCodePO.setMaterialBaseInfoId(materialBaseInfoId); + barCodePO.setPackId(materialBaseInfoPO.getPackId()); + barCodePO.setPackCode(materialBaseInfoPO.getPackCode()); + barCodePO.setPackName(materialBaseInfoPO.getPackName()); + // 绑定包装明细（单位代码、名称、数量来自包装规格明细） + barCodePO.setPackDetailId(packDetailFeignPO.getPackDetailId()); + barCodePO.setUnitCode(packDetailFeignPO.getUnitCode()); + barCodePO.setName(packDetailFeignPO.getName()); + barCodePO.setNumber(packDetailFeignPO.getNumber()); + // 条码本身留空，前端允许编辑 + barCodePO.setBarCode(null); + materialBarCodePOList.add(barCodePO); + } + } catch (Exception e) { + log.warn("根据包装规格生成条码信息失败，物料ID：{}，包装ID：{}，错误：{}", + materialBaseInfoId, materialBaseInfoPO.getPackId(), e.getMessage()); + } + } materialBaseInfoPO.setMaterialBarCodeList(materialBarCodePOList); + + // 从包装规格获取默认显示的包装单位（取第一条包装详情的单位名称），前端只读展示 + if (materialBaseInfoPO.getPackId() != null) { + try { + String[] unitCodes = {"EA", "IP", "CS", "PL", "OT"}; + for (String unitCode : unitCodes) { + AjaxResult packDetailResult = systemServiceFeign.getInfoByPackIdAndUnitCode(materialBaseInfoPO.getPackId(), unitCode); + if (!"200".equals(String.valueOf(packDetailResult.get("code"))) + || packDetailResult.get("data") == null) { + continue; + } + PackDetailFeignPO packDetailFeignPO = JSON.parseObject( + JSONObject.toJSONString(packDetailResult.get("data")), + PackDetailFeignPO.class); + if (packDetailFeignPO != null && packDetailFeignPO.getName() != null) { + materialBaseInfoPO.setUnitName(packDetailFeignPO.getName()); + materialBaseInfoPO.setUnitCode(packDetailFeignPO.getUnitCode()); + break; + } + } + } catch (Exception e) { + log.warn("获取包装规格单位名称失败，物料ID：{}，包装ID：{}，错误：{}", + materialBaseInfoId, materialBaseInfoPO.getPackId(), e.getMessage()); + } + } + return materialBaseInfoPO; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBarCode/MaterialBarCodeDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBarCode/MaterialBarCodeDTO.java index 7cfae5256..6593c4fc5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBarCode/MaterialBarCodeDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBarCode/MaterialBarCodeDTO.java @@ -5,6 +5,7 @@ import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -65,6 +66,10 @@ public class MaterialBarCodeDTO extends BaseVOEntity { @Excel(name = "名称") private String name; + @ApiModelProperty("数量") + @Excel(name = "数量") + private BigDecimal number; + @ApiModelProperty("备注") @Excel(name = "备注") private String remark; From 1e8a82388773898dd55f1856959880890db6fe3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Mon, 9 Feb 2026 17:31:41 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E4=BA=86=E5=85=B6=E4=BB=96=E8=B4=A7?= =?UTF-8?q?=E4=B8=BB=E7=9A=84=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialInventory/MaterialInventoryApi.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java index 5ed1a840f..a306612b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java @@ -1,5 +1,6 @@ package com.mhd.wms.interfaces.facadeApi.materialInventory; +import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.web.controller.BaseController; import com.mhd.common.core.web.domain.AjaxResult; import com.mhd.common.core.web.page.TableDataInfo; @@ -38,8 +39,14 @@ public class MaterialInventoryApi extends BaseController { */ @ApiOperation("查询物料库存列表") @GetMapping("/list") - public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO) + public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO, + @RequestParam(value = "customerName", required = false) String customerName) { + // 出库分配前端传的是客户名称 customerName，这里转成货主筛选条件（模糊匹配货主编码 / 名称） + if (StringUtils.isNotBlank(customerName) && StringUtils.isBlank(materialInventoryDTO.getShipperInfo())) { + materialInventoryDTO.setShipperInfo(customerName); + } + //转换实体 MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO); startPage(); From 51e5b871e79cadada6bd4290a8dd73f5986afe07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 9 Feb 2026 18:00:15 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=A0=E8=AE=BA=E6=8B=A3=E8=B4=A7=E5=A4=9A=E5=B0=91=E9=83=BD?= =?UTF-8?q?=E4=B8=BA=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/pickingOrder/service/PickingOrderDomainService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java index 440d60afe..aaf2e9fb0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java @@ -372,7 +372,7 @@ public class PickingOrderDomainService { .eq(PickingOrder::getOrderNumber, pickingOrderPODb.getOrderNumber())); BigDecimal pickingQuantity = pickingOrderList.stream().map(PickingOrder::getPickingQuantity).reduce(BigDecimal.ZERO, BigDecimal::add); if (1 == pickingOrderPODb.getType()){ - int status = 6; + int status = 7; //不需要复核的单子 标记出库单完成 StockOutOrder stockOutOrderDb = stockOutOrderService.getOne(new QueryWrapper().lambda() .eq(StockOutOrder::getOutOrderNumber, pickingOrderPODb.getOrderNumber())); From ee4cd312abe20f3d9d46dbe9d72c8c30bce412eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 9 Feb 2026 18:11:44 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=97=A0=E8=AE=BA=E6=8B=A3=E8=B4=A7=E5=A4=9A=E5=B0=91=E9=83=BD?= =?UTF-8?q?=E4=B8=BA=E6=8B=A3=E8=B4=A7=E5=AE=8C=E6=88=90;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HandoverTaskOrderDomainService.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index 08eaf146a..c7ef7ca8e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -206,10 +206,18 @@ public class HandoverTaskOrderDomainService { BigDecimal newFreezeQuantity = oldFreezeQuantity.subtract(checkQuantity); + BigDecimal oldArea = materialInventoryPO.getArea(); BigDecimal oldVolume = materialInventoryPO.getVolume(); BigDecimal oldGrossWeight = materialInventoryPO.getGrossWeight(); BigDecimal oldNetWeight = materialInventoryPO.getNetWeight(); + + // 初始化旧数据，避免空指针 + oldArea = oldArea != null ? oldArea : BigDecimal.ZERO; + oldVolume = oldVolume != null ? oldVolume : BigDecimal.ZERO; + oldGrossWeight = oldGrossWeight != null ? oldGrossWeight : BigDecimal.ZERO; + oldNetWeight = oldNetWeight != null ? oldNetWeight : BigDecimal.ZERO; + BigDecimal newArea = oldArea.subtract(checkArea); BigDecimal newVolume = oldVolume.subtract(checkVolume); BigDecimal newGrossWeight = oldGrossWeight.subtract(checkGrossWeight); From 8c21c6bfa846ba688e30f49be6aa653db60c83f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 9 Feb 2026 18:14:29 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HandoverTaskOrderDomainService.java | 3 +++ .../service/StockShelfOrderDomainService.java | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java index c7ef7ca8e..065580e24 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java @@ -196,10 +196,13 @@ public class HandoverTaskOrderDomainService { MaterialInventory materialInventoryPO = materialInventoryMapper.selectById(materialInventoryId); if (materialInventoryPO != null) { //更新库存数量 + //库存数量 BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity(); + oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO; //冻结数量 BigDecimal oldFreezeQuantity = materialInventoryPO.getFreezeQuantity(); + oldFreezeQuantity = oldFreezeQuantity != null ? oldFreezeQuantity : BigDecimal.ZERO; //分配后库存数量 BigDecimal newInventoryQuantity = oldInventoryQuantity.subtract(checkQuantity); //分配后冻结数量 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index 16d33a87b..c641472fb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -541,10 +541,14 @@ public class StockShelfOrderDomainService { BigDecimal shelvesQuantity = shelfMaterialDetail.getShelvesQuantity(); shelvesQuantity = shelvesQuantity != null ? shelvesQuantity : BigDecimal.ZERO; MaterialInventoryPO materialInventoryPO = materialInventoryPOS.get(0); - BigDecimal newInventoryQuantity = materialInventoryPO.getInventoryQuantity().add(shelvesQuantity); + BigDecimal oldInventoryQuantity = materialInventoryPO.getInventoryQuantity(); - BigDecimal newAllocationQuantity = materialInventoryPO.getAllocationQuantity().add(shelvesQuantity); + oldInventoryQuantity = oldInventoryQuantity != null ? oldInventoryQuantity : BigDecimal.ZERO; + BigDecimal newInventoryQuantity = oldInventoryQuantity.add(shelvesQuantity); + BigDecimal oldAllocationQuantity = materialInventoryPO.getAllocationQuantity(); + oldAllocationQuantity = oldAllocationQuantity != null ? oldAllocationQuantity : BigDecimal.ZERO; + BigDecimal newAllocationQuantity = oldAllocationQuantity.add(shelvesQuantity); BigDecimal oldArea = materialInventoryPO.getArea(); oldArea = oldArea != null ? oldArea : BigDecimal.ZERO; From f260b73b80e9170f148e639fd1d4686ead1e2f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 10:12:13 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=97=B6=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=9B=E5=BC=82=E5=B8=B8=20=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E6=B2=A1=E6=9C=89=E7=89=A9=E6=96=99=E6=8A=9B=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StorageLocationDomainService.java | 2 +- .../StockInOrderApplicationService.java | 145 ++++-------------- .../MaterialInventoryApi.java | 67 +++++++- 3 files changed, 97 insertions(+), 117 deletions(-) diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/service/StorageLocationDomainService.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/service/StorageLocationDomainService.java index a3c032520..fd7c37052 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/service/StorageLocationDomainService.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/storageLocation/service/StorageLocationDomainService.java @@ -308,7 +308,7 @@ public class StorageLocationDomainService { updateWrapper.in("storage_location_group_id", storageLocationGroupIds); updateWrapper.set("update_by", loginUser.getUserid()); updateWrapper.set("update_by_name", loginUser.getUsername()); - updateWrapper.set("update_by", new Date()); + updateWrapper.set("update_time", new Date()); updateWrapper.setSql("storage_location_count = storage_location_count - 1"); storageLocationGroupService.update(updateWrapper); } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index ad72c6048..e3ab3b68d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -1202,124 +1202,45 @@ public class StockInOrderApplicationService { } } - // 根据明细表中的字段查询物料基础信息（优先：料号 > 商品SKU码 > 商品名称） - // 注意：查询时必须加上货主ID条件，确保查询到的是该货主绑定的物料 + // 导入文件中必须填写料号，根据料号获取商品信息，必须是货主下有的才可以匹配 + // 如果没有填写，提示用户：请在导入文件中填写正确的料号 + if (StringUtils.isBlank(r.getMaterialCode())) { + String errorMsg = String.format("导入失败：请在导入文件中填写正确的料号", + r.getMaterialName()); + log.error(errorMsg); + throw new ServiceException(errorMsg); + } + + // 根据料号查询物料基础信息，必须是货主下有的才可以匹配 Long materialBaseInfoId = null; LoginUser currentLoginUser = SecurityUtils.getLoginUser(); Long topOrganizationId = currentLoginUser != null && currentLoginUser.getUserPo() != null ? currentLoginUser.getUserPo().getTopOrganizationId() : null; - // 优先使用料号查询 - if (StringUtils.isNotBlank(r.getMaterialCode())) { - MaterialBaseInfoDO queryDO = new MaterialBaseInfoDO(); - queryDO.setMaterialCode(r.getMaterialCode()); - if (topOrganizationId != null) { - queryDO.setTopOrganizationId(topOrganizationId); - } - // 加上货主ID条件，确保查询到的是该货主绑定的物料 - if (shipperId != null) { - queryDO.setShipperId(shipperId); - } - log.info("尝试通过料号查询物料基础信息，料号: [{}], topOrganizationId: {}, shipperId: {}", - r.getMaterialCode(), topOrganizationId, shipperId); - List materialList = materialBaseInfoService.queryList(queryDO); - log.info("料号查询结果，查询到 {} 条记录", materialList != null ? materialList.size() : 0); - if (materialList != null && !materialList.isEmpty()) { - materialBaseInfoId = materialList.get(0).getMaterialBaseInfoId(); - log.info("通过料号查询到物料基础信息，料号: {}, 物料ID: {}, 货主ID: {}", - r.getMaterialCode(), materialBaseInfoId, shipperId); - } else { - // 如果提供了料号但查询不到，直接报错，不允许导入 - String errorMsg = String.format("导入失败：该货主下不存在该料号（委托编号NO=%s，货主名称=%s，料号=%s）。请确保该料号已在物料管理中创建，且属于该货主", - h.getConsignmentNo(), order.getShipperName(), r.getMaterialCode()); - log.error(errorMsg); - throw new ServiceException(errorMsg); - } + // 使用料号查询，必须加上货主ID条件，确保查询到的是该货主绑定的物料 + MaterialBaseInfoDO queryDO = new MaterialBaseInfoDO(); + queryDO.setMaterialCode(r.getMaterialCode()); + if (topOrganizationId != null) { + queryDO.setTopOrganizationId(topOrganizationId); + } + // 加上货主ID条件，确保查询到的是该货主绑定的物料 + if (shipperId != null) { + queryDO.setShipperId(shipperId); + } + log.info("尝试通过料号查询物料基础信息，料号: [{}], topOrganizationId: {}, shipperId: {}", + r.getMaterialCode(), topOrganizationId, shipperId); + List materialList = materialBaseInfoService.queryList(queryDO); + log.info("料号查询结果，查询到 {} 条记录", materialList != null ? materialList.size() : 0); + if (materialList != null && !materialList.isEmpty()) { + materialBaseInfoId = materialList.get(0).getMaterialBaseInfoId(); + log.info("通过料号查询到物料基础信息，料号: {}, 物料ID: {}, 货主ID: {}", + r.getMaterialCode(), materialBaseInfoId, shipperId); } else { - log.warn("料号为空，跳过料号查询，将尝试使用SKU码或商品名称查询"); - } - - // 只有在料号为空的情况下，才使用商品SKU码查询 - if (materialBaseInfoId == null && StringUtils.isNotBlank(r.getSkuCode())) { - MaterialBaseInfoDO queryDO = new MaterialBaseInfoDO(); - queryDO.setBarCode(r.getSkuCode()); - if (topOrganizationId != null) { - queryDO.setTopOrganizationId(topOrganizationId); - } - // 加上货主ID条件，确保查询到的是该货主绑定的物料 - if (shipperId != null) { - queryDO.setShipperId(shipperId); - } - log.info("尝试通过商品SKU码查询物料基础信息，SKU码: [{}], topOrganizationId: {}, shipperId: {}", - r.getSkuCode(), topOrganizationId, shipperId); - List materialList = materialBaseInfoService.queryList(queryDO); - log.info("SKU码查询结果，查询到 {} 条记录", materialList != null ? materialList.size() : 0); - if (materialList != null && !materialList.isEmpty()) { - materialBaseInfoId = materialList.get(0).getMaterialBaseInfoId(); - log.info("通过商品SKU码查询到物料基础信息，SKU码: {}, 物料ID: {}, 货主ID: {}", - r.getSkuCode(), materialBaseInfoId, shipperId); - } else { - log.warn("通过SKU码未查询到物料基础信息，SKU码: [{}], 货主ID: [{}]", r.getSkuCode(), shipperId); - } - } else if (materialBaseInfoId == null) { - log.warn("SKU码为空，跳过SKU码查询"); - } - - // 如果料号和SKU码都查询不到，使用商品名称查询 - if (materialBaseInfoId == null && StringUtils.isNotBlank(r.getMaterialName())) { - MaterialBaseInfoDO queryDO = new MaterialBaseInfoDO(); - queryDO.setMaterialName(r.getMaterialName()); - if (topOrganizationId != null) { - queryDO.setTopOrganizationId(topOrganizationId); - } - // 加上货主ID条件，确保查询到的是该货主绑定的物料 - if (shipperId != null) { - queryDO.setShipperId(shipperId); - } - log.info("尝试通过商品名称查询物料基础信息，商品名称: [{}], topOrganizationId: {}, shipperId: {}", - r.getMaterialName(), topOrganizationId, shipperId); - List materialList = materialBaseInfoService.queryList(queryDO); - log.info("商品名称查询结果，查询到 {} 条记录", materialList != null ? materialList.size() : 0); - if (materialList != null && !materialList.isEmpty()) { - materialBaseInfoId = materialList.get(0).getMaterialBaseInfoId(); - log.info("通过商品名称查询到物料基础信息，商品名称: {}, 物料ID: {}, 货主ID: {}", - r.getMaterialName(), materialBaseInfoId, shipperId); - } else { - log.warn("通过商品名称未查询到物料基础信息，商品名称: [{}], 货主ID: [{}]", r.getMaterialName(), shipperId); - } - } else if (materialBaseInfoId == null) { - log.warn("商品名称为空，跳过商品名称查询"); - } - - // 如果都查询不到物料基础信息，阻止导入并抛出异常 - if (materialBaseInfoId == null) { - // 检查是否至少有一个查询条件 - boolean hasQueryCondition = StringUtils.isNotBlank(r.getMaterialCode()) - || StringUtils.isNotBlank(r.getSkuCode()) - || StringUtils.isNotBlank(r.getMaterialName()); - - // 构建错误信息，说明物料在物料管理中不存在 - StringBuilder errorMsg = new StringBuilder(); - errorMsg.append("导入失败：物料在物料管理中不存在（委托编号NO=").append(h.getConsignmentNo()); - errorMsg.append("，货主名称=").append(order.getShipperName()); - if (StringUtils.isNotBlank(r.getMaterialCode())) { - errorMsg.append("，料号=").append(r.getMaterialCode()); - } - if (StringUtils.isNotBlank(r.getSkuCode())) { - errorMsg.append("，SKU码=").append(r.getSkuCode()); - } - if (StringUtils.isNotBlank(r.getMaterialName())) { - errorMsg.append("，商品名称=").append(r.getMaterialName()); - } - errorMsg.append("）"); - - if (!hasQueryCondition) { - errorMsg.append("。明细行缺少物料标识信息（料号、SKU码或商品名称至少需要填写一个）"); - } else { - errorMsg.append("。请确保该物料已在物料管理中创建，且料号、SKU码或商品名称与货主信息匹配"); - } - log.error(errorMsg.toString()); - throw new ServiceException(errorMsg.toString()); + // 如果提供了料号但查询不到（或不属于该货主），直接报错，不允许导入 + String errorMsg = String.format("导入失败：该货主下不存在该料号（货主名称=%s，料号=%s）。请确保该料号已在物料管理中创建，且属于该货主", + order.getShipperName(), r.getMaterialCode()); + log.error(errorMsg); + throw new ServiceException(errorMsg); } // 数量已在前面检查过，这里直接使用 diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java index a306612b0..3dd66441b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java @@ -1,9 +1,14 @@ package com.mhd.wms.interfaces.facadeApi.materialInventory; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson2.JSONObject; +import com.mhd.common.core.domain.po.UserPo; +import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.utils.StringUtils; 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.system.api.UserServiceFeign; import com.mhd.wms.application.service.materialInventory.MaterialInventoryApplicationService; import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO; import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO; @@ -13,6 +18,7 @@ import com.mhd.wms.interfaces.assember.materialInventory.MaterialInventoryAssemb import com.mhd.wms.interfaces.dto.materialInventory.MaterialInventoryDTO; import com.mhd.wms.interfaces.dto.materialInventory.MaterialInventoryQueryListDTO; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -27,6 +33,7 @@ import java.util.List; */ @RestController @RequestMapping("/materialInventoryApi") +@Slf4j public class MaterialInventoryApi extends BaseController { @Autowired private MaterialInventoryApplicationService materialInventoryApplicationService; @@ -34,6 +41,9 @@ public class MaterialInventoryApi extends BaseController { @Resource private MaterialInventoryAssembler materialInventoryAssembler; + @Autowired + private UserServiceFeign userServiceFeign; + /** * 分页查询物料库存列表 */ @@ -42,9 +52,26 @@ public class MaterialInventoryApi extends BaseController { public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO, @RequestParam(value = "customerName", required = false) String customerName) { - // 出库分配前端传的是客户名称 customerName，这里转成货主筛选条件（模糊匹配货主编码 / 名称） - if (StringUtils.isNotBlank(customerName) && StringUtils.isBlank(materialInventoryDTO.getShipperInfo())) { - materialInventoryDTO.setShipperInfo(customerName); + // 出库分配前端传的是客户名称 customerName，这里通过名称查询货主ID，使用精确匹配（不模糊匹配） + String shipperName = null; // 保存查询到的货主名称 + if (StringUtils.isNotBlank(customerName) && materialInventoryDTO.getShipperId() == null) { + try { + AjaxResult ajaxResult = userServiceFeign.getInfoByName(customerName); + if ("200".equals(String.valueOf(ajaxResult.get("code"))) && ajaxResult.get("data") != null) { + UserPo userPo = JSON.parseObject(JSONObject.toJSONString(ajaxResult.get("data")), UserPo.class); + if (userPo != null && userPo.getUserId() != null) { + materialInventoryDTO.setShipperId(userPo.getUserId()); + // 获取货主名称：优先使用企业名称，如果没有则使用用户名称 + shipperName = StringUtils.isNotBlank(userPo.getShipperEnterpriseName()) + ? userPo.getShipperEnterpriseName() + : userPo.getUserName(); + log.info("根据客户名称查询到货主信息，客户名称：{}，货主ID：{}，货主名称：{}", + customerName, userPo.getUserId(), shipperName); + } + } + } catch (Exception e) { + log.warn("根据客户名称查询货主ID失败，客户名称：{}，错误：{}", customerName, e.getMessage()); + } } //转换实体 @@ -52,7 +79,39 @@ public class MaterialInventoryApi extends BaseController { startPage(); // 使用带批次属性的查询方法，批次属性值从库存表中获取 List list = materialInventoryApplicationService.queryListWithBatchAttributes(materialInventoryDO); - return getDataTable(list); + TableDataInfo tableDataInfo = getDataTable(list); + // 如果查询结果为空，抛出异常提示用户该物料在库存中不存在 + if (tableDataInfo.getTotal() == 0) { + StringBuilder errorMsg = new StringBuilder("该物料在库存中不存在"); + // 如果有物料信息，添加到提示中 + if (StringUtils.isNotBlank(materialInventoryDTO.getMaterialName())) { + errorMsg.append("，物料名称：").append(materialInventoryDTO.getMaterialName()); + } else if (StringUtils.isNotBlank(materialInventoryDTO.getMaterialCode())) { + errorMsg.append("，物料编码：").append(materialInventoryDTO.getMaterialCode()); + } else if (StringUtils.isNotBlank(materialInventoryDTO.getBarCode())) { + errorMsg.append("，物料条码：").append(materialInventoryDTO.getBarCode()); + } + // 如果有货主信息，添加到提示中（优先显示查询到的货主名称，否则显示客户名称） + if (StringUtils.isNotBlank(shipperName)) { + errorMsg.append("，货主：").append(shipperName); + } else if (StringUtils.isNotBlank(customerName)) { + errorMsg.append("，货主：").append(customerName); + } + // 如果有批次参考号，添加到提示中 + if (StringUtils.isNotBlank(materialInventoryDTO.getBatchRefNo())) { + errorMsg.append("，Batch Ref NO's：").append(materialInventoryDTO.getBatchRefNo()); + } + // 如果有单据参考号，添加到提示中 + if (StringUtils.isNotBlank(materialInventoryDTO.getSheetRefNo())) { + errorMsg.append("，Sheet Ref NO's：").append(materialInventoryDTO.getSheetRefNo()); + } + // 如果有箱号/卡板号，添加到提示中 + if (StringUtils.isNotBlank(materialInventoryDTO.getBoxPalletNo())) { + errorMsg.append("，箱号/卡板号：").append(materialInventoryDTO.getBoxPalletNo()); + } + throw new ServiceException(errorMsg.toString()); + } + return tableDataInfo; } @ApiOperation("查询物料库存列表不分页") From fcb997d4ca0af3620fabe21913a96ec23d894e7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 11:20:59 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=97=A5=E5=B8=B8BUG=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mhd/system/api/SystemServiceFeign.java | 6 ++ .../RemoteSystemFeignFallbackFactory.java | 5 ++ ...ssociationWarehouseApplicationService.java | 11 +++ .../AssociationWarehouseDomainService.java | 33 +++++++ .../AssociationWarehouseApi.java | 10 +++ .../StockInOrderApplicationService.java | 85 ++++++++++++++----- .../StockReceiptOrderDomainService.java | 14 +++ .../stockInOrder/StockInOrderApi.java | 8 +- 8 files changed, 150 insertions(+), 22 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java index bfd94ccba..57439c719 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/SystemServiceFeign.java @@ -218,6 +218,12 @@ public interface SystemServiceFeign { @GetMapping("/associationWarehouseApi/getWarehouseInfo/{correlationId}") public AjaxResult getWarehouseInfo(@PathVariable("correlationId") Long correlationId); + /** + * 直接从数据库获取指定用户设置的仓库（不使用缓存） + */ + @GetMapping("/associationWarehouseApi/getWarehouseInfoFromDb/{correlationId}") + public AjaxResult getWarehouseInfoFromDb(@PathVariable("correlationId") Long correlationId); + /** * 根据warehouseId获取对仓库信息 */ diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java index 4b199c215..d14acfcc5 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteSystemFeignFallbackFactory.java @@ -169,6 +169,11 @@ public class RemoteSystemFeignFallbackFactory implements FallbackFactory().lambda() + .eq(AssociationWarehouse::getCorrelationId, loginUser.getUserid()) + .eq(AssociationWarehouse::getIsDefault, 2) + .eq(AssociationWarehouse::getDelFlag, 1)); + AssociationWarehouseCacheDO associationWarehouseCacheDO = null; + if (ObjectUtil.isNotNull(associationWarehouse)){ + associationWarehouseCacheDO = new AssociationWarehouseCacheDO(); + BeanUtils.copyProperties(associationWarehouse, associationWarehouseCacheDO); + }else { + //首次 没有查到默认取第一条数据 + List associationWarehouseList = associationWarehouseService.list(new QueryWrapper().lambda() + .eq(AssociationWarehouse::getCorrelationId, loginUser.getUserid()) + .orderByAsc(AssociationWarehouse::getAssociationWarehouseId)); + if (CollectionUtils.isEmpty(associationWarehouseList)){ + return null; // 返回null，不抛异常，允许查询所有仓库 + } + AssociationWarehouse associationWarehouseAsc = associationWarehouseList.get(0); + associationWarehouseCacheDO = new AssociationWarehouseCacheDO(); + BeanUtils.copyProperties(associationWarehouseAsc, associationWarehouseCacheDO); + } + return associationWarehouseCacheDO; + } + } diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java index bee23a3f5..a37c2e795 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/associationWarehouse/AssociationWarehouseApi.java @@ -134,4 +134,14 @@ public class AssociationWarehouseApi extends BaseController{ return AjaxResult.success(associationWarehouseCacheDO); } + /** + * 直接从数据库获取指定用户设置的仓库（不使用缓存） + */ + @ApiOperation("直接从数据库获取指定用户设置的仓库（不使用缓存）") + @GetMapping("/getWarehouseInfoFromDb/{correlationId}") + public AjaxResult getWarehouseInfoFromDb(@PathVariable("correlationId") Long correlationId) { + AssociationWarehouseCacheDO associationWarehouseCacheDO = associationWarehouseApplicationService.getWarehouseInfoFromDb(correlationId); + return AjaxResult.success(associationWarehouseCacheDO); + } + } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index e3ab3b68d..002ed078e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -74,16 +74,22 @@ public class StockInOrderApplicationService { stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } try { - AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - if (associationWarehouseCacheDO != null) { - if (associationWarehouseCacheDO.getWarehouseId() != null) { - stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseCode())) { - stockInOrderDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseName())) { - stockInOrderDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); + // 直接从数据库查询当前登录用户选择的仓库，不使用缓存 + AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoFromDb(loginUser.getUserid()); + if ("200".equals(String.valueOf(ajaxResult.get("code"))) && ajaxResult.get("data") != null) { + AssociationWarehouseCacheDO associationWarehouseCacheDO = JSON.parseObject( + JSONObject.toJSONString(ajaxResult.get("data")), + AssociationWarehouseCacheDO.class); + if (associationWarehouseCacheDO != null) { + if (associationWarehouseCacheDO.getWarehouseId() != null) { + stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } + if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseCode())) { + stockInOrderDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode()); + } + if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseName())) { + stockInOrderDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); + } } } } catch (Exception e) { @@ -139,10 +145,46 @@ public class StockInOrderApplicationService { /** * 批量删除入库单 + * 只有已创建状态（status = 1）的入库单可以删除 */ public boolean delete(Long[] inOrderIds) { + if (inOrderIds == null || inOrderIds.length == 0) { + throw new ServiceException("删除的入库单ID不能为空"); + } + + // 查询入库单信息，检查状态 + for (Long inOrderId : inOrderIds) { + StockInOrderPO stockInOrderPO = stockInOrderDomainService.getInfo(inOrderId); + if (stockInOrderPO == null) { + throw new ServiceException("入库单不存在，入库单ID：" + inOrderId); + } + // 只有已创建状态（status = 1）的入库单可以删除 + if (stockInOrderPO.getStatus() == null || !stockInOrderPO.getStatus().equals(1)) { + throw new ServiceException("只有已创建状态的入库单可以删除，入库单号：" + stockInOrderPO.getInOrderNumber() + "，当前状态：" + getStatusName(stockInOrderPO.getStatus())); + } + } + return stockInOrderDomainService.delete(inOrderIds); } + + /** + * 获取入库状态名称 + */ + private String getStatusName(Integer status) { + if (status == null) { + return "未知"; + } + switch (status) { + case 1: return "已创建"; + case 2: return "已审核"; + case 3: return "收货中"; + case 4: return "上架中"; + case 5: return "已入库"; + case 6: return "已取消"; + case 7: return "已关闭"; + default: return "未知"; + } + } /** * 获取入库单详细信息 @@ -195,7 +237,7 @@ public class StockInOrderApplicationService { * - 第13行：明细表列名 * - 第14行开始：明细数据 */ - public Boolean importData(MultipartFile file) { + public Boolean importData(MultipartFile file, Long warehouseId, String warehouseCode, String warehouseName) { if (file == null || file.isEmpty()) { throw new ServiceException("导入文件不能为空"); } @@ -1046,13 +1088,16 @@ public class StockInOrderApplicationService { List groupRows = entry.getValue(); StockInOrderImportRowDTO h = groupRows.get(0); - // 获取仓库ID（使用登录人当前关联仓库） - Long warehouseId; - AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - if (associationWarehouseCacheDO == null || associationWarehouseCacheDO.getWarehouseId() == null) { - throw new ServiceException("导入失败：未配置用户关联仓库，请先配置仓库"); + // 使用传入的仓库信息（与出库单导入保持一致） + if (warehouseId == null) { + throw new ServiceException("导入失败：仓库ID不能为空"); + } + if (StringUtils.isBlank(warehouseCode)) { + throw new ServiceException("导入失败：仓库编码不能为空"); + } + if (StringUtils.isBlank(warehouseName)) { + throw new ServiceException("导入失败：仓库名称不能为空"); } - warehouseId = associationWarehouseCacheDO.getWarehouseId(); // 客户名称应该从表头获取（优先使用表头，如果表头为空则使用明细行） String customerName = StringUtils.isNotBlank(headerInfo.getShipperName()) ? headerInfo.getShipperName() : h.getShipperName(); @@ -1074,10 +1119,10 @@ public class StockInOrderApplicationService { // 设置创建时间为当前时间 order.setCreateTime(new Date()); - // 必填/基础字段 + // 必填/基础字段（使用传入的仓库信息，与出库单导入保持一致） order.setWarehouseId(warehouseId); - // 设置仓库完整信息（warehouseCode 和 warehouseName） - setWarehouseInfo(order); + order.setWarehouseCode(warehouseCode); + order.setWarehouseName(warehouseName); // 货主信息：优先使用表头，如果表头为空则使用明细行 String shipperName = StringUtils.isNotBlank(headerInfo.getShipperName()) ? headerInfo.getShipperName() : h.getShipperName(); String shipperCode = StringUtils.isNotBlank(headerInfo.getShipperCode()) ? headerInfo.getShipperCode() : h.getShipperCode(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java index d9e0dfb9b..189eecbe6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java @@ -11,6 +11,7 @@ import com.mhd.common.core.constant.SnowFlakeConstants; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.utils.IgnoreNullUtil; import com.mhd.common.core.utils.OrderSequence; +import com.mhd.common.core.utils.StringUtils; import com.mhd.common.core.utils.bean.BeanUtils; import com.mhd.common.core.utils.uuid.IdGenerator; import com.mhd.common.core.web.domain.AjaxResult; @@ -471,6 +472,19 @@ public class StockReceiptOrderDomainService { //根据收货数量生成上架 genStockShelfOrder(stockReceiptOrderPO); + //生成上架单后，更新入库单状态为4（上架中） + if (StringUtils.isNotBlank(stockReceiptOrderPO.getInOrderNumber())) { + StockInOrder stockInOrder = new StockInOrder(); + stockInOrder.setInOrderNumber(stockReceiptOrderPO.getInOrderNumber()); + stockInOrder.setStatus(4); // 4-上架中 + stockInOrder.setUpdateBy(loginUser.getUserid()); + stockInOrder.setUpdateByName(loginUser.getUsername()); + stockInOrder.setUpdateTime(new Date()); + stockInOrderService.update(stockInOrder, + new QueryWrapper().lambda() + .eq(StockInOrder::getInOrderNumber, stockReceiptOrderPO.getInOrderNumber())); + } + //收货完成后自动生成上架任务 try { //查询刚生成的上架单 diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java index 8b9d7f666..8d4f913a0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java @@ -88,9 +88,13 @@ public class StockInOrderApi extends BaseController { */ @ApiOperation("导入入库单") @PostMapping(value = "/importData") - public AjaxResult importData(MultipartFile file) + public AjaxResult importData( + @RequestParam("file") MultipartFile file, + @RequestParam("warehouseId") Long warehouseId, + @RequestParam("warehouseCode") String warehouseCode, + @RequestParam("warehouseName") String warehouseName) { - return AjaxResult.success(stockInOrderApplicationService.importData(file)); + return AjaxResult.success(stockInOrderApplicationService.importData(file, warehouseId, warehouseCode, warehouseName)); } /** From c2af92f1a3e7ff62f6354021749fab61a3991695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 11:34:28 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=89=A9=E6=96=99?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=8CEA=E5=8D=95=E4=BD=8D=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockShelfOrderApplicationService.java | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index a88586bbd..370aa48a4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -19,9 +19,13 @@ import com.mhd.system.api.domain.StorageLocationFeignPO; import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; +import com.mhd.wms.domain.materialBarCode.repository.facade.IMaterialBarCodeService; +import com.mhd.wms.domain.materialBarCode.repository.po.MaterialBarCodePO; import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo; +import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService; import com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper; import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; +import com.mhd.system.api.domain.PackDetailFeignPO; import com.mhd.wms.domain.materialGoodsRule.repository.facade.IMaterialGoodsRuleService; import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchDetailPO; import com.mhd.wms.domain.materialGoodsRule.repository.po.BatchPO; @@ -80,6 +84,10 @@ public class StockShelfOrderApplicationService { private MaterialInventoryMapper materialInventoryMapper; @Autowired private IMaterialGoodsRuleService materialGoodsRuleService; + @Autowired + private IMaterialBaseInfoService materialBaseInfoService; + @Autowired + private IMaterialBarCodeService materialBarCodeService; @@ -179,6 +187,66 @@ public class StockShelfOrderApplicationService { // 3. 为每个物料明细设置更多属性（从缓存中获取），递归处理所有层级 setMaterialMoreDetailListRecursively(shelfMaterialDetailPOList, batchDetailMap); + // 4. 批量查询物料基础信息和物料条码信息，填充明细行的物料单位、包装和条码 + // 4.1 批量查询物料基础信息 + Map materialBaseInfoMap = new HashMap<>(); + for (Long materialBaseInfoId : materialBaseInfoIdSet) { + try { + MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoService.getInfo(materialBaseInfoId); + if (materialBaseInfoPO != null) { + materialBaseInfoMap.put(materialBaseInfoId, materialBaseInfoPO); + } + } catch (Exception e) { + log.warn("获取物料基础信息失败，物料基础信息ID：{}，错误：{}", materialBaseInfoId, e.getMessage()); + } + } + + // 4.2 批量查询物料条码信息（单位代码为EA的条码） + Map materialBarCodeMap = new HashMap<>(); + for (Long materialBaseInfoId : materialBaseInfoIdSet) { + try { + List materialBarCodePOList = materialBarCodeService.getInfoByMaterialBaseInfoIds(materialBaseInfoId); + if (materialBarCodePOList != null && !materialBarCodePOList.isEmpty()) { + // 查找单位代码为EA的条码 + MaterialBarCodePO eaBarCode = materialBarCodePOList.stream() + .filter(barCode -> "EA".equals(barCode.getUnitCode())) + .findFirst() + .orElse(null); + if (eaBarCode != null) { + materialBarCodeMap.put(materialBaseInfoId, eaBarCode); + } + } + } catch (Exception e) { + log.warn("获取物料条码信息失败，物料基础信息ID：{}，错误：{}", materialBaseInfoId, e.getMessage()); + } + } + + // 4.3 批量查询包装规格信息（单位代码为EA的单位名称） + Map packDetailMap = new HashMap<>(); + for (Long materialBaseInfoId : materialBaseInfoIdSet) { + MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoMap.get(materialBaseInfoId); + if (materialBaseInfoPO != null && materialBaseInfoPO.getPackId() != null) { + try { + AjaxResult packDetailResult = systemServiceFeign.getInfoByPackIdAndUnitCode(materialBaseInfoPO.getPackId(), "EA"); + if (packDetailResult != null && "200".equals(String.valueOf(packDetailResult.get("code"))) + && packDetailResult.get("data") != null) { + PackDetailFeignPO packDetailFeignPO = JSON.parseObject( + JSONObject.toJSONString(packDetailResult.get("data")), + PackDetailFeignPO.class); + if (packDetailFeignPO != null) { + packDetailMap.put(materialBaseInfoId, packDetailFeignPO); + } + } + } catch (Exception e) { + log.warn("获取包装规格EA单位信息失败，物料基础信息ID：{}，包装ID：{}，错误：{}", + materialBaseInfoId, materialBaseInfoPO.getPackId(), e.getMessage()); + } + } + } + + // 4.4 为每个明细行填充物料单位、包装和条码信息 + fillMaterialDetailInfoRecursively(shelfMaterialDetailPOList, materialBaseInfoMap, materialBarCodeMap, packDetailMap); + stockShelfOrderPO.setMaterialDetailList(shelfMaterialDetailPOList); log.info("返回上架单信息，shelfOrderId={}, materialDetailList大小={}", stockShelfOrderPO.getShelfOrderId(), @@ -645,6 +713,58 @@ public class StockShelfOrderApplicationService { }); } + /** + * 递归填充明细行的物料单位、包装和条码信息 + * @param shelfMaterialDetailPOList 上架单明细列表 + * @param materialBaseInfoMap 物料基础信息Map（key: materialBaseInfoId, value: MaterialBaseInfoPO） + * @param materialBarCodeMap 物料条码Map（key: materialBaseInfoId, value: MaterialBarCodePO，单位代码为EA） + * @param packDetailMap 包装规格明细Map（key: materialBaseInfoId, value: PackDetailFeignPO，单位代码为EA） + */ + private void fillMaterialDetailInfoRecursively(List shelfMaterialDetailPOList, + Map materialBaseInfoMap, + Map materialBarCodeMap, + Map packDetailMap) { + if (CollectionUtils.isEmpty(shelfMaterialDetailPOList)) { + return; + } + + shelfMaterialDetailPOList.forEach(shelfMaterialDetailPO -> { + Long materialBaseInfoId = shelfMaterialDetailPO.getMaterialBaseInfoId(); + + if (materialBaseInfoId != null) { + // 填充包装名称（从物料基础信息中获取） + MaterialBaseInfoPO materialBaseInfoPO = materialBaseInfoMap.get(materialBaseInfoId); + if (materialBaseInfoPO != null) { + // 包装显示物料绑定的包装规格名称 + if (StringUtils.isNotBlank(materialBaseInfoPO.getPackName())) { + shelfMaterialDetailPO.setPackName(materialBaseInfoPO.getPackName()); + } + } + + // 填充物料单位名称（从包装规格明细中获取单位代码为EA的单位名称） + PackDetailFeignPO packDetailFeignPO = packDetailMap.get(materialBaseInfoId); + if (packDetailFeignPO != null && StringUtils.isNotBlank(packDetailFeignPO.getName())) { + // 物料单位EA显示物料绑定的包装规格维护的单位代码为EA的单位名称 + shelfMaterialDetailPO.setUnitName(packDetailFeignPO.getName()); + shelfMaterialDetailPO.setUnitCode("EA"); + } + + // 填充条码（从物料条码信息中获取单位代码为EA的条码） + MaterialBarCodePO materialBarCodePO = materialBarCodeMap.get(materialBaseInfoId); + if (materialBarCodePO != null && StringUtils.isNotBlank(materialBarCodePO.getBarCode())) { + // 条码取物料条码信息中单位代码为EA的条码 + shelfMaterialDetailPO.setBarCode(materialBarCodePO.getBarCode()); + } + } + + // 递归处理子明细 + if (!CollectionUtils.isEmpty(shelfMaterialDetailPO.getChildren())) { + fillMaterialDetailInfoRecursively(shelfMaterialDetailPO.getChildren(), + materialBaseInfoMap, materialBarCodeMap, packDetailMap); + } + }); + } + /** * 根据批次标签（batchLabels）映射到字段名 * @param batchLabel 批次标签 From 543fca9d389deae879b3bb89c161b7670061bb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 11:41:29 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E5=87=BA=E5=BA=93=E4=BA=A4=E6=8E=A5?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml index b6e60a45e..17bc07f13 100644 --- a/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml @@ -141,5 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + order by a.create_time desc \ No newline at end of file From 507cbf0f1e57c9980ab47de5442f64cefa315446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 14:43:33 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=BC=96=E7=A0=81?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/materialBaseInfo/MaterialBaseInfoMapper.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml index 403e8fc87..e308ebb5e 100644 --- a/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialBaseInfo/MaterialBaseInfoMapper.xml @@ -99,11 +99,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and shipper_name like concat('%', #{shipperName}, '%') - and material_code = #{materialCode} + and material_code like concat('%', #{materialCode}, '%') and material_name like concat('%', #{materialName}, '%') + + and unit_name like concat('%', #{unitName}, '%') + and bar_code like concat('%',#{barCode},'%') From 49ba1cc8fdb41428cd08ea92f6b3527251841267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 15:12:36 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialInventoryApplicationService.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java index d99e00be0..80c489e30 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/materialInventory/MaterialInventoryApplicationService.java @@ -56,8 +56,14 @@ public class MaterialInventoryApplicationService { if (topOrganizationId != null && topOrganizationId != 1){ materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值 + if (materialInventoryDO.getWarehouseId() == null) { + AssociationWarehouseCacheDO associationWarehouseCacheDO = + SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); + if (associationWarehouseCacheDO != null) { + materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } + } } return materialInventoryDomainService.queryList(materialInventoryDO); } @@ -337,8 +343,14 @@ public class MaterialInventoryApplicationService { if (topOrganizationId != null && topOrganizationId != 1){ materialInventoryDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + // 前端有传warehouseId则优先使用传参；未传时才使用“用户关联仓库”作为默认值 + if (materialInventoryDO.getWarehouseId() == null) { + AssociationWarehouseCacheDO associationWarehouseCacheDO = + SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); + if (associationWarehouseCacheDO != null) { + materialInventoryDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + } + } } List materialInventoryPOS = materialInventoryDomainService.queryList(materialInventoryDO); if (CollectionUtils.isNotEmpty(materialInventoryPOS)){ From d8400d3a9d6d5da8abf1fad1740f64d5dc2bb73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 10 Feb 2026 17:29:58 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=90=E5=85=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=91=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E9=87=8F=E3=80=81=E6=94=B6=E8=B4=A7=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E3=80=81=E4=B8=8A=E6=9E=B6=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/po/StockInOrderPO.java | 25 +++++++++++++++++-- .../stockInOrder/StockInOrderMapper.xml | 25 ++++++++++++++++++- 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index b50bce6f6..ab1ce0335 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -149,10 +149,31 @@ public class StockInOrderPO extends BaseVOEntity { @Excel(name = "物料种数") private Integer materialQuantity; - @ApiModelProperty("计划数量") - @Excel(name = "计划数量") + @ApiModelProperty("计划数量（原字段）") + @Excel(name = "计划数量（原字段）") private BigDecimal quantity; + /** + * 计划入库数量：取入库单明细中的入库数量汇总 + */ + @ApiModelProperty("计划入库数量") + @Excel(name = "计划入库数量") + private BigDecimal planInQuantity; + + /** + * 收货数量：入库单对应的收货单实际收货数量汇总 + */ + @ApiModelProperty("收货数量") + @Excel(name = "收货数量") + private BigDecimal receiptQuantity; + + /** + * 上架数量：入库单对应的上架单实际上架数量汇总 + */ + @ApiModelProperty("上架数量") + @Excel(name = "上架数量") + private BigDecimal shelvesQuantity; + @ApiModelProperty("净重 单位：千克") @Excel(name = "净重 单位：千克") private BigDecimal weightLimit; diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index f65eacbca..13c75df64 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -33,6 +33,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + @@ -84,7 +87,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.in_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.notice_number, a.in_order_number, a.status, a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code, a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number, - a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity, a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by, + a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity, + -- 计划入库数量：入库明细表 in_material_detail 的 quantity 汇总 + (select ifnull(sum(imd.quantity), 0) + from in_material_detail imd + where imd.in_order_number = a.in_order_number + and imd.del_flag = 1 + and (imd.level is null or imd.level = 1) + ) as plan_in_quantity, + -- 收货数量：收货单表 stock_receipt_order 的 receipt_quantity 汇总 + (select ifnull(sum(sro.receipt_quantity), 0) + from stock_receipt_order sro + where sro.in_order_number = a.in_order_number + and sro.del_flag = 1 + ) as receipt_quantity, + -- 上架数量：上架单表 stock_shelf_order 的 shelves_quantity 汇总 + (select ifnull(sum(sso.shelves_quantity), 0) + from stock_shelf_order sso + where sso.in_order_number = a.in_order_number + and sso.del_flag = 1 + ) as shelves_quantity, + a.weight_limit, a.volume_limit, a.cancel_order, a.cancel_remark, a.cancel_by, a.cancel_by_name, a.cancel_time, a.close_order, a.close_remark, a.close_by, a.close_by_name, a.close_time, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag, over_stock_id, over_stock_status, over_stock_type, a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER, From 801c9fec3d061ca7a550df315c5f28549b7d36ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Wed, 11 Feb 2026 10:55:42 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=94=B6=E8=B4=A7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockInOrderApplicationService.java | 27 +-- .../service/StockInOrderDomainService.java | 165 +++++++++++++++ .../StockReceiptOrderDomainService.java | 194 ++++++++++++++++++ 3 files changed, 365 insertions(+), 21 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 002ed078e..305a161a0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -73,28 +73,13 @@ public class StockInOrderApplicationService { if (topOrganizationId != null && topOrganizationId != 1){ stockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - try { - // 直接从数据库查询当前登录用户选择的仓库，不使用缓存 - AjaxResult ajaxResult = systemServiceFeign.getWarehouseInfoFromDb(loginUser.getUserid()); - if ("200".equals(String.valueOf(ajaxResult.get("code"))) && ajaxResult.get("data") != null) { - AssociationWarehouseCacheDO associationWarehouseCacheDO = JSON.parseObject( - JSONObject.toJSONString(ajaxResult.get("data")), - AssociationWarehouseCacheDO.class); - if (associationWarehouseCacheDO != null) { - if (associationWarehouseCacheDO.getWarehouseId() != null) { - stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseCode())) { - stockInOrderDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseName())) { - stockInOrderDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); - } - } + // 前端有传warehouseId则优先使用传参；未传时才使用"用户关联仓库"作为默认值 + if (stockInOrderDO.getWarehouseId() == null) { + AssociationWarehouseCacheDO associationWarehouseCacheDO = + SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); + if (associationWarehouseCacheDO != null) { + stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); } - } catch (Exception e) { - // 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库） - log.warn("获取用户关联仓库信息失败，将查询所有仓库数据，用户ID：{}，错误：{}", loginUser.getUserid(), e.getMessage()); } } return stockInOrderDomainService.queryList(stockInOrderDO); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java index f755574a1..de3cc88a6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java @@ -26,7 +26,12 @@ import com.mhd.wms.domain.materialWarehouseControl.repository.facade.IMaterialWa import com.mhd.wms.domain.materialWarehouseControl.repository.po.MaterialWarehouseControlPO; import com.mhd.wms.domain.qualityInspection.repository.facade.IQualityInspectionService; import com.mhd.wms.domain.qualityInspection.repository.todo.QualityInspectionDO; +import com.mhd.wms.domain.receiptMaterialDetail.repository.facade.IReceiptMaterialDetailService; +import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO; import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO; +import com.mhd.wms.domain.shelfMaterialDetail.repository.facade.IShelfMaterialDetailService; +import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO; +import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; import com.mhd.wms.domain.stockInOrder.repository.facade.IStockInOrderService; import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO; @@ -34,6 +39,9 @@ import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO; import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO; import com.mhd.wms.domain.stockReceiptOrder.repository.todo.StockReceiptOrderDO; import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService; +import com.mhd.wms.domain.stockShelfOrder.repository.po.StockShelfOrderPO; +import com.mhd.wms.domain.stockShelfOrder.repository.todo.StockShelfOrderDO; +import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -62,6 +70,8 @@ public class StockInOrderDomainService { @Autowired private StockReceiptOrderDomainService stockReceiptOrderDomainService; @Autowired + private StockShelfOrderDomainService stockShelfOrderDomainService; + @Autowired private IQualityInspectionService qualityInspectionService; @Autowired private IMaterialBaseInfoService materialBaseInfoService; @@ -71,6 +81,10 @@ public class StockInOrderDomainService { private IMaterialWarehouseControlService materialWarehouseControlService; @Autowired private SystemServiceFeign systemServiceFeign; + @Autowired + private IReceiptMaterialDetailService receiptMaterialDetailService; + @Autowired + private IShelfMaterialDetailService shelfMaterialDetailService; /** * 分页查询入库单列表 @@ -180,10 +194,161 @@ public class StockInOrderDomainService { inMaterialDetailDO.setInOrderNumber(stockInOrderPO.getInOrderNumber()); inMaterialDetailDO.setLevel(1); List inMaterialDetailPOList = materialDetailService.queryList(inMaterialDetailDO); + + // 先通过入库单号查询收货单列表 + StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO(); + stockReceiptOrderDO.setInOrderNumber(stockInOrderPO.getInOrderNumber()); + List stockReceiptOrderPOList = stockReceiptOrderDomainService.queryList(stockReceiptOrderDO); + + // 先通过入库单号查询上架单列表 + StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO(); + stockShelfOrderDO.setInOrderNumber(stockInOrderPO.getInOrderNumber()); + List stockShelfOrderPOList = stockShelfOrderDomainService.queryList(stockShelfOrderDO); + + // 查询收货单明细，用于填充收货数量和更新毛重、净重、面积、体积 + List receiptMaterialDetailPOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(stockReceiptOrderPOList)) { + List receiptOrderNumberList = stockReceiptOrderPOList.stream() + .map(StockReceiptOrderPO::getReceiptOrderNumber) + .filter(StringUtils::isNotBlank) + .collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(receiptOrderNumberList)) { + ReceiptMaterialDetailDO receiptMaterialDetailDO = new ReceiptMaterialDetailDO(); + receiptMaterialDetailDO.setReceiptOrderNumberList(receiptOrderNumberList); + receiptMaterialDetailPOList = receiptMaterialDetailService.queryList(receiptMaterialDetailDO); + } + } + + // 查询上架单明细，用于填充上架数量 + List shelfMaterialDetailPOList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(stockShelfOrderPOList)) { + for (StockShelfOrderPO stockShelfOrderPO : stockShelfOrderPOList) { + if (StringUtils.isNotBlank(stockShelfOrderPO.getShelfOrderNumber())) { + ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO(); + shelfMaterialDetailDO.setShelfOrderNumber(stockShelfOrderPO.getShelfOrderNumber()); + List shelfDetails = shelfMaterialDetailService.queryList(shelfMaterialDetailDO); + if (!CollectionUtils.isEmpty(shelfDetails)) { + shelfMaterialDetailPOList.addAll(shelfDetails); + } + } + } + } + + // 按 materialDetailId 分组汇总收货数量和上架数量，以及更新毛重、净重、面积、体积 + if (!CollectionUtils.isEmpty(inMaterialDetailPOList)) { + // 按 materialDetailId 分组汇总收货数量（实际收货数量）、毛重、净重、面积、体积 + // 收货数量：入库单对应的收货单实际收货数量汇总 + Map receiptDetailMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(receiptMaterialDetailPOList)) { + // 递归处理所有层级的收货单明细（包括子明细） + for (ReceiptMaterialDetailPO receiptDetail : receiptMaterialDetailPOList) { + processReceiptDetail(receiptDetail, receiptDetailMap); + } + } + + // 按 materialDetailId 分组汇总上架数量（实际上架数量） + // 上架数量：入库单对应的上架单实际上架数量汇总 + Map shelfQuantityMap = new HashMap<>(); + if (!CollectionUtils.isEmpty(shelfMaterialDetailPOList)) { + for (ShelfMaterialDetailPO shelfDetail : shelfMaterialDetailPOList) { + if (shelfDetail.getMaterialDetailId() != null && shelfDetail.getShelvesQuantity() != null) { + Long materialDetailId = shelfDetail.getMaterialDetailId(); + BigDecimal shelvesQuantity = shelfQuantityMap.getOrDefault(materialDetailId, BigDecimal.ZERO); + shelfQuantityMap.put(materialDetailId, shelvesQuantity.add(shelfDetail.getShelvesQuantity())); + } + } + } + + // 填充入库单明细的收货数量、上架数量，以及更新毛重、净重、面积、体积 + for (InMaterialDetailPO inMaterialDetail : inMaterialDetailPOList) { + Long materialDetailId = inMaterialDetail.getMaterialDetailId(); + if (materialDetailId != null) { + // 填充收货数量（入库单对应的收货单实际收货数量） + ReceiptMaterialDetailPO receiptDetail = receiptDetailMap.get(materialDetailId); + if (receiptDetail != null) { + // 更新收货数量 + if (receiptDetail.getReceiptQuantity() != null) { + inMaterialDetail.setReceiptQuantity(receiptDetail.getReceiptQuantity()); + } + + // 更新毛重、净重、面积、体积（根据收货时所填的明细行数据更新到入库单明细中） + // 将收货单明细中填写的数据汇总后更新到入库单明细 + if (receiptDetail.getTotalGrossWeight() != null) { + inMaterialDetail.setTotalGrossWeight(receiptDetail.getTotalGrossWeight()); + } + if (receiptDetail.getTotalNetWeight() != null) { + inMaterialDetail.setTotalNetWeight(receiptDetail.getTotalNetWeight()); + } + if (receiptDetail.getTotalArea() != null) { + inMaterialDetail.setTotalArea(receiptDetail.getTotalArea()); + } + if (receiptDetail.getTotalVolume() != null) { + inMaterialDetail.setTotalVolume(receiptDetail.getTotalVolume()); + } + } + + // 填充上架数量（入库单对应的上架单实际上架数量） + BigDecimal shelvesQuantity = shelfQuantityMap.get(materialDetailId); + if (shelvesQuantity != null) { + inMaterialDetail.setShelvesQuantity(shelvesQuantity); + } + } + } + } + stockInOrderPO.setMaterialDetailList(inMaterialDetailPOList); return stockInOrderPO; } + /** + * 递归处理收货单明细，汇总毛重、净重、面积、体积 + * @param receiptDetail 收货单明细 + * @param receiptDetailMap 收货单明细汇总Map + */ + private void processReceiptDetail(ReceiptMaterialDetailPO receiptDetail, Map receiptDetailMap) { + if (receiptDetail == null || receiptDetail.getMaterialDetailId() == null) { + return; + } + + Long materialDetailId = receiptDetail.getMaterialDetailId(); + ReceiptMaterialDetailPO existing = receiptDetailMap.get(materialDetailId); + + if (existing == null) { + // 如果不存在，直接放入Map + receiptDetailMap.put(materialDetailId, receiptDetail); + } else { + // 如果已存在，汇总收货数量、毛重、净重、面积、体积 + // 汇总收货数量（实际收货数量） + BigDecimal receiptQuantity = existing.getReceiptQuantity() != null ? existing.getReceiptQuantity() : BigDecimal.ZERO; + BigDecimal newReceiptQuantity = receiptDetail.getReceiptQuantity() != null ? receiptDetail.getReceiptQuantity() : BigDecimal.ZERO; + existing.setReceiptQuantity(receiptQuantity.add(newReceiptQuantity)); + + // 汇总毛重、净重、面积、体积（根据收货时填写的数据） + // 累加所有收货单明细的毛重、净重、面积、体积 + BigDecimal existingGrossWeight = existing.getTotalGrossWeight() != null ? existing.getTotalGrossWeight() : BigDecimal.ZERO; + BigDecimal newGrossWeight = receiptDetail.getTotalGrossWeight() != null ? receiptDetail.getTotalGrossWeight() : BigDecimal.ZERO; + existing.setTotalGrossWeight(existingGrossWeight.add(newGrossWeight)); + + BigDecimal existingNetWeight = existing.getTotalNetWeight() != null ? existing.getTotalNetWeight() : BigDecimal.ZERO; + BigDecimal newNetWeight = receiptDetail.getTotalNetWeight() != null ? receiptDetail.getTotalNetWeight() : BigDecimal.ZERO; + existing.setTotalNetWeight(existingNetWeight.add(newNetWeight)); + + BigDecimal existingArea = existing.getTotalArea() != null ? existing.getTotalArea() : BigDecimal.ZERO; + BigDecimal newArea = receiptDetail.getTotalArea() != null ? receiptDetail.getTotalArea() : BigDecimal.ZERO; + existing.setTotalArea(existingArea.add(newArea)); + + BigDecimal existingVolume = existing.getTotalVolume() != null ? existing.getTotalVolume() : BigDecimal.ZERO; + BigDecimal newVolume = receiptDetail.getTotalVolume() != null ? receiptDetail.getTotalVolume() : BigDecimal.ZERO; + existing.setTotalVolume(existingVolume.add(newVolume)); + } + + // 递归处理子明细 + if (!CollectionUtils.isEmpty(receiptDetail.getChildren())) { + for (ReceiptMaterialDetailPO child : receiptDetail.getChildren()) { + processReceiptDetail(child, receiptDetailMap); + } + } + } /** * @description 审核入库单 diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java index 189eecbe6..9df36dfb3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java @@ -24,6 +24,7 @@ import com.mhd.wms.domain.containerUsageRecord.repository.facade.IContainerUsage import com.mhd.wms.domain.containerUsageRecord.repository.todo.ContainerUsageRecordDO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; +import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.facade.IInMaterialDetailSerialNumberService; @@ -388,6 +389,8 @@ public class StockReceiptOrderDomainService { genInventoryStandingReport(stockReceiptOrderPO, stockReceiptOrderDO); //修改物料明细信息 receiptMaterialDetailService.batchReceiptUpdate(stockReceiptOrderDO); + //同步更新入库单明细的收货数量、总毛重、总净重、总面积、总体积 + syncUpdateInMaterialDetailFromReceipt(stockReceiptOrderDO, stockReceiptOrderPO); //生成 收货作业单 genStockReceiptTaskOrderByReceivingGoods(stockReceiptOrderPO,stockReceiptOrderDO); //收货后上架前 生成质检 @@ -400,6 +403,197 @@ public class StockReceiptOrderDomainService { } + /** + * 同步更新入库单明细的收货数量、总毛重、总净重、总面积、总体积 + * 根据收货单明细中填写的数据，按materialDetailId分组汇总后更新到入库单明细 + * @param stockReceiptOrderDO 收货单DO + * @param stockReceiptOrderPO 收货单PO（可选，如果为null则从DO中获取） + */ + private void syncUpdateInMaterialDetailFromReceipt(StockReceiptOrderDO stockReceiptOrderDO, StockReceiptOrderPO stockReceiptOrderPO) { + if (stockReceiptOrderDO == null || StringUtils.isBlank(stockReceiptOrderDO.getReceiptOrderNumber())) { + return; + } + + // 获取入库单号 + String inOrderNumber = stockReceiptOrderDO.getInOrderNumber(); + if (StringUtils.isBlank(inOrderNumber) && stockReceiptOrderPO != null) { + inOrderNumber = stockReceiptOrderPO.getInOrderNumber(); + } + if (StringUtils.isBlank(inOrderNumber) && stockReceiptOrderDO.getReceiptOrderId() != null) { + // 如果收货单DO中没有入库单号，从收货单PO中获取 + StockReceiptOrderPO receiptOrderPO = stockReceiptOrderService.getInfo(stockReceiptOrderDO.getReceiptOrderId()); + if (receiptOrderPO != null) { + inOrderNumber = receiptOrderPO.getInOrderNumber(); + } + } + + if (StringUtils.isBlank(inOrderNumber)) { + log.warn("收货单【{}】没有关联的入库单号，无法同步更新入库单明细", stockReceiptOrderDO.getReceiptOrderNumber()); + return; + } + + log.info("开始同步更新入库单【{}】的明细，收货单号：{}", inOrderNumber, stockReceiptOrderDO.getReceiptOrderNumber()); + + // 查询该入库单对应的所有收货单 + StockReceiptOrderDO queryReceiptOrderDO = new StockReceiptOrderDO(); + queryReceiptOrderDO.setInOrderNumber(inOrderNumber); + List receiptOrderPOList = stockReceiptOrderService.queryList(queryReceiptOrderDO); + + if (CollectionUtils.isEmpty(receiptOrderPOList)) { + return; + } + + // 获取所有收货单号 + List receiptOrderNumberList = receiptOrderPOList.stream() + .map(StockReceiptOrderPO::getReceiptOrderNumber) + .filter(StringUtils::isNotBlank) + .collect(Collectors.toList()); + + if (CollectionUtils.isEmpty(receiptOrderNumberList)) { + return; + } + + // 从数据库查询该入库单对应的所有收货单明细（包括已更新的数据） + ReceiptMaterialDetailDO receiptMaterialDetailDO = new ReceiptMaterialDetailDO(); + receiptMaterialDetailDO.setReceiptOrderNumberList(receiptOrderNumberList); + List receiptMaterialDetailPOList = receiptMaterialDetailService.queryList(receiptMaterialDetailDO); + + if (CollectionUtils.isEmpty(receiptMaterialDetailPOList)) { + return; + } + + // 按unique_id（入库单明细的唯一标识）分组汇总收货数量、总毛重、总净重、总面积、总体积 + // 注意：收货单明细的material_detail_id和入库单明细的material_detail_id是不同的 + // 需要通过in_unique_id（收货单明细）关联到unique_id（入库单明细） + Map> uniqueIdSummaryMap = new HashMap<>(); + + // 递归处理所有层级的收货单明细 + for (ReceiptMaterialDetailPO receiptDetail : receiptMaterialDetailPOList) { + processReceiptDetailPOForSync(receiptDetail, uniqueIdSummaryMap); + } + + // 批量更新入库单明细 + if (!uniqueIdSummaryMap.isEmpty()) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + Date updateTime = new Date(); + + log.info("开始同步更新入库单【{}】的明细，共{}个明细需要更新", inOrderNumber, uniqueIdSummaryMap.size()); + + for (Map.Entry> entry : uniqueIdSummaryMap.entrySet()) { + Long uniqueId = entry.getKey(); // 这是入库单明细的unique_id + Map summary = entry.getValue(); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("unique_id", uniqueId); + updateWrapper.eq("in_order_number", inOrderNumber); + updateWrapper.eq("del_flag", 1); + + boolean hasUpdate = false; + + // 更新收货数量 + if (summary.containsKey("receiptQuantity") && summary.get("receiptQuantity") != null) { + updateWrapper.set("receipt_quantity", summary.get("receiptQuantity")); + hasUpdate = true; + } + + // 更新总毛重 + if (summary.containsKey("totalGrossWeight") && summary.get("totalGrossWeight") != null) { + updateWrapper.set("total_gross_weight", summary.get("totalGrossWeight")); + hasUpdate = true; + } + + // 更新总净重 + if (summary.containsKey("totalNetWeight") && summary.get("totalNetWeight") != null) { + updateWrapper.set("total_net_weight", summary.get("totalNetWeight")); + hasUpdate = true; + } + + // 更新总面积 + if (summary.containsKey("totalArea") && summary.get("totalArea") != null) { + updateWrapper.set("total_area", summary.get("totalArea")); + hasUpdate = true; + } + + // 更新总体积 + if (summary.containsKey("totalVolume") && summary.get("totalVolume") != null) { + updateWrapper.set("total_volume", summary.get("totalVolume")); + hasUpdate = true; + } + + if (hasUpdate) { + updateWrapper.set("update_by", loginUser.getUserid()); + updateWrapper.set("update_by_name", loginUser.getUsername()); + updateWrapper.set("update_time", updateTime); + boolean updateResult = iInMaterialDetailService.update(updateWrapper); + if (updateResult) { + log.info("成功更新入库单明细，uniqueId: {}, 收货数量: {}, 总毛重: {}, 总净重: {}, 总面积: {}, 总体积: {}", + uniqueId, + summary.get("receiptQuantity"), + summary.get("totalGrossWeight"), + summary.get("totalNetWeight"), + summary.get("totalArea"), + summary.get("totalVolume")); + } else { + log.warn("更新入库单明细失败，uniqueId: {}, inOrderNumber: {}", uniqueId, inOrderNumber); + } + } else { + log.debug("入库单明细无需更新，uniqueId: {}", uniqueId); + } + } + log.info("完成同步更新入库单【{}】的明细", inOrderNumber); + } else { + log.warn("入库单【{}】没有需要更新的明细数据", inOrderNumber); + } + } + + /** + * 递归处理收货单明细，汇总收货数量、总毛重、总净重、总面积、总体积 + * @param receiptDetail 收货单明细PO + * @param uniqueIdSummaryMap 汇总Map，key为入库单明细的unique_id（即收货单明细的in_unique_id），value为字段汇总Map + */ + private void processReceiptDetailPOForSync(ReceiptMaterialDetailPO receiptDetail, + Map> uniqueIdSummaryMap) { + if (receiptDetail == null || receiptDetail.getInUniqueId() == null) { + return; + } + + // 使用in_unique_id作为key，因为这是关联到入库单明细的unique_id + Long uniqueId = receiptDetail.getInUniqueId(); + Map summary = uniqueIdSummaryMap.computeIfAbsent(uniqueId, k -> new HashMap<>()); + + // 汇总收货数量 + BigDecimal receiptQuantity = summary.getOrDefault("receiptQuantity", BigDecimal.ZERO); + BigDecimal newReceiptQuantity = receiptDetail.getReceiptQuantity() != null ? receiptDetail.getReceiptQuantity() : BigDecimal.ZERO; + summary.put("receiptQuantity", receiptQuantity.add(newReceiptQuantity)); + + // 汇总总毛重 + BigDecimal totalGrossWeight = summary.getOrDefault("totalGrossWeight", BigDecimal.ZERO); + BigDecimal newGrossWeight = receiptDetail.getTotalGrossWeight() != null ? receiptDetail.getTotalGrossWeight() : BigDecimal.ZERO; + summary.put("totalGrossWeight", totalGrossWeight.add(newGrossWeight)); + + // 汇总总净重 + BigDecimal totalNetWeight = summary.getOrDefault("totalNetWeight", BigDecimal.ZERO); + BigDecimal newNetWeight = receiptDetail.getTotalNetWeight() != null ? receiptDetail.getTotalNetWeight() : BigDecimal.ZERO; + summary.put("totalNetWeight", totalNetWeight.add(newNetWeight)); + + // 汇总总面积 + BigDecimal totalArea = summary.getOrDefault("totalArea", BigDecimal.ZERO); + BigDecimal newArea = receiptDetail.getTotalArea() != null ? receiptDetail.getTotalArea() : BigDecimal.ZERO; + summary.put("totalArea", totalArea.add(newArea)); + + // 汇总总体积 + BigDecimal totalVolume = summary.getOrDefault("totalVolume", BigDecimal.ZERO); + BigDecimal newVolume = receiptDetail.getTotalVolume() != null ? receiptDetail.getTotalVolume() : BigDecimal.ZERO; + summary.put("totalVolume", totalVolume.add(newVolume)); + + // 递归处理子明细 + if (!CollectionUtils.isEmpty(receiptDetail.getChildren())) { + for (ReceiptMaterialDetailPO child : receiptDetail.getChildren()) { + processReceiptDetailPOForSync(child, uniqueIdSummaryMap); + } + } + } + /** * @param stockReceiptOrderDO * @return StockReceiptOrder From 3d35fef0e88ef84e3724f681d81346705a801073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 11 Feb 2026 15:57:53 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E5=B7=B2=E5=88=86=E9=85=8D=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E6=98=8E=E7=BB=86=E4=B8=8D=E5=86=8D=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=BA=93=E5=AD=98;=E6=8B=A3=E8=B4=A7?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=BB=8E=E7=B4=AF=E5=8A=A0=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E8=A6=86=E7=9B=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/OutMaterialDetailImpl.java | 5 +++++ .../pickingMaterialDetail/entity/PickingMaterialDetail.java | 4 ++++ .../repository/persistence/PickingMaterialDetailImpl.java | 2 +- .../repository/po/PickingMaterialDetailPO.java | 4 ++++ .../repository/todo/PickingMaterialDetailDO.java | 4 ++++ .../pickingOrder/service/PickingOrderDomainService.java | 3 ++- 6 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java index dd780143c..3b32aeacb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java @@ -415,6 +415,11 @@ public class OutMaterialDetailImpl extends ServiceImpl outMaterialDetailList,String outOrderNumber,LoginUser loginUser) { StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper().lambda().eq(StockOutOrder::getOutOrderNumber, outOrderNumber)); for (OutMaterialDetail outMaterialDetail : outMaterialDetailList) { + BigDecimal alreadyAllocationQuantity = outMaterialDetail.getAlreadyAllocationQuantity(); + // 如果已经分配数量大于0，则跳过本次循环（该明细已分配过，不再重复处理） + if (alreadyAllocationQuantity != null && alreadyAllocationQuantity.compareTo(BigDecimal.ZERO) > 0) { + continue; + } Long materialInventoryId = outMaterialDetail.getMaterialInventoryId(); BigDecimal allocationQuantity = outMaterialDetail.getAllocationQuantity(); if (ObjectUtils.isEmpty(allocationQuantity)) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java index 3ac13f27b..18c33fea3 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java @@ -84,6 +84,10 @@ public class PickingMaterialDetail extends BaseVOEntity { @Excel(name = "拣货数量") private BigDecimal pickingQuantity; + @ApiModelProperty("已拣货数量") + @Excel(name = "已拣货数量") + private BigDecimal alreadyPickingQuantity; + @ApiModelProperty("包装规格id") @Excel(name = "包装规格id") private Long packId; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java index 3757a1f66..bc752b04c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/persistence/PickingMaterialDetailImpl.java @@ -148,7 +148,7 @@ public class PickingMaterialDetailImpl extends ServiceImpl Date: Wed, 11 Feb 2026 17:07:01 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=8A=E6=9E=B6=E6=95=B0=E9=87=8F=EF=BC=8C=E4=B8=8A?= =?UTF-8?q?=E6=9E=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StockReceiptOrderApplicationService.java | 9 +- .../StockShelfOrderApplicationService.java | 9 +- .../service/StockShelfOrderDomainService.java | 90 +++++++++++++++++++ .../ShelfMaterialDetailDTO.java | 16 ++++ .../ShelfMaterialDetailMapper.xml | 6 +- 5 files changed, 115 insertions(+), 15 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java index b304fb3a6..d3333ed15 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java @@ -99,15 +99,10 @@ public class StockReceiptOrderApplicationService { try { AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); if (associationWarehouseCacheDO != null) { - if (associationWarehouseCacheDO.getWarehouseId() != null) { + // 如果前端没有传仓库ID，则使用关联仓库ID；前端传了则以前端为准 + if (stockReceiptOrderDO.getWarehouseId() == null && associationWarehouseCacheDO.getWarehouseId() != null) { stockReceiptOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseCode())) { - stockReceiptOrderDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseName())) { - stockReceiptOrderDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); - } } } catch (Exception e) { // 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库） diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 370aa48a4..22acbc228 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -105,15 +105,10 @@ public class StockShelfOrderApplicationService { try { AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); if (associationWarehouseCacheDO != null) { - if (associationWarehouseCacheDO.getWarehouseId() != null) { + // 如果前端没有传仓库ID，则使用关联仓库ID；前端传了则以前端为准 + if (stockShelfOrderDO.getWarehouseId() == null && associationWarehouseCacheDO.getWarehouseId() != null) { stockShelfOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseCode())) { - stockShelfOrderDO.setWarehouseCode(associationWarehouseCacheDO.getWarehouseCode()); - } - if (StringUtils.isNotBlank(associationWarehouseCacheDO.getWarehouseName())) { - stockShelfOrderDO.setWarehouseName(associationWarehouseCacheDO.getWarehouseName()); - } } } catch (Exception e) { // 如果获取仓库信息失败，记录日志但不影响查询（允许查询所有仓库） diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java index c641472fb..9b61417b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java @@ -22,6 +22,8 @@ import com.mhd.wms.domain.containerUsageRecord.repository.facade.IContainerUsage import com.mhd.wms.domain.containerUsageRecord.repository.todo.ContainerUsageRecordDO; import com.mhd.wms.domain.deliveTask.repository.facade.IDeliveTaskService; import com.mhd.wms.domain.deliveTask.repository.todo.DeliveTaskDO; +import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; +import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.facade.IInMaterialDetailSerialNumberService; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.po.InMaterialDetailSerialNumberPO; import com.mhd.wms.domain.inMaterialDetailSerialNumber.repository.todo.InMaterialDetailSerialNumberDO; @@ -93,6 +95,8 @@ public class StockShelfOrderDomainService { @Autowired private IMaterialBaseInfoService materialBaseInfoService; @Autowired + private IInMaterialDetailService inMaterialDetailService; + @Autowired private IInMaterialDetailSerialNumberService inMaterialDetailSerialNumberService; @Autowired private IStockInTaskOrderService stockInTaskOrderService; @@ -299,6 +303,8 @@ public class StockShelfOrderDomainService { genContainerUsageRecord(stockShelfOrderDO); //修改物料明细信息 shelfMaterialDetailService.batchShelfUpdate(stockShelfOrderDO); + //同步更新入库单明细的上架数量/上架状态 + syncShelvesQuantityToInMaterialDetail(stockShelfOrderDO); //生成 上架作业单 genStockShelfTaskOrderByUpShelf(stockShelfOrderDO); //修改入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 @@ -309,6 +315,90 @@ public class StockShelfOrderDomainService { return updateStockShelfOrder(stockShelfOrderDO, stockShelfOrderPO); } + /** + * @description 上架数量同步更新到入库单明细中（累计值） + * @author Auto + * @date 2026/2/11 + */ + private void syncShelvesQuantityToInMaterialDetail(StockShelfOrderDO stockShelfOrderDO) { + List detailDOList = stockShelfOrderDO.getMaterialDetailList(); + if (CollectionUtils.isEmpty(detailDOList)) { + return; + } + LoginUser loginUser = SecurityUtils.getLoginUser(); + + // 收集所有需要同步的入库单明细 uniqueId（inUniqueId） + Set inUniqueIdSet = new HashSet<>(); + for (ShelfMaterialDetailDO d : detailDOList) { + // 只处理一级明细（子级是拆分库位的记录，不作为入库单明细的累计口径） + if (d.getLevel() != null && d.getLevel() == 2) { + continue; + } + if (d.getInUniqueId() != null) { + inUniqueIdSet.add(d.getInUniqueId()); + } + } + if (inUniqueIdSet.isEmpty()) { + return; + } + + // 从数据库查询所有相关的上架明细，按 inUniqueId 汇总本次上架数量（shelvesQuantity） + // 这样可以确保即使一个入库单明细对应多个上架明细（多次上架），也能正确同步 + Map shelvesQuantityMap = new HashMap<>(); + Map shelvesStatusMap = new HashMap<>(); + + for (Long inUniqueId : inUniqueIdSet) { + ShelfMaterialDetailDO queryDO = new ShelfMaterialDetailDO(); + queryDO.setInUniqueId(inUniqueId); + queryDO.setLevel(1); // 只查询一级明细 + List shelfDetailPOList = shelfMaterialDetailService.queryList(queryDO); + + if (!CollectionUtils.isEmpty(shelfDetailPOList)) { + BigDecimal totalShelvesQty = BigDecimal.ZERO; + Integer maxShelvesStatus = null; + + for (ShelfMaterialDetailPO po : shelfDetailPOList) { + // 汇总本次上架数量（shelvesQuantity） + BigDecimal shelvesQty = po.getShelvesQuantity(); + if (shelvesQty != null && shelvesQty.compareTo(BigDecimal.ZERO) > 0) { + totalShelvesQty = totalShelvesQty.add(shelvesQty); + } + + // 取最大的上架状态（3-已上架 > 2-上架中 > 1-待上架） + Integer status = po.getShelvesStatus(); + if (status != null) { + if (maxShelvesStatus == null || status > maxShelvesStatus) { + maxShelvesStatus = status; + } + } + } + + shelvesQuantityMap.put(inUniqueId, totalShelvesQty); + if (maxShelvesStatus != null) { + shelvesStatusMap.put(inUniqueId, maxShelvesStatus); + } + } + } + + // 更新入库单明细的上架数量和上架状态 + Date now = new Date(); + for (Long inUniqueId : inUniqueIdSet) { + BigDecimal shelvesQty = shelvesQuantityMap.getOrDefault(inUniqueId, BigDecimal.ZERO); + Integer shelvesStatus = shelvesStatusMap.get(inUniqueId); + + // 仅更新与上架相关字段 + inMaterialDetailService.update(null, new UpdateWrapper().lambda() + .set(InMaterialDetail::getShelvesQuantity, shelvesQty) + .set(shelvesStatus != null, InMaterialDetail::getShelvesStatus, shelvesStatus) + .set(InMaterialDetail::getUpdateBy, loginUser.getUserid()) + .set(InMaterialDetail::getUpdateByName, loginUser.getUsername()) + .set(InMaterialDetail::getUpdateTime, now) + .eq(InMaterialDetail::getUniqueId, inUniqueId) + .eq(StringUtils.isNotBlank(stockShelfOrderDO.getInOrderNumber()), InMaterialDetail::getInOrderNumber, stockShelfOrderDO.getInOrderNumber()) + ); + } + } + /** * @description 设置上架单上架需要更新的数据数据 * @author ZhouGY diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java index 7c3d7b986..54b6726a8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java @@ -313,4 +313,20 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "ExtAttr4", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date extAttr4; + + @ApiModelProperty("总净重(KG)") + @Excel(name = "总净重(KG)") + private BigDecimal totalNetWeight; + + @ApiModelProperty("总毛重(KG)") + @Excel(name = "总毛重(KG)") + private BigDecimal totalGrossWeight; + + @ApiModelProperty("总体积(CBM)") + @Excel(name = "总体积(CBM)") + private BigDecimal totalVolume; + + @ApiModelProperty("总面积(SQM)") + @Excel(name = "总面积(SQM)") + private BigDecimal totalArea; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml index b2a731d32..8cba1db60 100644 --- a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml @@ -67,7 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area from shelf_material_detail + select material_detail_id, organization_id, organization_name, top_organization_id, unique_id, shelf_order_number, material_base_info_id, material_code, material_name, bar_code, quantity, already_shelves_quantity, shelves_quantity, shelves_status, pack_id, pack_code, pack_name, + CASE + WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL + ELSE CAST(pack_detail_id AS BIGINT) + END as pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area from shelf_material_detail From 3c3c21f02e01bbdc13412735cc9ab96980a7232a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Thu, 12 Feb 2026 10:10:09 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E4=B8=8D=E6=A0=B9=E6=8D=AE=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BA=BA=E8=8E=B7=E5=8F=96=E4=BB=93=E5=BA=93id=20?= =?UTF-8?q?=E7=94=A8=E5=89=8D=E7=AB=AF=E4=BC=A0=E7=9A=84;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickingOrder/PickingOrderApplicationService.java | 6 +++--- .../service/StockReceiptOrderDomainService.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index c6049a450..a4237991d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -66,8 +66,8 @@ public class PickingOrderApplicationService { if (topOrganizationId != null && topOrganizationId != 1){ pickingOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); } - AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); - pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); + //AssociationWarehouseCacheDO associationWarehouseCacheDO = SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid()); + //pickingOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId()); } List pickingOrderPOList = pickingOrderDomainService.queryList(pickingOrderDO); @@ -583,4 +583,4 @@ public class PickingOrderApplicationService { returnPickingOrderDO.setMaterialDetailList(returnPickingMaterialDetailDOList); return returnPickingOrderDO; } -} +} \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java index 9df36dfb3..3f1e1d161 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java @@ -332,7 +332,10 @@ public class StockReceiptOrderDomainService { public Boolean taskDistribution(StockReceiptOrderDO stockReceiptOrderDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); StockReceiptOrderDO stockReceiptOrderDOQuery = new StockReceiptOrderDO(); - stockReceiptOrderDOQuery.setReceiptOrderIds(stockReceiptOrderDO.getReceiptOrderIds()); + List receiptOrderIds = stockReceiptOrderDO.getReceiptOrderIds(); + if (receiptOrderIds == null || receiptOrderIds.size() == 0) { + throw new ServiceException("未选择收货单,或收货单不存在"); + } stockReceiptOrderDOQuery.setTaskDistribution(2); List stockReceiptOrderPOList = stockReceiptOrderService.queryList(stockReceiptOrderDOQuery); if (CollectionUtils.isEmpty(stockReceiptOrderPOList)) {