From f32f5b48bce93ce9b8b7078de9ab55b93ece2e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 10:15:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=88=90=E5=93=81=E7=89=A9?= =?UTF-8?q?=E6=96=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/pickingOrder/repository/po/PickingOrderPO.java | 2 ++ .../resources/mapper/pickingOrder/PickingOrderMapper.xml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java index 11aafedc9..02fa68661 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java @@ -166,4 +166,6 @@ public class PickingOrderPO extends StockOutOrderBasePO { @ApiModelProperty("规格型号") @Excel(name = "规格型号") private String specificationModel; + @ApiModelProperty("货物类型 0-物料 1-半成品 2-成品") + private Integer goodsType; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index a28914e82..4a994e99e 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -46,7 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name - ,a.push_status,a.push_time,a.push_by,a.push_by_name + ,a.push_status,a.push_time,a.push_by,a.push_by_name, + (SELECT m.goods_type FROM PICKING_MATERIAL_DETAIL d + JOIN material_base_info m ON d.material_base_info_id = m.material_base_info_id + WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER AND d.level = 1 + LIMIT 1) AS goods_type