diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java index 2e88e25..d1dad3c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBchxylp.java @@ -129,5 +129,9 @@ public class DmBchxylp implements Serializable { private String drbs; + @ApiModelProperty(value = "物品规格1") + @TableField(exist = false) + private String wpgg1; + } diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index ca38272..233ab1a 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -368,7 +368,7 @@ public class DmYdjh implements Serializable { @AllArgsConstructor private enum ZyjhzxEnum{ - SLPP("11"), // 上料匹配 + SLPP("11"), // 上料匹配 比对库存给上垛位 SLFK("21"), PWPG("31"), PWFK("32"), diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java index 5bd4e95..9c1d93d 100644 --- a/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java +++ b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java @@ -2,6 +2,8 @@ package com.dsic.gj_erp.bean.kc; import lombok.Data; +import java.util.List; + /** * SlKc: * 上料库存 @@ -62,4 +64,7 @@ public class SlKc { private String dyry; private String dyrq; private String ydid; + private Integer xh; + + private List list; } 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 a56b507..c0473c4 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 @@ -1,6 +1,7 @@ package com.dsic.gj_erp.controller.pgd; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -14,12 +15,16 @@ import com.dsic.gj_erp.bean.kc.SlKc; import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.dsic.gj_erp.bean.pgd.PgdTzjh; +import com.dsic.gj_erp.bean.sy.Dm_zhbmp; +import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper; import com.dsic.gj_erp.service.fd.DmCzjbbService; import com.dsic.gj_erp.service.jhgk.DmYdjhService; import com.dsic.gj_erp.service.kc.ImCkwpkwpService; import com.dsic.gj_erp.service.pgd.PgdSljhService; +import com.dsic.gj_erp.service.sy.SYService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -58,7 +63,96 @@ public class PgdSljhController { @Autowired DmCzjbbService dmCzjbbService; + @Autowired + SYService syService; + + @Autowired + Dm_zhbmpRepository dm_zhbmpRepository; + + @PostMapping("/slPrint") + @ResponseBody + public ResultBean slPrint(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + //ls_lsh = F_GETPJH("MM",'00',"MSMS") + String id = syService.f_getpjh("MM", "00", "MSMS"); + //dw_1.object.sllsh[ll_ii] = ls_lsh + //dw_1.object.dyry[ll_ii] = gs_user + //dw_1.object.dyrq[ll_ii] = ls_datetime + ListydupList=new ArrayList<>(); + ListckupList=new ArrayList<>(); + for(SlKc slKc: list){ + if(StringUtils.isBlank(slKc.getSllsh())){ + ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); + imCkwpkwp.setCkh(slKc.getCKH()); + imCkwpkwp.setWph(slKc.getWPH()); + imCkwpkwp.setKwh(slKc.getKWH()); + imCkwpkwp.setNbsbm(slKc.getNBSBM()); + imCkwpkwp.setSllsh(id); + imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); + imCkwpkwp.setDyry((String) req.getAttribute("yhms")); + ckupList.add(imCkwpkwp); + // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + } + if(StringUtils.isNotBlank(slKc.getYdid())){ + DmYdjh ydjh =new DmYdjh(); + // 库存主键 没存 + ydjh.setId(slKc.getYdid()); + ydjh.setZt("11"); + ydupList.add(ydjh); + } + } + + dmYdjhService.updateBatchById(ydupList); + imCkwpkwpService.updateBatchByMultiId(ckupList); + + + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + List zylxs = dm_zhbmpRepository.findByBMLB("zylx"); + List pwwzs = dm_zhbmpRepository.findByBMLB("pwwz"); + List dhql = dm_zhbmpRepository.findByBMLB("DHQL"); + List wpzts = dm_zhbmpRepository.findByBMLB("WPZT"); + + Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map zylxMap = zylxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map pwwzMap = pwwzs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Map wpztMap = wpzts.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + Integer sh=1; + for(SlKc slKc: list){ + slKc.setXh(sh); + sh++; + slKc.setZYLX(zylxMap.get(slKc.getZYLX())); + slKc.setSLDW(qgKwMap.get(slKc.getSLDW())); + slKc.setWPZT(wpztMap.get(slKc.getWPZT())); + + } + int ceil = (int) (Math.ceil((double) list.size() / 40)); + List slKcList= new ArrayList<>(); + if(ceil>1){ + for(int i=0;i ydjhs = dmYdjhService.list(qw); + // List ydjhs = dmYdjhService.list(qw); // 查询上料计划 Map retrunMap =new HashMap(); retrunMap.put("slkcs",slkcs); - retrunMap.put("ydjhs",ydjhs); + retrunMap.put("ydjhs",null); return new ResultBean(retrunMap); } + + @PostMapping("/getKcAndSljh1") + @ResponseBody + public ResultBean getKcAndSljh1(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + + + // 查询库存 + //List slkcs = imCkwpkwpMapper.slxxKcList(map); + + QueryWrapper qw =new QueryWrapper<>(); + qw.eq(StrUtil.isNotEmpty((String)map.get("xqdcch")),"dc_ch",(String)map.get("xqdcch")); + qw.eq(StrUtil.isNotEmpty((String)map.get("xqpl")),"dc_pl",(String)map.get("xqpl")); + // 库存标识 不等于 01 没有匹配上 + + + + if(map.get("rqopt").equals("01")){ + qw.eq("isnull(ZT,'')","2"); + }else if(map.get("rqopt").equals("02")) { + qw.eq("isnull(ZT,'')","2").ne("isnull(slkcdw,'')",""); + }else if(map.get("rqopt").equals("03")) { + qw.eq("isnull(ZT,'')","11"); + } + + List ydjhs = dmYdjhService.list(qw); + // 查询上料计划 + + return new ResultBean(ydjhs); + + } + + @PostMapping("/getydjhByid") @ResponseBody public ResultBean getydjhByid(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { // 查询库存 - DmYdjh id = dmYdjhService.getById((String)map.get("id")); - return new ResultBean(id); + List list = dmYdjhService.list(new QueryWrapper().eq("id", (String) map.get("id"))); + + return new ResultBean(list); } @@ -124,7 +251,7 @@ public class PgdSljhController { } String cjs1=cjs; DmYdjh dmYdjh = ydjhs.stream() - .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH()) + .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH()) &&StringUtils.isNotBlank(fst.getWpgg()) && fst.getWpgg().equalsIgnoreCase(slKc.getWPGG()) && (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH()) || (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH())) @@ -140,8 +267,8 @@ public class PgdSljhController { dmYdjh.setSlxhth(slKc.getGCDDH()); dmYdjh.setSlhth(slKc.getDcFd()); dmYdjh.setSlwlh(slKc.getWPH()); - dmYdjh.setZt("11"); - dmYdjh.setKcbs("01"); + dmYdjh.setSlycldw((Integer) map.get("dw")); + // ImCkwpkwp imCkwpkwp =new ImCkwpkwp(); // imCkwpkwp.setCkh(slKc.getCKH()); @@ -156,11 +283,13 @@ public class PgdSljhController { ydupList.add(dmYdjh); // ckupList.add(imCkwpkwp); - + slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl())); slKc.setZYCH(dmYdjh.getDcCh()); slKc.setZYPL(dmYdjh.getDcPl()); - slKc.setZYLX(dmYdjh.getZl()); + // slKc.setZYLX(dmYdjh.getZl()); slKc.setSLDW(dmYdjh.getKw()); + slKc.setDHH(dmYdjh.getSljhrq()); + //slKc.setPwwz(dmYdjh.getKw()); slKc.setYdid(dmYdjh.getId()); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 ckupList.add(slKc); @@ -176,7 +305,7 @@ public class PgdSljhController { @PostMapping("kcAdnSlZx") @ResponseBody - public void kcAdnSlZx(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { + public ResultBean kcAdnSlZx(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { String str= JSON.toJSONString(map.get("data1")); List slKcs= JSONObject.parseArray(str, SlKc.class); @@ -198,12 +327,15 @@ public class PgdSljhController { imCkwpkwp.setZypl(slKc.getZYPL()); imCkwpkwp.setZylx(slKc.getZYLX()); imCkwpkwp.setSldw(slKc.getSLDW()); + imCkwpkwp.setPwwz(slKc.getPwwz()); + imCkwpkwp.setBz(slKc.getBZ()); + imCkwpkwp.setDhh(slKc.getDHH()); ckupList.add(imCkwpkwp); } imCkwpkwpService.updateBatchByMultiId(ckupList); dmYdjhService.updateBatchById(ydjhs); - + return new ResultBean(); // } @@ -269,5 +401,60 @@ public class PgdSljhController { // return new ResultBean(); // } + + public String getLx(String lqlb ,String zl){ +// 1000 数中大 +// 1001 数小 +// 1002 数中 +// 1003 数大 +// 1004 数曲 + +// 1005 手小 +// 1006 手中 +// 1007 手大 +// 1008 手中大 +// 1009 焊接机器人肘板 -- + + +// 1010 手工 +// 1020 数控 + if("1010".equals(lqlb)){ + if("1110".equals(zl)){ //数中大 + return "1000"; + } + if("1010".equals(zl)){ //数小 + return "1001"; + } + if("1020".equals(zl)){ //数中 + return "1002"; + } + if("1060".equals(zl)){ //数大 + return "1003"; + } + if("4207".equals(zl)||"1090".equals(zl)){ //数大 + return "1004"; + } + + } + if("1020".equals(lqlb)){ + if("1110".equals(zl)){ //手中大 + return "1008"; + } + if("1010".equals(zl)){ //数小 + return "1005"; + } + if("1020".equals(zl)){ //数中 + return "1006"; + } + if("1060".equals(zl)){ //数大 + return "1007"; + } + } + + if("4230".equals(zl)){ //焊接机器人肘板 + return "1009"; + } + return ""; + } } 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 9395d51..a9637aa 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 @@ -13,7 +13,9 @@ import com.dsic.gj_erp.bean.jcsj.DmDwxxp; import com.dsic.gj_erp.bean.jcsj.EmSbjgry; import com.dsic.gj_erp.bean.jhgk.DmTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh; +import com.dsic.gj_erp.bean.sy.Dm_zhbmp; import com.dsic.gj_erp.bean.zyjh.Ycldw; +import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.service.jcsj.DmBclqjbpService; import com.dsic.gj_erp.service.jcsj.DmBclqmxpService; @@ -55,7 +57,8 @@ public class PgdTzjhController { DmDwxxpService dwxxpService; @Autowired YcldwService ycldwService; - + @Autowired + Dm_zhbmpRepository dm_zhbmpRepository; @Autowired @@ -135,6 +138,21 @@ public class PgdTzjhController { returnMap.put("ycldws", ycldws); returnMap.put("bmbm", bmbm); + List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); + List zylxs = dm_zhbmpRepository.findByBMLB("zylx"); + List pwwzs = dm_zhbmpRepository.findByBMLB("pwwz"); + List dhql = dm_zhbmpRepository.findByBMLB("DHQL"); + +// Map qgKwMap = qgkws.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); +// Map zylxMap = zylxs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); +// Map pwwzMap = pwwzs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); +// Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); + returnMap.put("qgkw", qgkws); + returnMap.put("zylx", zylxs); + returnMap.put("pwwz", pwwzs); + returnMap.put("dhql", dhql); + /// zylx 流向 pwwz 抛丸位置 // QGKW 切割跨位 + return new ResultBean(returnMap); } 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 97b89aa..0606763 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 @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; @@ -25,7 +26,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Field; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @RequestMapping("zyjh") @@ -129,7 +132,32 @@ public class ZyjhController { } } + if ("PWFK".equals(dto.getZxZtName())){ + List ycldwInfos = ycldwInfoService.updatePwWeb(list); + for(YcldwInfo y :ycldwInfos){ + wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(y)); + } + + } + if ("HXFK".equals(dto.getZxZtName())){ + List ycldwInfos = ycldwInfoService.updatePwWeb(list); + for(YcldwInfo y :ycldwInfos){ + wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(y)); + } + + } + if ("QGFK".equals(dto.getZxZtName())){ + //无需划线,从理料间获取时才更新垛位信息 + if ("42".equals(dto.getZt())){ + ycldwInfoService.updatePwWeb(list); + } + wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); + wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); + } zyjhService.updateBatchById(list); + + + return new ResultBean<>(); } catch (NoSuchFieldException | IllegalAccessException e) { throw new ServiceException(10001,"属性字段不存在"); @@ -217,52 +245,7 @@ public class ZyjhController { - @PostMapping("slweb") - @Transactional(rollbackFor = Exception.class) - @AuthFunction - public ResultBean slweb(@RequestBody List ydjhs, HttpServletRequest request) { - - for(DmYdjh dmYdjh :ydjhs){ - ShangLiao shangLiao = new ShangLiao(); - dmYdjh.setSlfkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss")); - dmYdjh.setSlfkry( (String) request.getAttribute("yhms")); - shangLiao.setYdjh(dmYdjh); - // shangLiao.setCkwpkwp(); - // shangLiao.setPgdId(); - shangLiao.setDwId(dmYdjh.getSlycldw()); - shangLiao.setCeng(dmYdjh.getSlyclcs()); - shangLiao.setCzbh(dmYdjh.getDcCh()); - shangLiao.setPl(dmYdjh.getDcPl()); - shangLiao.setFd(dmYdjh.getDcFd()); - shangLiao.setKw(dmYdjh.getKw()); - shangLiao.setZl(dmYdjh.getZl()); - shangLiao.setTlth(dmYdjh.getTzbh()); - // shangLiao.setWph(dmYdjh.getm); - shangLiao.setWpgg(dmYdjh.getWpgg()); - shangLiao.setSljhrq(dmYdjh.getSljhrq()); - shangLiao.setQgjhrq(dmYdjh.getSljhrq()); - shangLiao.setBfr( (String) request.getAttribute("yhms")); - shangLiao.setType(Ycldw.DwTypeEnum.YCL); - //更新预处理垛位信息 - if (!shangLiao.checkCkwp()){ - //throw new ServiceException(10009,"物品库存不存在,或库存信息错误"); - } - YcldwInfo info=ycldwInfoService.updateForSl(shangLiao); - - //更新月度计划上料相关字段 - zyjhService.updateForSl(shangLiao); - - //todo 更新库存信息 - wsHandler.sendSlComplete((JSONObject)JSONObject.toJSON(info)); - } - - - - - - return new ResultBean<>(); - } /** * 上料 */ diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java index 1ff96e1..c0cbd73 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/DmBchxylpMapper.java @@ -18,5 +18,6 @@ public interface DmBchxylpMapper extends BaseMapper { public List getBcTJlList(Map map); + public List getYlListAdd(Map map); } diff --git a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java index bc9cbce..c417f6b 100644 --- a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java +++ b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java @@ -179,6 +179,10 @@ public class SYService { if (f_qz.equals("年月")){ f_qz= DateUtil.format(DateUtil.date(),"yyMM"); } + + if (f_qz.equals("年月日")){ + f_qz= DateUtil.format(DateUtil.date(),"yyMMdd"); + } } //确定编码前缀值结束 diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java index c3bdf7a..61a2279 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java @@ -1,12 +1,16 @@ package com.dsic.gj_erp.service.zyjh; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.zyjh.YcldwInfo; import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao; import com.dsic.gj_erp.mapper.zyjh.YcldwInfoMapper; import org.springframework.stereotype.Service; import javax.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; @Service public class YcldwInfoService extends ServiceImpl { @@ -23,7 +27,26 @@ public class YcldwInfoService extends ServiceImpl { @Transactional(rollbackOn = Exception.class) public void updatePw(YcldwInfo info){ - this.removeById(info.getId()); - baseMapper.pwfk(info.getCeng(),info.getDwId()); + + this.removeById(info.getId()); + baseMapper.pwfk(info.getCeng(),info.getDwId()); + + + } + + @Transactional(rollbackOn = Exception.class) + public List updatePwWeb(List list){ + List ad =new ArrayList<>(); + for(DmYdjh info :list){ + YcldwInfo ydid = this.getOne(new QueryWrapper().eq("ydid", info.getId())); + if(null!= ydid){ + ad.add(ydid); + } + this.remove(new QueryWrapper().eq("ydid",info.getId())); + + } + + + return ad; } } 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 be70175..58634a8 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 @@ -13,8 +13,8 @@ public class ZyjhService extends ServiceImpl { public void updateForSl(ShangLiao sl){ LambdaUpdateWrapper wrapper = Wrappers.lambdaUpdate() - .set(DmYdjh::getSlkcdw, sl.getYdjh().getSlkcdw()) - .set(DmYdjh::getSlcs, sl.getYdjh().getSlcs()) + .set(DmYdjh::getSlycldw, sl.getYdjh().getSlycldw()) + .set(DmYdjh::getSlyclcs, sl.getYdjh().getSlyclcs()) .set(DmYdjh::getSlfkrq, sl.getYdjh().getSlfkrq()) .set(DmYdjh::getSlfkry, sl.getYdjh().getSlfkry()) .eq(DmYdjh::getId, sl.getYdjh().getId()); diff --git a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml index c4cf664..5e50cc7 100644 --- a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml +++ b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml @@ -114,4 +114,54 @@ order by dc_ch,dc_pl,dc_zl,tzbh + + + diff --git a/src/main/resources/mappers/kc/ImCkwpkwp.xml b/src/main/resources/mappers/kc/ImCkwpkwp.xml index fea0204..23e1dc3 100644 --- a/src/main/resources/mappers/kc/ImCkwpkwp.xml +++ b/src/main/resources/mappers/kc/ImCkwpkwp.xml @@ -77,16 +77,28 @@ and IM_CKWPKWP.dc_ch=#{dcch} - - and IM_CKWPKWP.dc_pl=#{pl} + + and IM_CKWPKWP.dzwz=#{ql} - and ( isnull(IM_CKWPKWP.ydid,'')='' and isnull(IM_CKWPKWP.sllsh,'')='' ) + + and isnull(IM_CKWPKWP.zych,'')='' + -- and ( isnull(IM_CKWPKWP.ydid,'')='' and isnull(IM_CKWPKWP.sllsh,'')='' ) - and (isnull(IM_CKWPKWP.ydid,'')<>'' or isnull(IM_CKWPKWP.sllsh,'')<>'') + and isnull(IM_CKWPKWP.zych,'')<>'' and isnull(IM_CKWPKWP.sllsh,'')='' +-- and (isnull(IM_CKWPKWP.ydid,'')<>'' or isnull(IM_CKWPKWP.sllsh,'')<>'') + + + + and isnull(IM_CKWPKWP.zych,'')<>'' and isnull(IM_CKWPKWP.sllsh,'')<>'' + + + + and isnull(IM_CKWPKWP.zych,'')<>'' and isnull(IM_CKWPKWP.sllsh,'')<>'' + - order by IM_CKWPKWP.kwh,IM_CKWPKWP.cfcs1 + order by IM_CKWPKWP.kwh,IM_CKWPKWP.cfcs1 desc