修正

src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java

@@ -1,11 +1,13 @@
 package com.dsic.gj_erp.bean.jhgk;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
 
 import java.io.Serializable;
 
@@ -241,6 +243,91 @@ public class DmYdjhLj implements Serializable {
     private  String pjsry;
     private  String pjsrq;
 
+    private  String lsh;
+    private  String ppzt;
+    private  String rkry;
+    private  String rkrq;
+    private  String qrry;
+    private  String qrrq;
+    private  String qq;
+    private  String dw;
+
+    private  String qgdh;
+    private  String pgdh;
+    private  String dgdh;
+
+  // ____________________-
+    @TableField(exist = false)
+    private  String   dzjz;
+    @TableField(exist = false)
+    private  String  zxfdxq;
+    @TableField(exist = false)
+    private  String  xzglxq;
+    @TableField(exist = false)
+    private  String     dzglxq;
+    @TableField(exist = false)
+    private  String  xdb;
+    @TableField(exist = false)
+    private  String     xskj;
+    @TableField(exist = false)
+    private  String  xpt;
+    @TableField(exist = false)
+    private  String      xyw;
+    @TableField(exist = false)
+    private  String  xxc;
+    @TableField(exist = false)
+    private  String      xtxc;
+    @TableField(exist = false)
+    private  String  ddb;
+    @TableField(exist = false)
+    private  String      dqb;
+    @TableField(exist = false)
+    private  String   dxc;
+    @TableField(exist = false)
+    private  String     dsj;
+
+
+    //-----------------------
+    @TableField(exist = false)
+    private String slfkry; // 上料反馈人
+    @TableField(exist = false)
+    private String slfkrq; // 上料时间
+    @TableField(exist = false)
+    private String pwfkry; // 抛丸反馈人
+    @TableField(exist = false)
+    private String pwfkrq; // 抛丸反馈日期
+    @TableField(exist = false)
+    private String llfkry; // 反馈人
+    @TableField(exist = false)
+    private String llfkrq; // 反馈日期
+    @TableField(exist = false)
+    private String hxfkrq; // 划线反馈日期
+    @TableField(exist = false)
+    private String hxfkry; // 划线反馈人员
+    @TableField(exist = false)
+    private String qgfkrq; // 划线反馈日期
+    @TableField(exist = false)
+    private String qgfkry; // 划线反馈人员
+    @TableField(exist = false)
+    private String hxjhrq; // 划线计划日期
+    @TableField(exist = false)
+    private String qgjhrq; // 切割计划日期
+    @TableField(exist = false)
+    private String zcljhrq; // 再处理计划日期
+    @TableField(exist = false)
+    private String sljhrq; // 上料计划日期
+    @TableField(exist = false)
+    private String pwjhrq; // 抛丸计划日期
+    @TableField(exist = false)
+    private String lljhrq; // 理料计划日期
+
+
+
+
+
+
+
+
 
 
 }

src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java

@@ -1,11 +1,16 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsic.gj_erp.annotation.AuthFunction;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
+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 lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,7 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -32,22 +40,86 @@ public class DmPpxxbController {
 
     private final DmQfxqService qfxqService;
     private final DmPpxxbService ppxxbService;
+    private final PgdQmjhMapper pgdQmjhMapper;
+    private final DmYdjhLjService dmYdjhLjService;
+
+//    @PostMapping("getDmppxxbList")
+//    public ResultBean<?> getDmppxxbList(@RequestBody DmPpxxb dmPpxxb){
+//        List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
+//                .eq(DmPpxxb::getDcCh, dmPpxxb.getDcCh())
+//                .eq(StrUtil.isNotEmpty(dmPpxxb.getDwh()),DmPpxxb::getDwh, dmPpxxb.getDwh())
+//                .eq(StrUtil.isNotEmpty(dmPpxxb.getQy()),DmPpxxb::getQy, dmPpxxb.getQy())
+//        );
+//        return new ResultBean<>(list);
+//    }
 
     @PostMapping("getDmppxxbList")
-    public ResultBean<?> getDmppxxbList(@RequestBody DmPpxxb dmPpxxb){
+    public ResultBean<?> getDmppxxbList(@RequestBody Map map){
-        List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
+        List<DmYdjhLj> dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh1(map);
-                .eq(DmPpxxb::getDcCh, dmPpxxb.getDcCh())
+        return new ResultBean<>(dmYdjhLjs);
-                .eq(StrUtil.isNotEmpty(dmPpxxb.getDwh()),DmPpxxb::getDwh, dmPpxxb.getDwh())
-                .eq(StrUtil.isNotEmpty(dmPpxxb.getQy()),DmPpxxb::getQy, dmPpxxb.getQy())
-        );
-        return new ResultBean<>(list);
     }
 
     @PostMapping("saveDmppxxb")
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean<?> save(@RequestBody List<DmPpxxb> list){
+    public ResultBean<?> save(@RequestBody List<DmYdjhLj> list){
-        list.forEach(item-> item.setZt("00"));
+        List<DmYdjhLj>adds =new ArrayList<>();
-        ppxxbService.saveOrUpdateBatchByMultiId(list);
+        list.forEach(e->{
+            DmYdjhLj dmYdjhLj= new DmYdjhLj();
+                dmYdjhLj.setId(e.getId());
+                dmYdjhLj.setQq(e.getQq());
+                dmYdjhLj.setDw(e.getDw());
+                dmYdjhLj.setPpzt("02");
+            adds.add(dmYdjhLj);
+        });
+        dmYdjhLjService.updateBatchById(adds);
+
+//        list.forEach(item-> item.setZt("00"));
+//        ppxxbService.saveOrUpdateBatchByMultiId(list);
+        return new ResultBean<>();
+    }
+
+
+    @PostMapping("saveDmppxxbpg")
+    @Transactional(rollbackFor = Exception.class)
+    @AuthFunction
+    public ResultBean<?> saveDmppxxbpg(@RequestBody List<DmYdjhLj> list, HttpServletRequest request){
+        String bzry= (String) request.getAttribute("yhms");
+        String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
+        List<DmYdjhLj>adds =new ArrayList<>();
+        list.forEach(e->{
+            DmYdjhLj dmYdjhLj= new DmYdjhLj();
+            dmYdjhLj.setId(e.getId());
+            dmYdjhLj.setPpzt("03");
+            dmYdjhLj.setRkry(bzry);
+            dmYdjhLj.setRkrq(bzrq);
+            adds.add(dmYdjhLj);
+        });
+        dmYdjhLjService.updateBatchById(adds);
+
+//        list.forEach(item-> item.setZt("00"));
+//        ppxxbService.saveOrUpdateBatchByMultiId(list);
+        return new ResultBean<>();
+    }
+
+    @PostMapping("saveDmppxxbqr")
+    @Transactional(rollbackFor = Exception.class)
+    @AuthFunction
+    public ResultBean<?> saveDmppxxbqr(@RequestBody List<DmYdjhLj> list, HttpServletRequest request){
+        String bzry= (String) request.getAttribute("yhms");
+        String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd");
+        List<DmYdjhLj>adds =new ArrayList<>();
+        list.forEach(e->{
+            DmYdjhLj dmYdjhLj= new DmYdjhLj();
+            dmYdjhLj.setId(e.getId());
+            dmYdjhLj.setPpzt("04");
+            dmYdjhLj.setQrry(bzry);
+            dmYdjhLj.setQrrq(bzrq);
+            adds.add(dmYdjhLj);
+        });
+        dmYdjhLjService.updateBatchById(adds);
+
+//        list.forEach(item-> item.setZt("00"));
+//        ppxxbService.saveOrUpdateBatchByMultiId(list);
         return new ResultBean<>();
     }
 

src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java

@@ -11,6 +11,7 @@ import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
 import com.dsic.gj_erp.exception.CustomException;
+import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdQmjhService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,10 @@ public class PgdQmjhController {
     DmYdjhLjService dmYdjhLjService;
 
 
+    @Autowired
+    PgdQmjhMapper pgdQmjhMapper;
+
+
 
     @PostMapping("/getQmPgd")
     @ResponseBody
@@ -49,9 +54,10 @@ public class PgdQmjhController {
         qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"pl",(String)map.get("pl"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("fd")),"fd",(String)map.get("fd"));
         qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"qjg_zt",(String)map.get("zt"));
-        qw.eq("qbs","Y");
+        List<DmYdjhLj> dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh(map);
-        qw.orderBy(true,true,"czbh","pl","fd");
+        //  qw.eq("qbs","Y");
-        return new ResultBean(dmYdjhLjService.list(qw));
+
+        return new ResultBean(dmYdjhLjs);
 
     }
 

src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java

@@ -180,7 +180,7 @@ public class PgdSljhController {
             }else if(map.get("rqopt").equals("02")) {
                 qw.eq("isnull(ZT,'')","11");
             }
-
+        qw.orderBy(true,true,"czbh","pl","fd");
        // List<DmYdjh> ydjhs = dmYdjhService.list(qw);
         // 查询上料计划
         Map retrunMap =new HashMap();

src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java

@@ -62,6 +62,8 @@ public class PgdTzjhController {
     @Autowired
     SYService syService;
 
+
+
     /**
      * 检查板材领取表,套料图是否导入,如果已经导入更新图纸计划为已反馈
      * @param list
@@ -129,7 +131,13 @@ public class PgdTzjhController {
         List<EmSbjgry> gxry = emSbjgryService.list();
         List<Map> bmbm = syService.em_sbjbb_ZM("bmbm");
         // 多为
-        List<DmDwxxp> dwxx = dwxxpService.list();
+        List<DmDwxxp> dwxxs = dwxxpService.list();
+        List<DmDwxxp> qys = dwxxpService.list(new QueryWrapper<DmDwxxp>().select("DISTINCT qy as  qy "));
+        returnMap.put("qys", qys);
+        returnMap.put("dwxxs", dwxxs);
+        returnMap.put("dwxxs1", dwxxs);
+
+
         List<Ycldw> ycldws = ycldwService.ycldwList("ycl");
         returnMap.put("cbbm", cbbm);
         returnMap.put("gxry", gxry);
@@ -152,6 +160,11 @@ public class PgdTzjhController {
             .eq("flag_status", "1").ne("isnull(zyq,'')","").orderBy(true,true,"zyq"));
         List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("PBBM");
 
+
+
+
+
+
         returnMap.put("resourcesCodes",resourcesCodes);
         returnMap.put("zyqs",zyqs);
         returnMap.put("zyrys",zyrys);

src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java

@@ -1,5 +1,6 @@
 package com.dsic.gj_erp.mapper.pgd;
 
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.PgdQmjh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.dsic.gj_erp.bean.pgd.Qmqz;
@@ -18,6 +19,7 @@ import java.util.Map;
 public interface PgdQmjhMapper extends BaseMapper<PgdQmjh> {
 
 
-    List<Qmqz>selectQmByQgAndJh(Map map);
+    List<DmYdjhLj>selectQmByQgAndJh(Map map);
+    List<DmYdjhLj>selectQmByQgAndJh1(Map map);
 
 }

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java

@@ -10,6 +10,8 @@ import com.dsic.gj_erp.mapper.pgd.PgdDmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdDmjhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.service.sy.SYService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +32,9 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
     @Autowired
     DmYdjhLjService dmYdjhLjService;
 
+    @Autowired
+    SYService syService;
+
 
     @Override
     public void saveDmPgdXd(List<DmYdjhLj> dmjhs, HttpServletRequest request) {
@@ -41,7 +46,13 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
             e.setDscdw(f.getDscdw());
             e.setDscry(f.getDscry());
             e.setDmZt("02");
+            e.setDmbs("Y");
+            e.setDmjhrq(f.getDmjhrq());
             e.setId(f.getId());
+            if(StringUtils.isBlank(f.getDgdh())){
+                String id = syService.f_getpjh("MM", "00", "LJLJ");
+                e.setDgdh(id);
+            }
             ups.add(e);
         });
         dmYdjhLjService.updateBatchById(ups);
@@ -87,6 +98,7 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
             if(f.getDmZt().equals("02")){
                 e.setDmZt("01");
             }
+
             e.setId(f.getId());
             ups.add(e);
         });

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java

@@ -9,6 +9,8 @@ import com.dsic.gj_erp.mapper.pgd.PgdPkjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdPkjhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.service.sy.SYService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +32,9 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
     @Autowired
     DmYdjhLjService dmYdjhLjService;
 
+    @Autowired
+    SYService syService;
+
     @Override
     public void savePkPgdJs(List<DmYdjhLj> pkjhs, HttpServletRequest request) {
         List<DmYdjhLj>ups= new ArrayList<>();
@@ -54,7 +59,13 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
             e.setPscdw(f.getPscdw());
             e.setPscry(f.getPscry());
             e.setPkZt("02");
+            e.setPkbs("Y");
+            e.setPkjhrq(f.getPkjhrq());
             e.setId(f.getId());
+            if(StringUtils.isBlank(f.getPgdh())){
+                String id = syService.f_getpjh("MM", "00", "LJLJ");
+                e.setPgdh(id);
+            }
             ups.add(e);
         });
         dmYdjhLjService.updateBatchById(ups);

src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java

@@ -12,6 +12,8 @@ import com.dsic.gj_erp.mapper.pgd.PgdQmjhMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.pgd.PgdQmjhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.service.sy.SYService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +39,8 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
 
     @Autowired
     DmYdjhLjService dmYdjhLjService;
+    @Autowired
+    SYService syService;
 
     @Override
     public void saveQmPgdJs(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
@@ -57,14 +61,22 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
     @Transactional(rollbackFor = Exception.class)
     public void saveQmPgdXd(List<DmYdjhLj> qmjhs, HttpServletRequest request) {
         List<DmYdjhLj>ups= new ArrayList<>();
+        // 生成工单号
+
         qmjhs.forEach(f->{
             DmYdjhLj e= new DmYdjhLj();
             e.setQjgXfry((String) request.getAttribute("yhms"));
             e.setQjgXfrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
             e.setQscdw(f.getQscdw());
             e.setQscry(f.getQscry());
+            e.setQjgjhrq(f.getQjgjhrq());
             e.setQjgZt("02");
+            e.setQbs("Y");
             e.setId(f.getId());
+            if(StringUtils.isBlank(f.getQgdh())){
+                String id = syService.f_getpjh("MM", "00", "LJLJ");
+                e.setQgdh(id);
+            }
             ups.add(e);
         });
         dmYdjhLjService.updateBatchById(ups);
@@ -119,16 +131,17 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
     @Override
      public List<Qmqz>  selectQmByQgAndJh(Map map) {
 
-        if((Boolean) map.get("qbs")){
+//        if((Boolean) map.get("qbs")){
-            map.put("q","1");
+//            map.put("q","1");
-        }
+//        }
-        if((Boolean) map.get("pkbs")){
+//        if((Boolean) map.get("pkbs")){
-            map.put("p","1");
+//            map.put("p","1");
-        }
+//        }
-        if((Boolean) map.get("dmbs")){
+//        if((Boolean) map.get("dmbs")){
-            map.put("d","1");
+//            map.put("d","1");
-        }
+//        }
-      return   qmjhMapper.selectQmByQgAndJh(map);
+//      return   qmjhMapper.selectQmByQgAndJh(map);
+      return null;
     }
 
     @Override

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -759,7 +759,7 @@
             qbs,
         qjg_zt,
                                 pk_zt,
-                                dm_zt
+                                dm_zt,dmjhrq,pkjhrq,qjgjhrq,ppzt
 
         )
         SELECT
@@ -796,7 +796,7 @@
         then 'Y'
         else '' end,
         '01',
-            '01','01'
+            '01','01',dm_ydjh.dmrq,dm_ydjh.pkrqm,dm_ydjh.qjgrq,'01'
         from dm_ydjh,dm_bom
                          LEFT JOIN dm_qfxq on dm_qfxq.DC_CH=dm_bom.dcch and dm_qfxq.DC_PL=dm_bom.pl and dm_qfxq.DC_FD=dm_bom.fd
         WHERE

src/main/resources/mappers/pgd/DmPpxxbMapper.xml

@@ -102,4 +102,5 @@
         WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD =#{dcFd}
     </select>
 
+
 </mapper>

src/main/resources/mappers/pgd/PgdQmjhMapper.xml

@@ -43,70 +43,129 @@
         czbh, pl, fd, kw, zl, tlth, ptblx, ljbh, ljmc, ljgg, ljcz, wpfl, jldw, sl, qjgjhrq, qfxqrqxz, qfxqrqdz, gylx, qjgfzry, qsbbh, qjgry, qjgksrq, qjgjsrq, zt, bzry, bzrq, xfry, xfrq, fkry, fkrq, fkyy, id
     </sql>
 
-    <select id="selectQmByQgAndJh" resultType="com.dsic.gj_erp.bean.pgd.Qmqz" parameterType="map">
+    <select id="selectQmByQgAndJh" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj" parameterType="map">
         SELECT
-        dm_ydjh_lj.czbh as lczbh,
+        dm_ydjh_lj.id,
-        dm_ydjh_lj.pl  as lpl ,
+        dm_ydjh_lj.czbh,
-        dm_ydjh_lj.fd  as lfd,
+        dm_ydjh_lj.pl,
-        dm_ydjh_lj.kw  as  lkw,
+        dm_ydjh_lj.fd,
-        dm_ydjh_lj.zl   as lzl,
+        dm_ydjh_lj.kw,
-        dm_ydjh_lj.tlth  as ltlth,
+        dm_ydjh_lj.zl,
-        dm_ydjh_lj.ptblx  as lptblx,
+        dm_ydjh_lj.tlth,
-        dm_ydjh_lj.ljbh as ljbh,
+        dm_ydjh_lj.ptblx,
-        dm_ydjh_lj.ljmc as lljmc,
+        dm_ydjh_lj.ljbh,
-        dm_ydjh_lj.ljgg as lljgg,
+        dm_ydjh_lj.ljmc,
-        dm_ydjh_lj.ljcz as lljcz,
+        dm_ydjh_lj.ljgg,
-        dm_ydjh_lj.wpfl as lwpfl,
+        dm_ydjh_lj.ljcz,
-        dm_ydjh_lj.jldw as ljldw,
+        dm_ydjh_lj.wpfl,
-        dm_ydjh_lj.sl as lsl,
+        dm_ydjh_lj.jldw,
-        dm_ydjh_lj.qfxqrqxz as lqfxqrqxz,
+        dm_ydjh_lj.sl,
-        dm_ydjh_lj.qfxqrqdz as lqfxqrqdz,
+        dm_ydjh_lj.dmjhrq,
-        dm_ydjh_lj.gylx as gylx,
+        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_ydjh_lj.id,
-        pgd_qgjh.czbh,
-        pgd_qgjh.pl,
-        pgd_qgjh.fd,
-        pgd_qgjh.zl,
-        pgd_qgjh.lqlb,
-        pgd_qgjh.kw,
-        pgd_qgjh.tlth,
-        pgd_qgjh.wpgg,
-        pgd_qgjh.wpcz,
-        pgd_qgjh.wpzl,
-        pgd_qgjh.qgjhrq,
-        pgd_qgjh.qfxqrqxz,
-        pgd_qgjh.qfxqrqdz,
-        pgd_qgjh.pwjhwgrq,
-        pgd_qgjh.qgfzry,
-        pgd_qgjh.hxsbbh,
-        pgd_qgjh.hxcd,
-        pgd_qgjh.hxkccd,
-        pgd_qgjh.qgsbbh,
-        pgd_qgjh.qgcd,
-        pgd_qgjh.qgkccd,
-        pgd_qgjh.hxry,
-        pgd_qgjh.hxksrq,
-        pgd_qgjh.hxjsrq,
-        pgd_qgjh.qgry,
-        pgd_qgjh.qgksrq,
-        pgd_qgjh.qgjsrq,
-        pgd_qgjh.zt,
-        pgd_qgjh.bzry,
-        pgd_qgjh.bzrq,
-        pgd_qgjh.xfry,
-        pgd_qgjh.xfrq,
-        pgd_qgjh.fkry,
-        pgd_qgjh.fkrq,
-        pgd_qgjh.fkyy
 
 
 
 
         FROM
-        pgd_qgjh  LEFT JOIN dm_ydjh_lj on    pgd_qgjh.czbh=dm_ydjh_lj.czbh and pgd_qgjh.pl= dm_ydjh_lj.pl and pgd_qgjh.tlth =dm_ydjh_lj.tlth
+        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
-            where 1=1
+        and
+
+        dm_ydjh.dc_pl= dm_ydjh_lj.fd
+
+        where 1=1
         <if test=" dcch!=null and dcch!=''">
             and   dm_ydjh_lj.czbh=#{dcch}
         </if>
@@ -117,33 +176,237 @@
             and   dm_ydjh_lj.tlth=#{tlth}
         </if>
 
+        <if test=" qgkw!=null and qgkw!=''">
+            and   dm_ydjh_lj.kw=#{qgkw}
+        </if>
+
+
+
+        <if test=" dw!=null and dw!=''">
+            and   dm_ydjh_lj.dw=#{dw}
+        </if>
+
+        <if test=" qq!=null and qq!=''">
+            and   dm_ydjh_lj.qq=#{qq}
+        </if>
+
+        <if test="qgbs == true">
+            and   isnull(dm_ydjh.qgfkrq,'')!=''
+        </if>
+
+
         <if  test="lx=='q'.toString()">
-              and isnull(dm_ydjh_lj.qdr,'')=''
+
-            <if test=" q!=null and q!=''">
+            <if test=" zt!=null and zt!=''">
-                and   ISNULL(dm_ydjh_lj.qbs,'')='Y'
+                and   ISNULL(dm_ydjh_lj.qjg_zt,'')=#{zt}
             </if>
 
         </if>
 
         <if  test="lx=='d'.toString()">
-            and isnull(dm_ydjh_lj.dmdr,'')=''
+            <if test=" zt!=null and zt!=''">
-            <if test=" d!=null and d!=''">
+                and   ISNULL(dm_ydjh_lj.dm_zt,'')=#{zt}
-                and   ISNULL(dm_ydjh_lj.dmbs,'')='Y'
             </if>
 
         </if>
 
         <if  test="lx=='p'.toString()">
-            and isnull(dm_ydjh_lj.pkdr,'')=''
+            <if test=" zt!=null and zt!=''">
-            <if test=" p!=null and p!=''">
+                and   ISNULL(dm_ydjh_lj.pk_zt,'')=#{zt}
-                and   ISNULL(dm_ydjh_lj.pkdr,'')='Y'
             </if>
 
         </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,
+        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
+
+
+
+
+
+        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
+
+        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>
+
+
+
+<!--            <if  test="zt=='01'.toString()">-->
+<!--                and   (isnull( dm_ydjh_lj.rkry,'')=''  or   isnull( dm_ydjh_lj.rkrq,'')='')-->
+<!--            </if>-->
+
+
+        <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