回显成品物料;

This commit is contained in:
王奎兴
2026-06-23 10:15:52 +08:00
parent 32efb1dfe5
commit f32f5b48bc
2 changed files with 8 additions and 1 deletions
@@ -166,4 +166,6 @@ public class PickingOrderPO extends StockOutOrderBasePO {
@ApiModelProperty("规格型号")
@Excel(name = "规格型号")
private String specificationModel;
@ApiModelProperty("货物类型 0-物料 1-半成品 2-成品")
private Integer goodsType;
}
@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pushTime" column="push_time" />
<result property="pushBy" column="push_by" />
<result property="pushByName" column="push_by_name" />
<result property="goodsType" column="goods_type" />
</resultMap>
@@ -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
</sql>
<sql id="selectPickingOrderPo1">