From fe64550350767fab3c52f67cdb960e310a052d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Mon, 26 May 2025 18:31:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=86=85=E9=85=8D=E6=8A=A5?=
 =?UTF-8?q?=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gj_erp/controller/zyjh/dto/YppDto.java    |  2 ++
 .../resources/mappers/zyjh/YppyzMapper.xml    | 30 +++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YppDto.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YppDto.java
index 0ceff86..eb25037 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YppDto.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/dto/YppDto.java
@@ -29,6 +29,8 @@ public class YppDto {
 
     private String xj;
 
+    private String length;
+
     private Integer dwxxId;//配盘原则预设摆放位置信息
 
     private List<DmYdjhLj> ljList;
diff --git a/src/main/resources/mappers/zyjh/YppyzMapper.xml b/src/main/resources/mappers/zyjh/YppyzMapper.xml
index bb9dc56..51e43dc 100644
--- a/src/main/resources/mappers/zyjh/YppyzMapper.xml
+++ b/src/main/resources/mappers/zyjh/YppyzMapper.xml
@@ -10,6 +10,7 @@
         <result column="zl" property="zl" />
         <result column="kw" property="kw" />
         <result column="lx" property="lx" />
+        <result column="length" property="length" />
         <collection property="ljList" ofType="dmYdjhLj" columnPrefix="lj_">
             <id column="id" property="id" />
             <result column="czbh" property="czbh" />
@@ -46,12 +47,12 @@
 
     <select id="wbfList" resultMap="bgListResult">
         SELECT
-            a.dc_ch ,a.dc_pl ,b.fd as dc_fd, b.zl ,b.kw,b.lx ,c.dwxx_id,
+            a.dc_ch ,a.dc_pl ,b.fd as dc_fd, b.zl ,b.kw,b.lx ,
+            (select count(1) from dm_bom where dcch=a.dc_pl and pl=a.DC_FD and fd=a.DC_FD and zl=a.zl and kw=a.kw and lx=b.lx ) as length
             b.id lj_id,b.czbh lj_czbh,b.pl lj_pl,b.fd lj_fd,b.tlth lj_tlth,b.ljbh lj_ljbh,b.qq lj_qq,b.dw lj_dw,b.lx lj_lx,
             b.ppzt lj_ppzt
         from
             dm_ydjh a left join dm_ydjh_lj b on a.dc_ch =b.czbh and a.dc_pl =b.pl and a.tzbh =b.tlth
-            left join dm_yppyz c on b.lx=c.lx and b.zl =b.zl AND b.kw =c.kw
         WHERE
             a.zt>=62  and isnull(b.lx,'')!=''
             <if test="zt==null or zt==''">
@@ -68,4 +69,29 @@
             </if>
             order by a.dc_ch ,a.dc_pl
     </select>
+
+    <select id="wbfList_bak" resultMap="bgListResult">
+        SELECT
+        a.dc_ch ,a.dc_pl ,b.fd as dc_fd, b.zl ,b.kw,b.lx ,c.dwxx_id,
+        b.id lj_id,b.czbh lj_czbh,b.pl lj_pl,b.fd lj_fd,b.tlth lj_tlth,b.ljbh lj_ljbh,b.qq lj_qq,b.dw lj_dw,b.lx lj_lx,
+        b.ppzt lj_ppzt
+        from
+        dm_ydjh a left join dm_ydjh_lj b on a.dc_ch =b.czbh and a.dc_pl =b.pl and a.tzbh =b.tlth
+        left join dm_yppyz c on b.lx=c.lx and b.zl =b.zl AND b.kw =c.kw
+        WHERE
+        a.zt>=62  and isnull(b.lx,'')!=''
+        <if test="zt==null or zt==''">
+            and b.ppzt &lt;'04'
+        </if>
+        <if test="zt=='04'">
+            and b.ppzt ='04'
+        </if>
+        <if test="dcCh!=null and dcCh!=''">
+            and a.dc_ch=#{dcCh}
+        </if>
+        <if test="zyq!=null and zyq!=''">
+            and a.zyq1=#{zyq}
+        </if>
+        order by a.dc_ch ,a.dc_pl
+    </select>
 </mapper>