diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
index b3bae79..5d31fc8 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java
@@ -320,6 +320,12 @@ public class DmYdjhLj implements Serializable {
     @TableField(exist = false)
     private String lljhrq; // 理料计划日期
 
+
+    private  String tz;
+    private  String lx;
+    private  String xj;
+
+
     //=====预配盘相关==============
     @TableField(exist = false)
     private String yzDcCh;
@@ -335,6 +341,10 @@ public class DmYdjhLj implements Serializable {
     private String yzLx;
     @TableField(exist = false)
     private String yzXj;
+    @TableField(exist = false)
+    private String ypph;
+    @TableField(exist = false)
+    private String yzkw;
 
     public boolean checkZt(){
         return !"03".equals(this.pkZt)||!"03".equals(this.qjgZt)||!"03".equals(this.dmZt);
diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
index 6c61f31..454940b 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java
@@ -146,12 +146,12 @@ public class DmBomController {
 
         List<String> AAA=new ArrayList<>();
 
-        AAA.add("115");
+        AAA.add("156");
+
 
-        AAA.add("117");
 
         for(String aa:AAA){
-            List<DmBchxjbp> dmBchxjbps = dmBchxjbpService.list(new QueryWrapper<DmBchxjbp>().eq("DC_CH", "T300K-103").eq("DC_PL", aa));
+            List<DmBchxjbp> dmBchxjbps = dmBchxjbpService.list(new QueryWrapper<DmBchxjbp>().eq("DC_CH", "G175K-9").eq("DC_PL", aa));
 
             List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
             List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
index 50113aa..a326b75 100644
--- a/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
@@ -2,14 +2,19 @@ package com.dsic.gj_erp.controller.pgd;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.bean.zyjh.DmYppyz;
 import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmQfxqService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.DmPpxxbService;
+import com.dsic.gj_erp.service.zyjh.DmYppyzService;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +44,8 @@ public class DmPpxxbController {
     private final PgdQmjhMapper pgdQmjhMapper;
     private final DmYdjhLjService dmYdjhLjService;
 
+    private final DmYppyzService dmYppyzService;
+
 //    @PostMapping("getDmppxxbList")
 //    public ResultBean<?> getDmppxxbList(@RequestBody DmPpxxb dmPpxxb){
 //        List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
@@ -55,6 +62,142 @@ public class DmPpxxbController {
         return new ResultBean<>(dmYdjhLjs);
     }
 
+
+
+    @PostMapping("getDmppxxbListAndYz")
+    public ResultBean<?> getDmppxxbListAndYz(@RequestBody Map map){
+        List<DmYdjhLj> dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh1(map);
+
+        /// 查询这条船所有的原则
+        List<DmYppyz> list = dmYppyzService.list();
+        for(DmYppyz dmYppyz :list){
+            if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd()) &&
+                StringUtils.isNotBlank(dmYppyz.getKw()) && StringUtils.isNotBlank(dmYppyz.getZl()) && StringUtils.isNotBlank(dmYppyz.getTz()) &&
+                StringUtils.isNotBlank(dmYppyz.getLx()) && StringUtils.isNotBlank(dmYppyz.getXj())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd()) &&
+                        dmYppyz.getKw().equals(dmYdjhLj.getKw()) && dmYppyz.getZl().equals(dmYdjhLj.getZl()) && dmYppyz.getTz().equals(dmYdjhLj.getTz())
+                        && dmYppyz.getLx().equals(dmYdjhLj.getLx()) && dmYppyz.getXj().equals(dmYdjhLj.getXj())
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                        dmYdjhLj.setYzkw(dmYppyz.getKw());
+                        dmYdjhLj.setYzZl(dmYppyz.getZl());
+                        dmYdjhLj.setYzTz(dmYppyz.getTz());
+                        dmYdjhLj.setYzLx(dmYppyz.getLx());
+                        dmYdjhLj.setYzXj(dmYppyz.getXj());
+                    }
+                }
+
+
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd()) &&
+                StringUtils.isNotBlank(dmYppyz.getKw()) && StringUtils.isNotBlank(dmYppyz.getZl()) && StringUtils.isNotBlank(dmYppyz.getTz()) &&
+                StringUtils.isNotBlank(dmYppyz.getLx())) {
+
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd()) &&
+                        dmYppyz.getKw().equals(dmYdjhLj.getKw()) && dmYppyz.getZl().equals(dmYdjhLj.getZl()) && dmYppyz.getTz().equals(dmYdjhLj.getTz())
+                        && dmYppyz.getLx().equals(dmYdjhLj.getLx())
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                        dmYdjhLj.setYzkw(dmYppyz.getKw());
+                        dmYdjhLj.setYzZl(dmYppyz.getZl());
+                        dmYdjhLj.setYzTz(dmYppyz.getTz());
+                        dmYdjhLj.setYzLx(dmYppyz.getLx());
+                    }
+                }
+
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd()) &&
+                StringUtils.isNotBlank(dmYppyz.getKw()) && StringUtils.isNotBlank(dmYppyz.getZl()) && StringUtils.isNotBlank(dmYppyz.getTz())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd()) &&
+                        dmYppyz.getKw().equals(dmYdjhLj.getKw()) && dmYppyz.getZl().equals(dmYdjhLj.getZl()) && dmYppyz.getTz().equals(dmYdjhLj.getTz())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                        dmYdjhLj.setYzkw(dmYppyz.getKw());
+                        dmYdjhLj.setYzZl(dmYppyz.getZl());
+                        dmYdjhLj.setYzTz(dmYppyz.getTz());
+                    }
+                }
+
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd()) &&
+                StringUtils.isNotBlank(dmYppyz.getKw()) && StringUtils.isNotBlank(dmYppyz.getZl())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd()) &&
+                        dmYppyz.getKw().equals(dmYdjhLj.getKw()) && dmYppyz.getZl().equals(dmYdjhLj.getZl())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                        dmYdjhLj.setYzkw(dmYppyz.getKw());
+                        dmYdjhLj.setYzZl(dmYppyz.getZl());
+                    }
+                }
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd()) &&
+                StringUtils.isNotBlank(dmYppyz.getKw())) {
+
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd()) &&
+                        dmYppyz.getKw().equals(dmYdjhLj.getKw())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                        dmYdjhLj.setYzkw(dmYppyz.getKw());
+                    }
+                }
+
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl()) && StringUtils.isNotBlank(dmYppyz.getDcFd())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl()) &&  dmYppyz.getDcFd().equals(dmYdjhLj.getFd())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                        dmYdjhLj.setYzDcFd(dmYppyz.getDcFd());
+                    }
+                }
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh()) && StringUtils.isNotBlank(dmYppyz.getDcPl())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh()) &&  dmYppyz.getDcPl().equals(dmYdjhLj.getPl())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                        dmYdjhLj.setYzDcPl(dmYppyz.getDcPl());
+                    }
+                }
+
+            } else if (StringUtils.isNotBlank(dmYppyz.getDcCh())) {
+                for(DmYdjhLj dmYdjhLj :dmYdjhLjs){
+                    if(dmYppyz.getDcCh().equals(dmYdjhLj.getCzbh())
+
+                    ){
+                        dmYdjhLj.setYpph(dmYppyz.getYpph());
+                        dmYdjhLj.setYzDcCh(dmYppyz.getDcCh());
+                    }
+                }
+            }
+        }
+
+        return new ResultBean<>(dmYdjhLjs);
+    }
+
+
     @PostMapping("saveDmppxxb")
     @Transactional(rollbackFor = Exception.class)
     public ResultBean<?> save(@RequestBody List<DmYdjhLj> list){
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index 40aba93..22f1627 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -91,7 +91,7 @@ public class BomUploadServiceImpl {
     DmYdjhService dmYdjhService;
 
     @Transactional(rollbackFor = Exception.class)
-    public synchronized ResultBean uploadZ(MultipartFile[] file, String czbh, String pl, String isupload, HttpServletRequest req,String path) throws IOException, CustomException, ScriptException {
+    public ResultBean uploadZ(MultipartFile[] file, String czbh, String pl, String isupload, HttpServletRequest req,String path) throws IOException, CustomException, ScriptException {
         String savePath = UUID.randomUUID().toString().replace("-", "");
         //dezt="00";
         File destFile = null;
@@ -1275,8 +1275,8 @@ public class BomUploadServiceImpl {
         }
         if (adds.size() > 0) {
             wlqdService.saveBatch(adds);
-            insertWpjbbByLjptb(adds);
-            //上传文件到服务器
+            //insertWpjbbByLjptb(adds);
+           // //上传文件到服务器
             saveFile(file,path,(String) req.getAttribute("yhms"));
         }
         adds.forEach(e -> {
diff --git a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
index 3d5d753..68f4a55 100644
--- a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
+++ b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml
@@ -244,6 +244,194 @@
 
     </select>
 
+<!--    <select id="selectQmByQgAndJh1" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj" parameterType="map">-->
+<!--        SELECT-->
+<!--        dm_ydjh_lj.id,-->
+<!--        dm_ydjh_lj.czbh,-->
+<!--        dm_ydjh_lj.pl,-->
+<!--        dm_ydjh_lj.fd,-->
+<!--        dm_ydjh_lj.kw,-->
+<!--        dm_ydjh_lj.zl,-->
+<!--        dm_ydjh_lj.tlth,-->
+<!--        dm_ydjh_lj.ptblx,-->
+<!--        dm_ydjh_lj.ljbh,-->
+<!--        dm_ydjh_lj.ljmc,-->
+<!--        dm_ydjh_lj.ljgg,-->
+<!--        dm_ydjh_lj.ljcz,-->
+<!--        dm_ydjh_lj.wpfl,-->
+<!--        dm_ydjh_lj.jldw,-->
+<!--        dm_ydjh_lj.sl,-->
+<!--        dm_ydjh_lj.dmjhrq,-->
+<!--        dm_ydjh_lj.qfxqrqxz,-->
+<!--        dm_ydjh_lj.qfxqrqdz,-->
+<!--        dm_ydjh_lj.gylx,-->
+<!--        dm_ydjh_lj.dmfzry,-->
+<!--        dm_ydjh_lj.dmsbbh,-->
+<!--        dm_ydjh_lj.dmcd,-->
+<!--        dm_ydjh_lj.dmry,-->
+<!--        dm_ydjh_lj.dmksrq,-->
+<!--        dm_ydjh_lj.dmjsrq,-->
+<!--        dm_ydjh_lj.dm_zt,-->
+<!--        dm_ydjh_lj.dm_bzry,-->
+<!--        dm_ydjh_lj.dm_bzrq,-->
+<!--        dm_ydjh_lj.dm_xfry,-->
+<!--        dm_ydjh_lj.dm_xfrq,-->
+<!--        dm_ydjh_lj.dm_fkry,-->
+<!--        dm_ydjh_lj.dm_fkrq,-->
+<!--        dm_ydjh_lj.dm_fkyy,-->
+<!--        dm_ydjh_lj.pkjhrq,-->
+<!--        dm_ydjh_lj.pkfzry,-->
+<!--        dm_ydjh_lj.pksbbh,-->
+<!--        dm_ydjh_lj.pklx,-->
+<!--        dm_ydjh_lj.pkcd,-->
+<!--        dm_ydjh_lj.pkry,-->
+<!--        dm_ydjh_lj.pkksrq,-->
+<!--        dm_ydjh_lj.pkjsrq,-->
+<!--        dm_ydjh_lj.pk_zt,-->
+<!--        dm_ydjh_lj.pk_bzry,-->
+<!--        dm_ydjh_lj.pk_bzrq,-->
+<!--        dm_ydjh_lj.pk_xfry,-->
+<!--        dm_ydjh_lj.pk_xfrq,-->
+<!--        dm_ydjh_lj.pk_fkry,-->
+<!--        dm_ydjh_lj.pk_fkrq,-->
+<!--        dm_ydjh_lj.pk_fkyy,-->
+<!--        dm_ydjh_lj.qjgjhrq,-->
+<!--        dm_ydjh_lj.qjgfzry,-->
+<!--        dm_ydjh_lj.qsbbh,-->
+<!--        dm_ydjh_lj.qjgry,-->
+<!--        dm_ydjh_lj.qjgksrq,-->
+<!--        dm_ydjh_lj.qjgjsrq,-->
+<!--        dm_ydjh_lj.qjg_zt,-->
+<!--        dm_ydjh_lj.qjg_bzry,-->
+<!--        dm_ydjh_lj.qjg_bzrq,-->
+<!--        dm_ydjh_lj.qjg_xfry,-->
+<!--        dm_ydjh_lj.qjg_xfrq,-->
+<!--        dm_ydjh_lj.qjg_fkry,-->
+<!--        dm_ydjh_lj.qjg_fkrq,-->
+<!--        dm_ydjh_lj.qjg_fkyy,-->
+<!--        dm_ydjh_lj.pkbs,-->
+<!--        dm_ydjh_lj.dmbs,-->
+<!--        dm_ydjh_lj.qbs,-->
+<!--        dm_ydjh_lj.qdr,-->
+<!--        dm_ydjh_lj.pkdr,-->
+<!--        dm_ydjh_lj.dmdr,-->
+<!--        dm_ydjh_lj.dscdw,-->
+<!--        dm_ydjh_lj.dscry,-->
+<!--        dm_ydjh_lj.djsry,-->
+<!--        dm_ydjh_lj.djsrq,-->
+<!--        dm_ydjh_lj.qscdw,-->
+<!--        dm_ydjh_lj.qscry,-->
+<!--        dm_ydjh_lj.qjsry,-->
+<!--        dm_ydjh_lj.qjsrq,-->
+<!--        dm_ydjh_lj.pscdw,-->
+<!--        dm_ydjh_lj.pscry,-->
+<!--        dm_ydjh_lj.pjsry,-->
+<!--        dm_ydjh_lj.pjsrq,-->
+<!--        dm_ydjh_lj.lsh,-->
+<!--        dm_ydjh_lj.ppzt,-->
+<!--        dm_ydjh_lj.rkry,-->
+<!--        dm_ydjh_lj.rkrq,-->
+<!--        dm_ydjh_lj.qrry,-->
+<!--        dm_ydjh_lj.qrrq,-->
+<!--        dm_ydjh_lj.qq,-->
+<!--        dm_ydjh_lj.dw,-->
+<!--        dm_ydjh_lj.qgdh,-->
+<!--        dm_ydjh_lj.pgdh,-->
+<!--        dm_ydjh_lj.dgdh,-->
+
+<!--        dm_ydjh.slfkry,-->
+<!--        dm_ydjh.slfkrq,-->
+<!--        dm_ydjh.pwfkry,-->
+<!--        dm_ydjh.pwfkrq,-->
+<!--        dm_ydjh.llfkry,-->
+<!--        dm_ydjh.llfkrq,-->
+<!--        dm_ydjh.hxfkrq,-->
+<!--        dm_ydjh.hxfkry,-->
+<!--        dm_ydjh.qgfkrq,-->
+<!--        dm_ydjh.qgfkry,-->
+<!--        dm_ydjh.hxjhrq,-->
+<!--        dm_ydjh.qgjhrq,-->
+<!--        dm_ydjh.zcljhrq,-->
+<!--        dm_ydjh.sljhrq,-->
+<!--        dm_ydjh.pwjhrq,-->
+<!--        dm_ydjh.lljhrq,-->
+<!--        dm_qfxq.dzjz,-->
+<!--        dm_qfxq.zxfdxq,-->
+<!--        dm_qfxq.xzglxq,-->
+<!--        dm_qfxq.xdb,-->
+<!--        dm_qfxq.xskj,-->
+<!--        dm_qfxq.xpt,-->
+<!--        dm_qfxq.xyw,-->
+<!--        dm_qfxq.xxc,-->
+<!--        dm_qfxq.xtxc,-->
+<!--        dm_qfxq.dqb,-->
+<!--        dm_qfxq.dxc,-->
+<!--        dm_qfxq.dsj,-->
+<!--        dm_qfxq.ddb,-->
+<!--        dm_qfxq.drr,-->
+<!--        dm_qfxq.drrq,-->
+<!--        dm_qfxq.drcs,-->
+<!--        dm_qfxq.xzglxq_old,-->
+<!--        dm_qfxq.xqzt,-->
+<!--        dm_qfxq.dzglxq,-->
+<!--        dm_qfxq.dzglxq_old,-->
+<!--        yz.dc_ch yzDcCh,-->
+<!--        yz.dc_pl yzDcPl,-->
+<!--        yz.dc_fd yzDcFd,-->
+<!--        yz.zl yzZl,-->
+<!--        yz.tz yzTz,-->
+<!--        yz.lx yzLx,-->
+<!--        yz.xj yzXj-->
+<!--        FROM-->
+<!--        dm_ydjh_lj  LEFT JOIN dm_ydjh on    dm_ydjh.dc_ch=dm_ydjh_lj.czbh and dm_ydjh.dc_pl= dm_ydjh_lj.pl and dm_ydjh.tzbh =dm_ydjh_lj.tlth-->
+<!--        and-->
+
+<!--        dm_ydjh.dc_pl= dm_ydjh_lj.fd  left join   dm_qfxq on dm_qfxq.dc_ch = dm_ydjh_lj.czbh  and  dm_qfxq.dc_pl=dm_ydjh_lj.pl    and  dm_qfxq.dc_fd=dm_ydjh_lj.fd-->
+<!--        left join dm_yppyz yz on dm_ydjh_lj.czbh=yz.dc_ch and dm_ydjh_lj.pl=yz.dc_pl and dm_ydjh_lj.fd=yz.dc_fd and substring(dm_ydjh_lj.tlth,8,1)=yz.zl-->
+<!--        where 1=1-->
+<!--        <if test=" dcch!=null and dcch!=''">-->
+<!--            and   dm_ydjh_lj.czbh=#{dcch}-->
+<!--        </if>-->
+<!--        <if test=" pl!=null and pl!=''">-->
+<!--            and   dm_ydjh_lj.pl=#{pl}-->
+<!--        </if>-->
+<!--        <if test=" tlth!=null and tlth!=''">-->
+<!--            and   dm_ydjh_lj.tlth=#{tlth}-->
+<!--        </if>-->
+
+<!--        <if test=" qgkw!=null and qgkw!=''">-->
+<!--            and   dm_ydjh_lj.kw=#{qgkw}-->
+<!--        </if>-->
+
+
+
+<!--&lt;!&ndash;            <if  test="zt=='01'.toString()">&ndash;&gt;-->
+<!--&lt;!&ndash;                and   (isnull( dm_ydjh_lj.rkry,'')=''  or   isnull( dm_ydjh_lj.rkrq,'')='')&ndash;&gt;-->
+<!--&lt;!&ndash;            </if>&ndash;&gt;-->
+
+
+<!--        <if test=" zt!=null and zt!=''">-->
+<!--            and   ISNULL(dm_ydjh_lj.ppzt,'')=#{zt}-->
+<!--        </if>-->
+
+<!--        <if test=" dwh!=null and dwh!=''">-->
+<!--            and   dm_ydjh_lj.dw=#{dwh}-->
+<!--        </if>-->
+
+<!--        <if test=" qy!=null and qy!=''">-->
+<!--            and   dm_ydjh_lj.qq=#{qy}-->
+<!--        </if>-->
+
+
+
+
+
+<!--        order by czbh,pl,fd-->
+
+
+
+
+<!--    </select>-->
     <select id="selectQmByQgAndJh1" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj" parameterType="map">
         SELECT
         dm_ydjh_lj.id,
@@ -338,6 +526,9 @@
         dm_ydjh_lj.qgdh,
         dm_ydjh_lj.pgdh,
         dm_ydjh_lj.dgdh,
+        dm_ydjh_lj.tz,
+        dm_ydjh_lj.lx,
+        dm_ydjh_lj.xj,
 
         dm_ydjh.slfkry,
         dm_ydjh.slfkrq,
@@ -374,20 +565,14 @@
         dm_qfxq.xzglxq_old,
         dm_qfxq.xqzt,
         dm_qfxq.dzglxq,
-        dm_qfxq.dzglxq_old,
-        yz.dc_ch yzDcCh,
-        yz.dc_pl yzDcPl,
-        yz.dc_fd yzDcFd,
-        yz.zl yzZl,
-        yz.tz yzTz,
-        yz.lx yzLx,
-        yz.xj yzXj
+        dm_qfxq.dzglxq_old
+
         FROM
         dm_ydjh_lj  LEFT JOIN dm_ydjh on    dm_ydjh.dc_ch=dm_ydjh_lj.czbh and dm_ydjh.dc_pl= dm_ydjh_lj.pl and dm_ydjh.tzbh =dm_ydjh_lj.tlth
         and
 
         dm_ydjh.dc_pl= dm_ydjh_lj.fd  left join   dm_qfxq on dm_qfxq.dc_ch = dm_ydjh_lj.czbh  and  dm_qfxq.dc_pl=dm_ydjh_lj.pl    and  dm_qfxq.dc_fd=dm_ydjh_lj.fd
-        left join dm_yppyz yz on dm_ydjh_lj.czbh=yz.dc_ch and dm_ydjh_lj.pl=yz.dc_pl and dm_ydjh_lj.fd=yz.dc_fd and substring(dm_ydjh_lj.tlth,8,1)=yz.zl
+
         where 1=1
         <if test=" dcch!=null and dcch!=''">
             and   dm_ydjh_lj.czbh=#{dcch}
@@ -405,9 +590,9 @@
 
 
 
-<!--            <if  test="zt=='01'.toString()">-->
-<!--                and   (isnull( dm_ydjh_lj.rkry,'')=''  or   isnull( dm_ydjh_lj.rkrq,'')='')-->
-<!--            </if>-->
+        <!--            <if  test="zt=='01'.toString()">-->
+        <!--                and   (isnull( dm_ydjh_lj.rkry,'')=''  or   isnull( dm_ydjh_lj.rkrq,'')='')-->
+        <!--            </if>-->
 
 
         <if test=" zt!=null and zt!=''">
@@ -432,5 +617,4 @@
 
 
     </select>
-
 </mapper>