修正余料,质量

master
xhj 8 months ago
parent e0f95175ee
commit f5ca895ae0

@ -39,6 +39,9 @@ public class MpYlxxpController {
@Autowired @Autowired
DmBchxylpMapper dmBchxylpMapper; DmBchxylpMapper dmBchxylpMapper;
@PostMapping("/getYlList") @PostMapping("/getYlList")
@ResponseBody @ResponseBody
public ResultBean getYlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { public ResultBean getYlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
@ -160,5 +163,14 @@ public class MpYlxxpController {
} }
return new ResultBean(); return new ResultBean();
} }
@PostMapping("/czzjList")
@ResponseBody
public ResultBean czzjList(HttpServletRequest req, @RequestBody Map map ) throws Exception, CustomException {
List<Map> maps = mpYlxxpService.czzjList(map);
return new ResultBean(maps);
}
} }

@ -3,6 +3,9 @@ package com.dsic.gj_erp.service.pgsc;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp; import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
* *
@ -13,4 +16,8 @@ import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
*/ */
public interface MpYlxxpService extends IService<MpYlxxp> { public interface MpYlxxpService extends IService<MpYlxxp> {
public List<Map> czzjList(Map map);
} }

@ -3,8 +3,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp; import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
import com.dsic.gj_erp.mapper.pbsc.MpYlxxpMapper; import com.dsic.gj_erp.mapper.pbsc.MpYlxxpMapper;
import com.dsic.gj_erp.service.pgsc.MpYlxxpService; import com.dsic.gj_erp.service.pgsc.MpYlxxpService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
* *
@ -16,4 +20,12 @@ import org.springframework.stereotype.Service;
@Service @Service
public class MpYlxxpServiceImpl extends ServiceImpl<MpYlxxpMapper, MpYlxxp> implements MpYlxxpService { public class MpYlxxpServiceImpl extends ServiceImpl<MpYlxxpMapper, MpYlxxp> implements MpYlxxpService {
@Autowired
MpYlxxpMapper mpYlxxpMapper;
@Override
public List<Map> czzjList(Map map) {
return mpYlxxpMapper.czzjList(map);
}
} }

@ -59,42 +59,52 @@
SELECT DISTINCT SELECT DISTINCT
RTRIM(MP_DHSJ.DHH) AS DHH, RTRIM(MP_DHSJ.DHH) AS DHH,
RTRIM(MP_DHSJ.WPH) AS WPH, RTRIM(MP_DHSJ.WPH) AS WPH,
MP_DHSJ.DHSL, MP_DHSJ.DHSL,
RTRIM(MP_DHSJ.DC_CH) as DC_CH, RTRIM(MP_DHSJ.DC_CH) as DC_CH,
RTRIM(MP_DHSJ.DC_PL) as DC_PL, RTRIM(MP_DHSJ.DC_PL) as DC_PL,
RTRIM(MP_DHSJ.DC_TH) as DC_TH,
RTRIM(MP_DHSJ.DC_TH ) as DC_TH, RTRIM(MP_DHSJ.DC_PB) as DC_PB,
RTRIM(MP_DHSJ.DC_PB ) as DC_PB,
MP_DHSJ.DC_LPH, MP_DHSJ.DC_LPH,
RTRIM(MP_DHSJ.sjksrqg) as sjksrqg, RTRIM(MP_DHSJ.sjksrqg) as sjksrqg,
RTRIM(DM_WPJBP.WPMC) AS WPMC, RTRIM(DM_WPJBP.WPMC) AS WPMC,
RTRIM(MP_DHSJ.dc_tpmc) AS WPGG , RTRIM(MP_DHSJ.dc_tpmc) AS WPGG,
RTRIM(MP_DHSJ.dc_tpbh) AS WPXH , RTRIM(MP_DHSJ.dc_tpbh) AS WPXH,
RTRIM(QC_ZBSDZP.ZBSH) AS ZBSH, RTRIM(QC_ZBSDZP.ZBSH) AS ZBSH,
RTRIM(QC_ZBSDZP.GG) AS GG, RTRIM(QC_ZBSDZP.GG) AS GG,
RTRIM(QC_ZBSDZP.CZ) AS CZ, RTRIM(QC_ZBSDZP.CZ) AS CZ,
ZJZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 THEN 1 ZJZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10 THEN 1 ELSE 0 END,
ELSE 0 FHZT = CASE
END , WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10
FHZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) = RTRIM(QC_ZBSDZP.GG) AND RTRIM(MP_DHSJ.dc_tpbh) = RTRIM(QC_ZBSDZP.CZ)) THEN '符合' AND (RTRIM(MP_DHSJ.dc_tpmc) = RTRIM(QC_ZBSDZP.GG)
WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) &lt;> RTRIM(QC_ZBSDZP.GG) OR RTRIM(MP_DHSJ.dc_tpbh) &lt;> RTRIM(QC_ZBSDZP.CZ)) THEN '不符' AND RTRIM(MP_DHSJ.dc_tpbh) = RTRIM(QC_ZBSDZP.CZ)) THEN '符合'
WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >= 10
AND (RTRIM(MP_DHSJ.dc_tpmc) &lt;> RTRIM(QC_ZBSDZP.GG)
OR RTRIM(MP_DHSJ.dc_tpbh) &lt;> RTRIM(QC_ZBSDZP.CZ)) THEN '不符'
WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) &lt; 10 THEN '' WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) &lt; 10 THEN ''
END, END,
'' as xz, '' as xz,
qc_zbsdzp.gdh , qc_zbsdzp.gdh,
qc_zbsdzp.ylzd2 qc_zbsdzp.ylzd2
FROM MP_DHSJ
LEFT JOIN DM_WPJBP ON MP_DHSJ.WPH = DM_WPJBP.WPH
LEFT JOIN QC_ZBSDZP ON MP_DHSJ.DC_LPH = QC_ZBSDZP.LPH
where 1=1
<if test=" dcch!=null and dcch!=''">
and MP_DHSJ.DC_CH=#{dcch}
</if>
FROM MP_DHSJ,DM_WPJBP,QC_ZBSDZP <if test=" dcpl!=null and dcpl!='' and dcpl1!=null and dcpl1!='' ">
WHERE MP_DHSJ.WPH *= DM_WPJBP.WPH and MP_DHSJ.dc_pl>=#{dcpl} and MP_DHSJ.dc_pl&lt;=#{dcpl1}
</if>
<if test=" dcpl!=null and dcpl!='' and (dcpl1==null or dcpl1=='') ">
and MP_DHSJ.dc_pl=#{dcpl}
</if>
</select> </select>

Loading…
Cancel
Save