From ef0e459a63dba418a280bbbb85a56068bfda46df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Wed, 26 Mar 2025 17:51:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E4=BD=9C=E4=B8=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=A7=E8=A1=8C=E6=97=B6=E5=85=B3=E8=81=94pdf?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8D=95=E6=8D=AE=E5=8F=B7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8A=9F=E8=83=BD=E5=8F=AF=E8=83=BD=E4=BC=9A=E7=94=B1?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E5=8A=9F=E8=83=BD=E5=BC=95=E5=8F=91=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84sql=202.=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=96=99?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=89=A7=E8=A1=8C=E6=97=B6=E5=85=B3=E8=81=94?=
 =?UTF-8?q?pdf=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=8D=95=E6=8D=AE=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/zyjh/ZyjhController.java       | 32 +++++++--------
 .../dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java |  3 ++
 .../dsic/gj_erp/service/zyjh/ZyjhService.java |  8 ++++
 .../resources/mappers/jhgk/DmYdjhMapper.xml   | 40 ++++++++++++++++++-
 4 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
index 2ed7981..38d9520 100644
--- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java
@@ -522,22 +522,22 @@ public class ZyjhController {
      */
     @PostMapping("sljh")
     public ResultBean<?> sljh(@RequestBody SljhSearch search){
-        String date = DateUtil.date().toString("yyyy/MM/dd");
-        if (StrUtil.isAllNotEmpty(search.getSljhrq())){
-            date=search.getSljhrq();
-        }
-        List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>lambdaQuery()
-//                .le(DmYdjh::getSljhrq, date)
-                .eq(StrUtil.isNotEmpty(search.getZt()),DmYdjh::getZt, search.getZt())
-                .eq(StrUtil.isNotEmpty(search.getSllsh()),DmYdjh::getSllsh, search.getSllsh())
-                .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch())
-                .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())
-                .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw())
-                .eq(StrUtil.isNotEmpty(search.getZylx()),DmYdjh::getZylx, search.getZylx())
-                        .likeRight(StrUtil.isNotEmpty(search.getSlkcdw()),DmYdjh::getSlkcdw,search.getSlkcdw())
-                .orderByAsc(DmYdjh::getDjh)
-        );
-        return new ResultBean<>(list);
+//        String date = DateUtil.date().toString("yyyy/MM/dd");
+//        if (StrUtil.isAllNotEmpty(search.getSljhrq())){
+//            date=search.getSljhrq();
+//        }
+//        List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>lambdaQuery()
+////                .le(DmYdjh::getSljhrq, date)
+//                .eq(StrUtil.isNotEmpty(search.getZt()),DmYdjh::getZt, search.getZt())
+//                .eq(StrUtil.isNotEmpty(search.getSllsh()),DmYdjh::getSllsh, search.getSllsh())
+//                .eq(StrUtil.isNotEmpty(search.getDcch()),DmYdjh::getDcCh, search.getDcch())
+//                .eq(StrUtil.isNotEmpty(search.getDcPl()),DmYdjh::getDcPl, search.getDcPl())
+//                .eq(StrUtil.isNotEmpty(search.getKw()),DmYdjh::getKw, search.getKw())
+//                .eq(StrUtil.isNotEmpty(search.getZylx()),DmYdjh::getZylx, search.getZylx())
+//                .likeRight(StrUtil.isNotEmpty(search.getSlkcdw()),DmYdjh::getSlkcdw,search.getSlkcdw())
+//                .orderByAsc(DmYdjh::getDjh)
+//        );
+        return new ResultBean<>(zyjhService.getSljhWithDjh(search));
     }
 
     /**
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
index 9985b30..db33f0e 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java
@@ -6,6 +6,7 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.*;
+import com.dsic.gj_erp.controller.zyjh.dto.SljhSearch;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +23,8 @@ import java.util.Map;
  */
 public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
+    List<DmYdjh> getSljhWithDjh(SljhSearch search);
+
     int getNotPPLjCount(String dcch,String pl,String fd);
 
     List<DmYdjh> getWithDjh(Integer zt,String zyq);
diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
index 0f1e0c6..fe58fd8 100644
--- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
+++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java
@@ -16,6 +16,7 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.zyjh.DmYppyz;
 import com.dsic.gj_erp.controller.zyjh.dto.PgWithPcDto;
 import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
+import com.dsic.gj_erp.controller.zyjh.dto.SljhSearch;
 import com.dsic.gj_erp.dao.zyjh.PPBGongDto;
 import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmBzryService;
@@ -43,6 +44,13 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     private static final String MPDHSJ_KEY="MPDHSJ";
 
+    /**
+     * 获取带单据号的上料计划,单据号从pdf二维码表中查询
+     */
+    public List<DmYdjh> getSljhWithDjh(SljhSearch search){
+        return baseMapper.getSljhWithDjh(search);
+    }
+
     public void ppbg(Integer id){
         yppyzService.update(new UpdateWrapper<DmYppyz>().set("status","已配送").eq("id",id));
     }
diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
index 3e9ba78..3dee48f 100644
--- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml
@@ -1182,7 +1182,7 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
     <select id="getWithDjh" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
         select
-            b.print_id as djh,
+            case when isnull(a.djh,'')!='' then a.djh else b.print_id end as djh,
             a.id,a.dc_ch,a.dc_ch1,a.dc_pl,a.LQLB,a.tzbh,a.wpgg,a.wpxh,a.hxcd,a.qgcd,a.qbs,a.pklx,a.pkcd,a.ljsl,a.zl,a.lx,a.xcms,
             a.kw,a.slrq,a.slry,a.pw,a.pwry,a.pwrq,a.hxsb,a.hxry,a.hxrq,a.qgsb,a.qgry,a.qgrq,a.dmcd,a.dmsb,a.dmry,a.dmrq,a.pwsb,
             a.pksb,a.pkry,a.pkrq,a.DC_FD,a.gjjs_dz,a.gjjs_xz,a.jsq_tlt,a.jsq_lqb,a.dhqd,a.order_bs,a.arrival_bs,a.qy,a.jzbs,a.jzsb,
@@ -1224,6 +1224,44 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
           and not EXISTS (SELECT czbh,tlth from dm_ydjh_lj b where a.dcch=b.czbh and a.tzbh=b.tlth and isnull(b.qq,'')!='' and isnull(b.dw,'')!='')
     </select>
 
+    <select id="getSljhWithDjh" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjh">
+        select
+            case when isnull(a.djh,'')!='' then a.djh else b.print_id end as djh,
+            a.id,a.dc_ch,a.dc_ch1,a.dc_pl,a.LQLB,a.tzbh,a.wpgg,a.wpxh,a.hxcd,a.qgcd,a.qbs,a.pklx,a.pkcd,a.ljsl,a.zl,a.lx,a.xcms,
+            a.kw,a.slrq,a.slry,a.pw,a.pwry,a.pwrq,a.hxsb,a.hxry,a.hxrq,a.qgsb,a.qgry,a.qgrq,a.dmcd,a.dmsb,a.dmry,a.dmrq,a.pwsb,
+            a.pksb,a.pkry,a.pkrq,a.DC_FD,a.gjjs_dz,a.gjjs_xz,a.jsq_tlt,a.jsq_lqb,a.dhqd,a.order_bs,a.arrival_bs,a.qy,a.jzbs,a.jzsb,
+            a.jzry,a.qjgsb,a.qjgry,a.qjgrq,a.dcCh2,a.gjks,a.gxsj,a.hxkc_cd,a.qgkc_cd,a.jssj,a.jzrq,a.zt,a.xcgs,a.bclqzl,a.bcshzl,
+            a.bcylzl,a.bcljtlzl,a.bcqpyld,a.ylbs,a.plxh,a.ylbhgg,a.parent_id,a.db,a.cx,a.txc,a.jhlx,a.jssj_old,a.sczt,a.slxzxqrq,
+            a.sldzxqrq,a.ckbzrq,a.ckbzry,a.bmbzrq,a.bmbzry,a.bmxgry,a.bmxgrq,a.slkcdw,a.slcs,a.slxhth,a.slhth,a.slwlh,a.kcch,a.slkcxx,
+            a.slycldw,a.slyclcs,a.nbsbm,a.sllsh,a.sldrry,a.sldrrq,a.sllph,a.slpgry,a.slfkry,a.slfkrq,a.slbz,a.pwxcldw,a.pwcs,a.pwpgry,
+            a.slpgrq,a.pwpgrq,a.pwfkry,a.pwfkrq,a.pwbz,a.lldw,a.llcs,a.llpgry,a.llpgrq,a.llry,a.llfkry,a.llfkrq,a.llbz,a.hxdw,a.hxcs,
+            a.hxpgry,a.hxpgrq,a.hxfkrq,a.hxfkry,a.hxjybs,a.hxjych,a.hxjypl,a.hxjyfd,a.hxjyzl,a.hxjykw,a.hxjytlth,a.hxbz,a.qgdw,a.qgcs,
+            a.qgpgry,a.qgpgrq,a.qgfkrq,a.qgfkry,a.qgjybs,a.qgjych,a.qgjypl,a.qgjyfd,a.qgjyzl,a.qgjykw,a.qgjytlth,a.qgbz,a.qjgbs,a.pkbs,
+            a.ycbs,a.hxjhrq,a.qgjhrq,a.zcljhrq,a.sljhrq,a.pwjhrq,a.lljhrq,a.kcbs,a.lphqrry,a.lphqrrq,a.zyq,a.zyq1,a.ykw,a.kwmc,a.zylx
+        from
+            dm_ydjh a left join dm_tlt_print_wh b on a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.tzbh=b.dc_tlt
+        where
+            zt=#{zt}
+            <if test="sllsh!=null and sllsh!=''">
+                and a.sllsh=#{sllsh}
+            </if>
+            <if test="dcch!=null and dcch!=''">
+                and a.dc_ch=#{dcch}
+            </if>
+            <if test="dcPl!=null and dcPl!=''">
+                and a.dc_pl=#{dcPl}
+            </if>
+            <if test="kw!=null and kw!=''">
+                and a.kw=#{kw}
+            </if>
+            <if test="zylx!=null and zylx!=''">
+                and a.zylx=#{zylx}
+            </if>
+            <if test="slkcdw!=null and slkcdw!=''">
+                and a.slkcdw like #{slkcdw}+'%'
+            </if>
+    </select>
+
 
     <update id="xzylbs"   parameterType="string" >
         UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl