From 6be17495cd29ba8b28af35da7ba171cbc0d61c21 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 12 六月 2026 14:18:49 +0800
Subject: [PATCH] 根据单个员工计算工资
---
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index aa73dac..511dcd3 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -72,6 +72,8 @@
slp.product_category,
slp.specification_model,
slp.unit,
+ slp.product_model_id,
+ COALESCE(spd.stock_type, slp.stock_type, 'qualified') AS stock_type,
sor.outbound_batches,
sor.stock_out_num,
sor.batch_no,
@@ -97,6 +99,7 @@
si.id = #{shippingId}
</if>
</where>
+ order by sor.id
</select>
<select id="getShippingInfoByCustomerName" resultType="com.ruoyi.sales.pojo.ShippingInfo">
select * from shipping_info si
--
Gitblit v1.9.3