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

PDA复核查询修改

Browse Source
This commit is contained in:
秦鸿展
2026-03-15 15:55:34 +08:00
parent 1d3924d3ce
commit 187a716175
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java
+2 -2
View File
@@ -506,9 +506,9 @@ public class StockOutOrderDomainService {
if (stockOutOrder == null) { if (stockOutOrder == null) {
throw new ServiceException("出库单不存在"); throw new ServiceException("出库单不存在");
} }
// 复核场景：与PC端getCheckInfo保持一致，返回拣货下发的完整数据 // 复核场景：与PC端getCheckInfo保持一致，返回拣货下发的完整数据（含历史记录 status=9 已出库，与列表详情一致）
if (stockOutOrder.getReview() != null && stockOutOrder.getReview() == 1 if (stockOutOrder.getReview() != null && stockOutOrder.getReview() == 1
&& stockOutOrder.getStatus() != null && (stockOutOrder.getStatus() == 7 || stockOutOrder.getStatus() == 8)) { && stockOutOrder.getStatus() != null && (stockOutOrder.getStatus() == 7 || stockOutOrder.getStatus() == 8 || stockOutOrder.getStatus() == 9)) {
StockOutOrderDO stockOutOrderDO = new StockOutOrderDO(); StockOutOrderDO stockOutOrderDO = new StockOutOrderDO();
stockOutOrderDO.setOutOrderNumber(stockOutOrder.getOutOrderNumber()); stockOutOrderDO.setOutOrderNumber(stockOutOrder.getOutOrderNumber());
StockOutOrderPO stockOutOrderPO = getCheckInfo(stockOutOrderDO); StockOutOrderPO stockOutOrderPO = getCheckInfo(stockOutOrderDO);
mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml
+2 -1
View File
@@ -32,7 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectPickingOrderPo"> <sql id="selectPickingOrderPo">
a.picking_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.order_number, a.picking_order_number, a.picking_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.order_number, a.picking_order_number,
a.status, a.type, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.quantity, a.weight_limit, a.volume_limit, a.material_quantity, a.status, a.type, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_name, a.quantity, a.weight_limit, a.volume_limit, a.material_quantity,
a.picking_quantity, a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, IFNULL((SELECT SUM(b.picking_quantity) FROM picking_material_detail b WHERE b.picking_order_number = a.picking_order_number AND b.del_flag = 1), 0) AS picking_quantity,
a.picking_material_quantity, a.abnormal, a.task_distribution, 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 a.update_by, a.update_by_name, a.del_flag
</sql> </sql>