From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口,销售台账查询其产品的状态 2.增添不合格现象字段,取消生产状态字段 3.修改发货审批接口,发货审批通过,生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入,产出2:1调整

---
 src/main/resources/mapper/production/ProductStructureMapper.xml |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index bf69ed9..df5a966 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -2,15 +2,29 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.production.mapper.ProductStructureMapper">
 
+    <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductStructure">
+        <id property="id" column="id"/>
+        <result property="productModelId" column="product_model_id"/>
+        <result property="processId" column="process_id"/>
+        <result property="unitQuantity" column="unit_quantity"/>
+        <result property="demandedQuantity" column="demanded_quantity"/>
+        <result property="unit" column="unit"/>
+        <result property="diskQuantity" column="disk_quantity"/>
+        <result property="tenantId" column="tenant_id"/>
+    </resultMap>
 
-    <select id="listByProductId" resultType="com.ruoyi.production.pojo.ProductStructure">
+    <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
         select ps.*,
-        p.product_name as product_name,
-        pp.name as  process_name
+               p.product_name,
+               pp.name as  process_name,
+               pm.product_id,
+               pm.model
         from
-        product_structure ps
-        left join product p on ps.process_id = p.id
-        left join product_process pp on ps.process_id = pp.process_id
-        where p.id = #{productId}
+            product_structure ps
+                left join product_model pm on ps.product_model_id = pm.id
+                left join product p on pm.product_id = p.id
+                left join product_process pp on ps.process_id = pp.id
+        where ps.parent_id = #{productModelId}
+        order by ps.id
     </select>
 </mapper>

--
Gitblit v1.9.3