weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WMS拣货单管理拣货修改

Browse Source
This commit is contained in:
秦鸿展
2026-02-26 14:39:59 +08:00
parent 83470dbf64
commit 33575a102c
3 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-modules/mhd-system/src/main/resources/mapper/basic/ContractManageMapper.xml
+1 -1
View File
@@ -11,7 +11,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from contract_manage
where
del_flag = 1
order by create_time desc
</sql>
<sql id="selectContractManagePo1">
@@ -116,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultType="com.mhd.basic.domain.contractManage.repository.po.ContractManagePO">
<include refid="selectContractManagePo"/>
<include refid="common_where"/>
order by create_time desc
</select>
mhd-modules/mhd-system/src/main/resources/mapper/basic/ExpenseAccountMapper.xml
+8 -1
View File
@@ -145,7 +145,14 @@
<sql id="common_where_two">
<if test="expenseAccountDO.topOrganizationId != null ">
<!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
<!-- 如果 organizationId 和 topOrganizationId 都为 null，表示查询所有组织的数据（不添加组织过滤条件） -->
<if test="expenseAccountDO.organizationId != null">
<!-- 如果设置了 organizationId，添加 organization_id 条件 -->
and organization_id = #{expenseAccountDO.organizationId}
</if>
<if test="expenseAccountDO.topOrganizationId != null and expenseAccountDO.organizationId == null">
<!-- 如果设置了 topOrganizationId 但没有设置 organizationId，添加 top_organization_id 条件 -->
and top_organization_id = #{expenseAccountDO.topOrganizationId}
</if>
</sql>
mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java
+39
View File
@@ -24,6 +24,10 @@ import com.mhd.wms.domain.pickingMaterialDetail.service.PickingMaterialDetailDom
import com.mhd.wms.domain.pickingOrder.repository.po.PickingOrderPO;
import com.mhd.wms.domain.pickingOrder.repository.todo.PickingOrderDO;
import com.mhd.wms.domain.pickingOrder.service.PickingOrderDomainService;
import com.mhd.wms.domain.outMaterialDetail.repository.facade.IOutMaterialDetailService;
import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,6 +57,8 @@ public class PickingOrderApplicationService {
private UserServiceFeign userServiceFeign;
@Autowired
private SystemServiceFeign systemServiceFeign;
@Autowired
private IOutMaterialDetailService outMaterialDetailService;
/**
@@ -611,10 +617,43 @@ public class PickingOrderApplicationService {
PickingMaterialDetailDO returnPickingMaterialDetailDO = new PickingMaterialDetailDO();
BeanUtils.copyProperties(pickingMaterialDetailPO, returnPickingMaterialDetailDO);
returnPickingMaterialDetailDO.setActualQuantity(pickingMaterialDetailDO.getActualQuantity());
// 毛重、净重、面积、体积：如果前端传递了值，使用前端传递的值（允许修改）；否则从出库单明细中自动带出
Long outUniqueId = pickingMaterialDetailPO.getOutUniqueId();
OutMaterialDetail outMaterialDetail = null;
if (outUniqueId != null) {
outMaterialDetail = outMaterialDetailService.getOne(new QueryWrapper<OutMaterialDetail>().lambda()
.eq(OutMaterialDetail::getUniqueId, outUniqueId)
.eq(OutMaterialDetail::getDelFlag, 1));
}
// 总面积：优先使用前端传递的值，如果为空则从出库单明细中获取
if (pickingMaterialDetailDO.getTotalArea() != null) {
returnPickingMaterialDetailDO.setTotalArea(pickingMaterialDetailDO.getTotalArea());
} else if (outMaterialDetail != null && outMaterialDetail.getTotalArea() != null) {
returnPickingMaterialDetailDO.setTotalArea(outMaterialDetail.getTotalArea());
}
// 总体积：优先使用前端传递的值，如果为空则从出库单明细中获取
if (pickingMaterialDetailDO.getTotalVolume() != null) {
returnPickingMaterialDetailDO.setTotalVolume(pickingMaterialDetailDO.getTotalVolume());
} else if (outMaterialDetail != null && outMaterialDetail.getTotalVolume() != null) {
returnPickingMaterialDetailDO.setTotalVolume(outMaterialDetail.getTotalVolume());
}
// 总毛重：优先使用前端传递的值，如果为空则从出库单明细中获取
if (pickingMaterialDetailDO.getTotalGrossWeight() != null) {
returnPickingMaterialDetailDO.setTotalGrossWeight(pickingMaterialDetailDO.getTotalGrossWeight());
} else if (outMaterialDetail != null && outMaterialDetail.getTotalGrossWeight() != null) {
returnPickingMaterialDetailDO.setTotalGrossWeight(outMaterialDetail.getTotalGrossWeight());
}
// 总净重：优先使用前端传递的值，如果为空则从出库单明细中获取
if (pickingMaterialDetailDO.getTotalNetWeight() != null) {
returnPickingMaterialDetailDO.setTotalNetWeight(pickingMaterialDetailDO.getTotalNetWeight());
} else if (outMaterialDetail != null && outMaterialDetail.getTotalNetWeight() != null) {
returnPickingMaterialDetailDO.setTotalNetWeight(outMaterialDetail.getTotalNetWeight());
}
//是否开启了序列号管理
if (pickingMaterialDetailPO.getSerialNumberManage() == 1){
if (CollectionUtils.isEmpty(pickingMaterialDetailDO.getMaterialDetailSerialNumberList())){