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 652925e..5a7e760 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 @@ -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; // 理料计划日期 + + + + + + + + } 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 48bbb90..a0000fa 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 @@ -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; /** *

@@ -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 list = ppxxbService.list(Wrappers.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){ - List list = ppxxbService.list(Wrappers.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); + public ResultBean getDmppxxbList(@RequestBody Map map){ + List dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh1(map); + return new ResultBean<>(dmYdjhLjs); } @PostMapping("saveDmppxxb") @Transactional(rollbackFor = Exception.class) - public ResultBean save(@RequestBody List list){ - list.forEach(item-> item.setZt("00")); - ppxxbService.saveOrUpdateBatchByMultiId(list); + public ResultBean save(@RequestBody List list){ + Listadds =new ArrayList<>(); + 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 list, HttpServletRequest request){ + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + Listadds =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 list, HttpServletRequest request){ + String bzry= (String) request.getAttribute("yhms"); + String bzrq= DateUtil.format(DateUtil.date(), "yyyy/MM/dd"); + Listadds =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<>(); } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java index 10bc489..e0f4d2a 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java +++ b/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"); - qw.orderBy(true,true,"czbh","pl","fd"); - return new ResultBean(dmYdjhLjService.list(qw)); + List dmYdjhLjs = pgdQmjhMapper.selectQmByQgAndJh(map); + // qw.eq("qbs","Y"); + + return new ResultBean(dmYdjhLjs); } diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index fe1a890..7c3e1ec 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/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 ydjhs = dmYdjhService.list(qw); // 查询上料计划 Map retrunMap =new HashMap(); diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java index aa69dc4..230c09d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdTzjhController.java +++ b/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 gxry = emSbjgryService.list(); List bmbm = syService.em_sbjbb_ZM("bmbm"); // 多为 - List dwxx = dwxxpService.list(); + List dwxxs = dwxxpService.list(); + List qys = dwxxpService.list(new QueryWrapper().select("DISTINCT qy as qy ")); + returnMap.put("qys", qys); + returnMap.put("dwxxs", dwxxs); + returnMap.put("dwxxs1", dwxxs); + + List 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 kwxxs = dm_zhbmpRepository.findByBMLB("PBBM"); + + + + + returnMap.put("resourcesCodes",resourcesCodes); returnMap.put("zyqs",zyqs); returnMap.put("zyrys",zyrys); diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java index dd8ca22..7c3a54f 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java +++ b/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 { - ListselectQmByQgAndJh(Map map); + ListselectQmByQgAndJh(Map map); + ListselectQmByQgAndJh1(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java index 8399f91..b169f48 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdDmjhServiceImpl.java +++ b/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 impl @Autowired DmYdjhLjService dmYdjhLjService; + @Autowired + SYService syService; + @Override public void saveDmPgdXd(List dmjhs, HttpServletRequest request) { @@ -41,7 +46,13 @@ public class PgdDmjhServiceImpl extends ServiceImpl 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 impl if(f.getDmZt().equals("02")){ e.setDmZt("01"); } + e.setId(f.getId()); ups.add(e); }); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java index 7710308..3552b67 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdPkjhServiceImpl.java +++ b/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 impl @Autowired DmYdjhLjService dmYdjhLjService; + @Autowired + SYService syService; + @Override public void savePkPgdJs(List pkjhs, HttpServletRequest request) { Listups= new ArrayList<>(); @@ -54,7 +59,13 @@ public class PgdPkjhServiceImpl extends ServiceImpl 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); diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java index 9c4b0ef..83d5b73 100644 --- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java +++ b/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 impl @Autowired DmYdjhLjService dmYdjhLjService; + @Autowired + SYService syService; @Override public void saveQmPgdJs(List qmjhs, HttpServletRequest request) { @@ -57,14 +61,22 @@ public class PgdQmjhServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void saveQmPgdXd(List qmjhs, HttpServletRequest request) { Listups= 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 impl @Override public List selectQmByQgAndJh(Map map) { - if((Boolean) map.get("qbs")){ - map.put("q","1"); - } - if((Boolean) map.get("pkbs")){ - map.put("p","1"); - } - if((Boolean) map.get("dmbs")){ - map.put("d","1"); - } - return qmjhMapper.selectQmByQgAndJh(map); +// if((Boolean) map.get("qbs")){ +// map.put("q","1"); +// } +// if((Boolean) map.get("pkbs")){ +// map.put("p","1"); +// } +// if((Boolean) map.get("dmbs")){ +// map.put("d","1"); +// } +// return qmjhMapper.selectQmByQgAndJh(map); + return null; } @Override diff --git a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml b/src/main/resources/mappers/jhgk/DmYdjhMapper.xml index d631eeb..40f4d66 100644 --- a/src/main/resources/mappers/jhgk/DmYdjhMapper.xml +++ b/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 diff --git a/src/main/resources/mappers/pgd/DmPpxxbMapper.xml b/src/main/resources/mappers/pgd/DmPpxxbMapper.xml index a3b0cd3..28c1a20 100644 --- a/src/main/resources/mappers/pgd/DmPpxxbMapper.xml +++ b/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} + diff --git a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml b/src/main/resources/mappers/pgd/PgdQmjhMapper.xml index 9c23f21..5aabc22 100644 --- a/src/main/resources/mappers/pgd/PgdQmjhMapper.xml +++ b/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 - SELECT - dm_ydjh_lj.czbh as lczbh, - dm_ydjh_lj.pl as lpl , - dm_ydjh_lj.fd as lfd, - dm_ydjh_lj.kw as lkw, - dm_ydjh_lj.zl as lzl, - dm_ydjh_lj.tlth as ltlth, - dm_ydjh_lj.ptblx as lptblx, - dm_ydjh_lj.ljbh as ljbh, - dm_ydjh_lj.ljmc as lljmc, - dm_ydjh_lj.ljgg as lljgg, - dm_ydjh_lj.ljcz as lljcz, - dm_ydjh_lj.wpfl as lwpfl, - dm_ydjh_lj.jldw as ljldw, - dm_ydjh_lj.sl as lsl, - dm_ydjh_lj.qfxqrqxz as lqfxqrqxz, - dm_ydjh_lj.qfxqrqdz as lqfxqrqdz, - dm_ydjh_lj.gylx as gylx, + 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_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 - where 1=1 + 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 + + where 1=1 and dm_ydjh_lj.czbh=#{dcch} @@ -117,33 +176,237 @@ and dm_ydjh_lj.tlth=#{tlth} + + and dm_ydjh_lj.kw=#{qgkw} + + + + + + and dm_ydjh_lj.dw=#{dw} + + + + and dm_ydjh_lj.qq=#{qq} + + + + and isnull(dm_ydjh.qgfkrq,'')!='' + + + - and isnull(dm_ydjh_lj.qdr,'')='' - - and ISNULL(dm_ydjh_lj.qbs,'')='Y' + + + and ISNULL(dm_ydjh_lj.qjg_zt,'')=#{zt} - and isnull(dm_ydjh_lj.dmdr,'')='' - - and ISNULL(dm_ydjh_lj.dmbs,'')='Y' + + and ISNULL(dm_ydjh_lj.dm_zt,'')=#{zt} - and isnull(dm_ydjh_lj.pkdr,'')='' - - and ISNULL(dm_ydjh_lj.pkdr,'')='Y' + + and ISNULL(dm_ydjh_lj.pk_zt,'')=#{zt} + order by czbh,pl,fd + + + + + + +