作业计划修正,增加余料实体

master
xhj 8 months ago
parent b2087d03c5
commit ffaca6cc90

@ -262,13 +262,14 @@ public class DmYdjh implements Serializable {
private String sldzxqrq; // 大组需求期
// 上料信息
private Integer slkcdw; // 库存垛位
private Integer slcs; // 层数
private String slkcdw; // 库存垛位
private String slcs; // 层数
private String slxhth; // 小合同号
private String slhth; // 合同号
private String slwlh; // 物料号
private String slkcxx; // 所有库存信息
private String slycldw; // 预处理垛位
private Integer slycldw; // 预处理垛位
private Integer slyclcs; // 预处理垛位
// 派工及反馈
private String slpgry; // 派工人
@ -341,6 +342,8 @@ public class DmYdjh implements Serializable {
private String pwjhrq; // 抛丸计划日期
private String lljhrq; // 理料计划日期
private String kcbs; // 库存标识
public void setZtForSl(){
this.zt=ZyjhzxEnum.SLFK.code;
@ -359,6 +362,7 @@ public class DmYdjh implements Serializable {
@AllArgsConstructor
private enum ZyjhzxEnum{
SLPP("11"), // 上料匹配
SLFK("21"),
PWPG("31"),
PWFK("32"),

@ -5,6 +5,8 @@ import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import lombok.Getter;
import lombok.Setter;
import java.math.BigDecimal;
/**
*
*/
@ -20,6 +22,7 @@ public class ImCkwpkwp {
private String kwh;//垛位
@MppMultiId
private String nbsbm;
private String ydid;
private String cfcs1;//层数
@ -31,4 +34,112 @@ public class ImCkwpkwp {
private String qxkcl;//物品数量
private String wpzt;//ky:可用;dy:代用
private BigDecimal jjkcl;
private BigDecimal mfkcl;
private BigDecimal kcje;
private String khth;
private String dhh;
private String bsbs;
private String bssch;
private String ylrkbs;
private String jgflm;
private String ddh;
// private String ckh;
// private String wph;
// private String kwh;
// private String nbsbm;
// private String wpzt;
// private BigDecimal qxkcl;
private String rkrq;
private BigDecimal rkdj;
private String kslx;
private String ksbm;
private String dqbm;
private String kssx;
private String ddtz;
private String cph;
private BigDecimal ddxh;
private String bz;
private String sxrq;
private String wpph;
private BigDecimal djzl;
private BigDecimal zzl;
private String xgrq;
private String xgr;
private String cpbs;
private String hdlx;
private String lph;
private BigDecimal cfcs;
private BigDecimal qxkcl1;
// private String cfcs1;
private String ylzd1;
private String ylzd2;
private String ylzd3;
private String ylzd4;
private String ylzd5;
private String ylzd6;
private BigDecimal ylzd7;
private BigDecimal ylzd8;
private BigDecimal ylzd9;
private BigDecimal ylzd10;
private BigDecimal ylzd11;
private BigDecimal ylzd12;
private BigDecimal ylzd13;
private BigDecimal ylzd14;
private BigDecimal ylzd15;
// private String dcCh;
// private String dcCm;
// private String dcPl;
// private String dcFd;
// private String dcTh;
private String dcZl;
private String dcTz;
private String dcYj;
private String dcYs;
private String dcPb;
private String dcLph;
private String dcTpbh;
private String dcTpmc;
private String dcCh1;
private String dcCm1;
private String dcPl1;
private String flch;
private String flpl;
private String xz;
private String llr;
private String llrq;
private String zych;
private String zypl;
private String zylx;
private String rklx;
private String bgr;
private String bgrq;
private String yxz;
private String ybgr;
private String ybgrq;
private String ykwh;
private BigDecimal dbsl;
private String pwwz;
private String sldw;
private String gcddh;
private String jsczrq;
private String jsczry;
private String fph;
private BigDecimal dddj;
private BigDecimal hsdj;
private BigDecimal jse;
private BigDecimal fks1;
private BigDecimal hkje;
private BigDecimal ftyfje;
private BigDecimal ftyfse;
private String bzr;
private String bzrq;
private String sllsh;
private String dyry;
private String dyrq;
private String yprq;
private String ypsm;
}

@ -0,0 +1,65 @@
package com.dsic.gj_erp.bean.kc;
import lombok.Data;
/**
* SlKc:
*
* @author xhj
* @date 2024/09/07
*/
@Data
public class SlKc {
private String KWH;
private String SXRQ;
private String dzwz;
private String NBSBM;
private String BSBS;
private String BSSCH;
private String DQBM;
private String RKRQ;
private String KSBM;
private String KSSX;
private String KSLX;
private String CGFLM;
private String GCDDH;
private String WPPH;
private Double QXKCL;
private Double RKDJ;
private String KCJE;
private String DHH;
private String KHTH;
private String CPH;
private String DDTZ;
private String DDH;
private String BZ;
private String cpbs;
private String DDXH;
private String CFCS;
private String LPH;
private String CFCS1;
private String QXKCL1;
private String DCCH;
private String DCCM;
private String dcPl;
private String dcFd;
private String DCTH;
private String xz;
private String CKH;
private String WPH;
private String WPMC;
private String WPGG;
private String WPXH;
private String WPFLM;
private String dcTpbh;
private String ZYCH;
private String ZYPL;
private String ZYLX;
private String pwwz;
private String SLDW;
private String WPZT;
private String sllsh;
private String dyry;
private String dyrq;
private String ydid;
}

@ -0,0 +1,143 @@
package com.dsic.gj_erp.bean.pbsc;
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 java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2024-09-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="MpYlxxp对象", description="")
public class MpYlxxp implements Serializable {
private static final long serialVersionUID=1L;
@ApiModelProperty(value = "余料生成日期")
@TableField("SCRQ")
private String scrq;
@ApiModelProperty(value = "余料使用日期")
@TableField("SYRQ")
private String syrq;
@ApiModelProperty(value = "炉批号")
@TableField("DC_LPH")
private String dcLph;
@ApiModelProperty(value = "工作中心")
@TableField("GZZX")
private String gzzx;
@ApiModelProperty(value = "剩余材料存放_跨")
@TableField("YLCJBM")
private String ylcjbm;
@ApiModelProperty(value = "剩余材料存放_垛位号")
@TableField("YLKWH")
private String ylkwh;
@ApiModelProperty(value = "船号")
@TableField("DC_CH")
private String dcCh;
@ApiModelProperty(value = "批量")
@TableField("DC_PL")
private String dcPl;
@ApiModelProperty(value = "组立")
@TableField("DC_ZL")
private String dcZl;
@ApiModelProperty(value = "余料计量单位")
@TableField("JLDW")
private String jldw;
@ApiModelProperty(value = "余料生成日期")
@TableField("XGR")
private String xgr;
@ApiModelProperty(value = "余料生成日期")
@TableField("XGRQ")
private String xgrq;
@TableId(value = "ylsxh", type = IdType.ASSIGN_UUID)
private String ylsxh;
private String tzbh1;
private String ysrq;
private String zt;
private String hxbh;
private Double ylzl;
private String dcZl2;
private Double ylzd4;
private String wpxh;
private String dcPl2;
private Double t1;
private String ylbh;
private String ylzd1;
private String dcCs;
private Double sl;
private String bzrq;
private Double ylzd6;
private String hxfl;
private String bz;
private Double l;
private String dcTzbh2;
private String ylzd3;
@TableField("SYBS")
private String sybs;
private String dcHx;
private Double xh;
private String ylzd2;
private String bzry;
private String tzbh;
private Double ylzd5;
private String wpgg;
private Double b1;
private String dcCh2;
}

@ -0,0 +1,19 @@
package com.dsic.gj_erp.controller.pbsc;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2024-09-08
*/
@RestController
@RequestMapping("/mpYlxxp")
public class MpYlxxpController {
}

@ -0,0 +1,96 @@
package com.dsic.gj_erp.controller.pbsc;
import cn.hutool.core.util.StrUtil;
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.pgd.PgdPwjh;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.service.pgd.PgdPwjhService;
import com.dsic.gj_erp.service.pgsc.impl.PbscServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* <p>
*
* </p>
*
* @author xn
* @since 2023-11-13
*/
@RestController
@RequestMapping("/pgdPwjh")
public class PbPwjhController {
@Autowired
PgdPwjhService pgdPwjhService;
@Autowired
PbscServiceImpl pbscService;
// @PostMapping("/getPbPwList")
// @ResponseBody
// public ResultBean getPwPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
//
// return new ResultBean(pbscService.getPbPwList(map));
//
// }
//
// @PostMapping("/savePwPgdXd")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwPgdXd(HttpServletRequest req, @RequestBody List<PgdPwjh> list) throws Exception, CustomException {
// pgdPwjhService.savePwPgdXd(list,req);
// return new ResultBean();
// }
//
// @PostMapping("/savePwPgdXdBack")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwPgdXdBack(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
// pgdPwjhService.savePwPgdXdBack(list,req);
// return new ResultBean();
// }
//
//
//
// @PostMapping("/savePwPgdFk")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwPgdFk(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
// pgdPwjhService.savePwPgdFk(list,req);
// return new ResultBean();
// }
//
// @PostMapping("/savePwFk")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwFk(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
// pgdPwjhService.savePwFk(list,req);
// return new ResultBean();
// }
//
// @PostMapping("/savePwjhPg")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwjhPg(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
// pgdPwjhService.savePwjhPg(list,req);
// return new ResultBean();
// }
//
// @PostMapping("/savePwjhPgBack")
// @ResponseBody
// @AuthFunction
// public ResultBean savePwjhPgBack(HttpServletRequest req, @RequestBody List<PgdPwjh>list) throws Exception, CustomException {
// pgdPwjhService.savePwjhPgBack(list,req);
// return new ResultBean();
// }
}

@ -2,19 +2,33 @@ package com.dsic.gj_erp.controller.pgd;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
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.fd.DmCzjbb;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
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.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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
@ -32,23 +46,167 @@ public class PgdSljhController {
@Autowired
PgdSljhService pgdSljhService;
@Autowired
DmYdjhService dmYdjhService;
@Autowired
ImCkwpkwpMapper imCkwpkwpMapper;
@Autowired
ImCkwpkwpService imCkwpkwpService;
@PostMapping("/getSljhPgd")
@Autowired
DmCzjbbService dmCzjbbService;
@PostMapping("/getKcAndSljh")
@ResponseBody
public ResultBean getSljhPgd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
QueryWrapper<PgdSljh> qw =new QueryWrapper<>();
public ResultBean getKcAndSljh(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
// 查询库存
List<SlKc> slkcs = imCkwpkwpMapper.slxxKcList(map);
QueryWrapper<DmYdjh> qw =new QueryWrapper<>();
qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"dc_ch",(String)map.get("dcch"));
qw.eq(StrUtil.isNotEmpty((String)map.get("pl")),"dc_pl",(String)map.get("pl"));
// 库存标识 不等于 01 没有匹配上
qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"czbh",(String)map.get("dcch"));
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")),"zt",(String)map.get("zt"));
qw.orderBy(true,true,"czbh","pl","fd");
return new ResultBean(pgdSljhService.list(qw));
if(map.get("rqopt").equals("01")){
qw.ne("isnull(ZT,'')","11");
}else if(map.get("rqopt").equals("02")) {
qw.eq("isnull(ZT,'')","11");
}
List<DmYdjh> ydjhs = dmYdjhService.list(qw);
// 查询上料计划
Map retrunMap =new HashMap();
retrunMap.put("slkcs",slkcs);
retrunMap.put("ydjhs",ydjhs);
return new ResultBean(retrunMap);
}
@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);
}
@PostMapping("kcAdnSlBd")
@ResponseBody
public ResultBean kcAdnSlBd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
String str= JSON.toJSONString(map.get("data1"));
List<SlKc> slKcs= JSONObject.parseArray(str, SlKc.class);
String str1= JSON.toJSONString(map.get("data2"));
List<DmYdjh>ydjhs= JSONObject.parseArray(str1, DmYdjh.class);
List<DmCzjbb> czList = dmCzjbbService.list();
List<DmYdjh>ydupList=new ArrayList<>();
List<SlKc>ckupList=new ArrayList<>();
// 进行比对
for(SlKc slKc :slKcs){
// 获取船级社
String cjs="";
DmCzjbb dmCzjbb = czList.stream().filter(fst -> fst.getCzbh().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null);
if(null!=dmCzjbb){
cjs=dmCzjbb.getCjs();
}
String cjs1=cjs;
DmYdjh dmYdjh = ydjhs.stream()
.filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH())
&& fst.getWpgg().equalsIgnoreCase(slKc.getWPGG())
&& (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH())
|| (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH()))
)
.findFirst()
.orElse(null);
if(null!=dmYdjh){
System.out.println("slKc = " + slKc);
dmYdjh.setSlkcdw(slKc.getKWH());
System.out.println(slKc.getCFCS1()+dmYdjh.getId());
dmYdjh.setSlcs(slKc.getCFCS1());
dmYdjh.setSlxhth(slKc.getGCDDH());
dmYdjh.setSlhth(slKc.getDcFd());
dmYdjh.setSlwlh(slKc.getWPH());
dmYdjh.setZt("11");
dmYdjh.setKcbs("01");
// ImCkwpkwp imCkwpkwp =new ImCkwpkwp();
// imCkwpkwp.setCkh(slKc.getCKH());
// imCkwpkwp.setWph(slKc.getWPH());
// imCkwpkwp.setKwh(slKc.getKWH());
// imCkwpkwp.setNbsbm(slKc.getNBSBM());
// imCkwpkwp.setYdid(dmYdjh.getId());
// imCkwpkwp.setZych(dmYdjh.getDcCh());
// imCkwpkwp.setZypl(dmYdjh.getDcPl());
// imCkwpkwp.setZylx(dmYdjh.getZl());
// imCkwpkwp.setSldw(dmYdjh.getKw());
ydupList.add(dmYdjh);
// ckupList.add(imCkwpkwp);
slKc.setZYCH(dmYdjh.getDcCh());
slKc.setZYPL(dmYdjh.getDcPl());
slKc.setZYLX(dmYdjh.getZl());
slKc.setSLDW(dmYdjh.getKw());
slKc.setYdid(dmYdjh.getId());
ydjhs.remove(dmYdjh); // 从列表中移除找到的元素
ckupList.add(slKc);
}
// 填写 库存垛位 kwh 层数 cfcs1 小合同号 gcddh 合同工 dc_fd 物料号 wph 炉批号 lph
}
Map retrunMap =new HashMap();
retrunMap.put("slkcs",ckupList);
retrunMap.put("ydjhs",ydupList);
return new ResultBean(retrunMap);
}
@PostMapping("kcAdnSlZx")
@ResponseBody
public void kcAdnSlZx(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
String str= JSON.toJSONString(map.get("data1"));
List<SlKc> slKcs= JSONObject.parseArray(str, SlKc.class);
String str1= JSON.toJSONString(map.get("data2"));
List<DmYdjh>ydjhs= JSONObject.parseArray(str1, DmYdjh.class);
List<DmYdjh>ydupList=new ArrayList<>();
List<ImCkwpkwp>ckupList=new ArrayList<>();
//String id = syService.f_getpjh("DM", "SYSTEM", "YLBH");
for(SlKc slKc :slKcs){
ImCkwpkwp imCkwpkwp =new ImCkwpkwp();
imCkwpkwp.setCkh(slKc.getCKH());
imCkwpkwp.setWph(slKc.getWPH());
imCkwpkwp.setKwh(slKc.getKWH());
imCkwpkwp.setNbsbm(slKc.getNBSBM());
imCkwpkwp.setYdid(slKc.getYdid());
imCkwpkwp.setZych(slKc.getZYCH());
imCkwpkwp.setZypl(slKc.getZYPL());
imCkwpkwp.setZylx(slKc.getZYLX());
imCkwpkwp.setSldw(slKc.getSLDW());
ckupList.add(imCkwpkwp);
}
imCkwpkwpService.updateBatchByMultiId(ckupList);
dmYdjhService.updateBatchById(ydjhs);
//
}
@PostMapping("/saveSljhPg")
@ -101,5 +259,15 @@ public class PgdSljhController {
return new ResultBean();
}
// @PostMapping("/getKcAndSljh")
// @ResponseBody
// @AuthFunction
// public ResultBean getKcAndSljh(HttpServletRequest req, @RequestBody List<PgdSljh>list) throws Exception, CustomException {
// pgdSljhService.getKcAndSljh(list,req);
// return new ResultBean();
// }
}

@ -63,6 +63,7 @@ public class ZyjhController {
}
}
@PostMapping("zxweb")
@AuthFunction
public ResultBean<?> zxweb(@RequestBody PgDto dto,HttpServletRequest request) {
if (StrUtil.isEmpty(dto.getZxZtName())) {
throw new ServiceException(10001,"作业计划执行内容不能为空");
@ -119,7 +120,7 @@ public class ZyjhController {
//执行查询
.eq(StrUtil.isNotEmpty(search.getField()),search.getField(),search.getUser())
.eq(StrUtil.isNotEmpty(search.getZt()),"zt",search.getZt())
.eq(StrUtil.isNotEmpty(search.getDcch()),"dcch",search.getDcch())
.eq(StrUtil.isNotEmpty(search.getDcch()),"dc_ch",search.getDcch())
.le(StrUtil.isNotEmpty(search.getJhrqField()),search.getJhrqField(), DateUtil.date().toString("yyyy/MM/dd"))
//跟踪查询
.eq(StrUtil.isNotEmpty(search.getXqrq()),"xqrq",search.getXqrq())
@ -186,8 +187,8 @@ public class ZyjhController {
shangLiao.setYdjh(dmYdjh);
// shangLiao.setCkwpkwp();
// shangLiao.setPgdId();
shangLiao.setDwId(dmYdjh.getSlkcdw());
shangLiao.setCeng(dmYdjh.getSlcs());
shangLiao.setDwId(dmYdjh.getSlycldw());
shangLiao.setCeng(dmYdjh.getSlyclcs());
shangLiao.setCzbh(dmYdjh.getDcCh());
shangLiao.setPl(dmYdjh.getDcPl());
shangLiao.setFd(dmYdjh.getDcFd());

@ -1,7 +1,14 @@
package com.dsic.gj_erp.mapper.kc;
import com.dsic.gj_erp.bean.kc.ImCkwpkwp;
import com.dsic.gj_erp.bean.kc.SlKc;
import com.github.jeffreyning.mybatisplus.base.MppBaseMapper;
import java.util.List;
import java.util.Map;
public interface ImCkwpkwpMapper extends MppBaseMapper<ImCkwpkwp> {
List<SlKc> slxxKcList(Map map);
}

@ -0,0 +1,16 @@
package com.dsic.gj_erp.mapper.pbsc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
/**
* <p>
* Mapper
* </p>
*
* @author xhj
* @since 2024-09-08
*/
public interface MpYlxxpMapper extends BaseMapper<MpYlxxp> {
}

@ -0,0 +1,16 @@
package com.dsic.gj_erp.service.pgsc;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2024-09-08
*/
public interface MpYlxxpService extends IService<MpYlxxp> {
}

@ -0,0 +1,19 @@
package com.dsic.gj_erp.service.pgsc.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
import com.dsic.gj_erp.mapper.pbsc.MpYlxxpMapper;
import com.dsic.gj_erp.service.pgsc.MpYlxxpService;
import org.springframework.stereotype.Service;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2024-09-08
*/
@Service
public class MpYlxxpServiceImpl extends ServiceImpl<MpYlxxpMapper, MpYlxxp> implements MpYlxxpService {
}

@ -0,0 +1,35 @@
package com.dsic.gj_erp.service.pgsc.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.pbsc.ImCrklsz;
import com.dsic.gj_erp.mapper.pbsc.ImCrklszMapper;
import com.dsic.gj_erp.service.pgsc.ImCrklszService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2024-07-22
*/
@Service
public class PbscServiceImpl {
@Autowired
ImCrklszMapper imCrklszMapper;
public List<ImCrklsz>getPbPwList(Map map){
List<ImCrklsz> pbpwList = imCrklszMapper.getPbpwList(map);
return pbpwList;
}
}

@ -2,4 +2,91 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper">
<select id="slxxKcList" parameterType="map" resultType="com.dsic.gj_erp.bean.kc.SlKc">
SELECT (IM_CKWPKWP.KWH) AS KWH ,
IM_CKWPKWP.SXRQ ,
MS_DDJBP1.dzwz,
(IM_CKWPKWP.NBSBM) AS NBSBM ,
(IM_CKWPKWP.BSBS) AS BSBS ,
(IM_CKWPKWP.BSSCH) AS BSSCH ,
(IM_CKWPKWP.DQBM) AS DQBM ,
(IM_CKWPKWP.RKRQ) AS RKRQ ,
(IM_CKWPKWP.KSBM) AS KSBM ,
(IM_CKWPKWP.KSSX) AS KSSX ,
(IM_CKWPKWP.KSLX) AS KSLX ,
(IM_CKWPKWP.JGFLM) AS CGFLM ,
IM_CKWPKWP.GCDDH ,
IM_CKWPKWP.WPPH ,
IM_CKWPKWP.QXKCL,
IM_CKWPKWP.RKDJ,
IM_CKWPKWP.KCJE,
(IM_CKWPKWP.DHH) AS DHH,
(IM_CKWPKWP.KHTH) AS KHTH,
(IM_CKWPKWP.CPH) AS CPH,
(IM_CKWPKWP.DDTZ) AS DDTZ,
(IM_CKWPKWP.DDH) AS DDH,
rtrim(IM_CKWPKWP.BZ) AS BZ,
(IM_CKWPKWP.cpbs) AS cpbs,
IM_CKWPKWP.DDXH AS DDXH,
IM_CKWPKWP.cfcs AS CFCS,
(IM_CKWPKWP.LPH) AS LPH,
(IM_CKWPKWP.CFCS1) AS CFCS1,
IM_CKWPKWP.QXKCL1,
(IM_CKWPKWP.DC_CH) AS DC_CH ,
(IM_CKWPKWP.DC_CM) AS DC_CM ,
(IM_CKWPKWP.dc_pl) AS dc_pl ,
(IM_CKWPKWP.dc_fd) AS dc_fd,
(IM_CKWPKWP.DC_TH) AS DC_TH,
'' as xz,
(IM_CKWPKWP.CKH) AS CKH,
(IM_CKWPKWP.WPH) AS WPH,
(DM_WPJBP.WPMC) AS WPMC,
(DM_WPJBP.WPGG) AS WPGG,
(DM_WPJBP.WPXH) AS WPXH,
(DM_WPJBP.WPFLM) AS WPFLM,
(IM_CKWPKWP.dc_tpbh) AS dc_tpbh,
rtrim(IM_CKWPKWP.ZYCH) AS ZYCH ,
rtrim(IM_CKWPKWP.ZYPL) AS ZYPL,
rtrim(IM_CKWPKWP.ZYLX) AS ZYLX,
rtrim(IM_CKWPKWP.pwwz) AS pwwz,
rtrim(IM_CKWPKWP.SLDW) AS SLDW ,
rtrim(IM_CKWPKWP.WPZT) AS WPZT,
sllsh,
dyry,
dyrq,
IM_CKWPKWP.ydid,
'N' as bs,
'N' as bs_all
FROM IM_CKWPKWP
join DM_WPJBP on((IM_CKWPKWP.WPH) = (DM_WPJBP.WPH))
left join (select MS_DDJBP.dzwz,
MS_DDJBP.ddmc,MS_DDMXP.dc_ch
from MS_DDJBP,MS_DDMXP
where MS_DDJBP.CGFLM = MS_DDMXP.CGFLM and MS_DDJBP.DDH = MS_DDMXP.DDH
and MS_DDJBP.CGFLM = '01' and MS_DDJBP.DDLX = 'B') as MS_DDJBP1 on(IM_CKWPKWP.gcddh =MS_DDJBP1.dc_ch )
WHERE( (IM_CKWPKWP.CKH) = '01' )
<if test="dcch != null and dcch!=''">
and IM_CKWPKWP.dc_ch=#{dcch}
</if>
<if test="pl != null and pl!=''">
and IM_CKWPKWP.dc_pl=#{pl}
</if>
<if test="rqopt=='01'.toString() ">
and ( isnull(IM_CKWPKWP.ydid,'')='' and isnull(IM_CKWPKWP.sllsh,'')='' )
</if>
<if test="rqopt=='02'.toString() ">
and (isnull(IM_CKWPKWP.ydid,'')&lt;&gt;'' or isnull(IM_CKWPKWP.sllsh,'')&lt;&gt;'')
</if>
order by IM_CKWPKWP.kwh,IM_CKWPKWP.cfcs1
</select>
</mapper>

@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.pbsc.MpYlxxpMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.gj_erp.bean.pbsc.MpYlxxp">
<id column="ylsxh" property="ylsxh" />
<result column="SCRQ" property="scrq" />
<result column="SYRQ" property="syrq" />
<result column="DC_LPH" property="dcLph" />
<result column="GZZX" property="gzzx" />
<result column="YLCJBM" property="ylcjbm" />
<result column="YLKWH" property="ylkwh" />
<result column="DC_CH" property="dcCh" />
<result column="DC_PL" property="dcPl" />
<result column="DC_ZL" property="dcZl" />
<result column="JLDW" property="jldw" />
<result column="XGR" property="xgr" />
<result column="XGRQ" property="xgrq" />
<result column="tzbh1" property="tzbh1" />
<result column="ysrq" property="ysrq" />
<result column="zt" property="zt" />
<result column="hxbh" property="hxbh" />
<result column="ylzl" property="ylzl" />
<result column="dc_zl2" property="dcZl2" />
<result column="ylzd4" property="ylzd4" />
<result column="wpxh" property="wpxh" />
<result column="dc_pl2" property="dcPl2" />
<result column="t1" property="t1" />
<result column="ylbh" property="ylbh" />
<result column="ylzd1" property="ylzd1" />
<result column="dc_cs" property="dcCs" />
<result column="sl" property="sl" />
<result column="bzrq" property="bzrq" />
<result column="ylzd6" property="ylzd6" />
<result column="hxfl" property="hxfl" />
<result column="bz" property="bz" />
<result column="l" property="l" />
<result column="dc_tzbh2" property="dcTzbh2" />
<result column="ylzd3" property="ylzd3" />
<result column="SYBS" property="sybs" />
<result column="dc_hx" property="dcHx" />
<result column="xh" property="xh" />
<result column="ylzd2" property="ylzd2" />
<result column="bzry" property="bzry" />
<result column="tzbh" property="tzbh" />
<result column="ylzd5" property="ylzd5" />
<result column="wpgg" property="wpgg" />
<result column="b1" property="b1" />
<result column="dc_ch2" property="dcCh2" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
SCRQ, SYRQ, DC_LPH, GZZX, YLCJBM, YLKWH, DC_CH, DC_PL, DC_ZL, JLDW, XGR, XGRQ, ylsxh, tzbh1, ysrq, zt, hxbh, ylzl, dc_zl2, ylzd4, wpxh, dc_pl2, t1, ylbh, ylzd1, dc_cs, sl, bzrq, ylzd6, hxfl, bz, l, dc_tzbh2, ylzd3, SYBS, dc_hx, xh, ylzd2, bzry, tzbh, ylzd5, wpgg, b1, dc_ch2
</sql>
</mapper>
Loading…
Cancel
Save