From 28d6f88c4122d6276c8e9dd6a817c4b3675551aa Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 26 五月 2026 09:24:09 +0800
Subject: [PATCH] feat:1.销售采购合同按照录入日期生成 2.采购合同号按照录入日期生成

---
 src/main/resources/mapper/production/ProductionOrderPickMapper.xml |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
index 7dd8a1f..8b0a0d7 100644
--- a/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOrderPickMapper.xml
@@ -17,12 +17,17 @@
         <result column="operation_name" property="operationName" />
         <result column="technology_operation_id" property="technologyOperationId" />
         <result column="demanded_quantity" property="demandedQuantity" />
+        <result column="feeding_qty" property="feedingQty" />
+        <result column="return_qty" property="returnQty" />
+        <result column="actual_qty" property="actualQty" />
+        <result column="is_returned" property="returned" />
         <result column="is_bom" property="bom" />
     </resultMap>
 
     <select id="listPickedDetailByOrderId" resultType="com.ruoyi.production.bean.vo.ProductionOrderPickVo">
         select pop.*,
                pop.is_bom as bom,
+               pop.is_returned as returned,
                pop.quantity as pickQuantity,
                p.product_name as productName,
                pm.model as model,

--
Gitblit v1.9.3