master
xhj 8 months ago
parent c6630dce1a
commit 06e4abc78b

@ -49,6 +49,8 @@ public class DmYdjh implements Serializable {
@ApiModelProperty(value = "规格")
private String wpgg;
@TableField(exist = false)
private String wpxh1;
@ApiModelProperty(value = "材质")
private String wpxh;

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
@ -84,7 +85,7 @@ public class MpYlxxp implements Serializable {
private String hxbh;
private Double ylzl;
private BigDecimal ylzl;
private String dcZl2;
@ -94,7 +95,7 @@ public class MpYlxxp implements Serializable {
private String dcPl2;
private Double t1;
private BigDecimal t1;
private String ylbh;
@ -102,7 +103,7 @@ public class MpYlxxp implements Serializable {
private String dcCs;
private Double sl;
private BigDecimal sl;
private String bzrq;
@ -112,7 +113,7 @@ public class MpYlxxp implements Serializable {
private String bz;
private Double l;
private BigDecimal l;
private String dcTzbh2;
@ -135,7 +136,7 @@ public class MpYlxxp implements Serializable {
private String wpgg;
private Double b1;
private BigDecimal b1;
private String dcCh2;

@ -1,7 +1,27 @@
package com.dsic.gj_erp.controller.pbsc;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.hutool.core.date.DateUtil;
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.jcsj.DmBchxylp;
import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.mapper.jcsj.DmBchxylpMapper;
import com.dsic.gj_erp.service.jcsj.DmBchxylpService;
import com.dsic.gj_erp.service.pgsc.MpYlxxpService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* <p>
@ -14,6 +34,131 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/mpYlxxp")
public class MpYlxxpController {
@Autowired
MpYlxxpService mpYlxxpService;
@Autowired
DmBchxylpMapper dmBchxylpMapper;
@PostMapping("/getYlList")
@ResponseBody
public ResultBean getYlList(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
QueryWrapper<MpYlxxp> 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"));
return new ResultBean(mpYlxxpService.list(qw));
}
@PostMapping("/getYlListAdd")
@ResponseBody
public ResultBean getYlListAdd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
return new ResultBean(dmBchxylpMapper.getYlListAdd(map));
}
@PostMapping("/getYlListAddZx")
@ResponseBody
@AuthFunction
public ResultBean getYlListAddZx(HttpServletRequest req, @RequestBody List<DmBchxylp> list) throws Exception, CustomException {
List<MpYlxxp> rList =new ArrayList<>();
for (DmBchxylp dmBchxylp : list) {
// 判断 是否重复导入
List<MpYlxxp> list1 = mpYlxxpService.list(new QueryWrapper<MpYlxxp>().eq("DC_CH", dmBchxylp.getDcCh()).eq("ylbh", dmBchxylp.getYlbh()));
if (list1.size() > 0) {
continue;
}
MpYlxxp mpYlxxp = new MpYlxxp();
mpYlxxp.setHxbh(dmBchxylp.getHxbh());
mpYlxxp.setXh(dmBchxylp.getXh());
mpYlxxp.setDcCh(dmBchxylp.getDcCh());
mpYlxxp.setDcPl(dmBchxylp.getDcPl());
mpYlxxp.setSl(dmBchxylp.getSl());
mpYlxxp.setDcHx(dmBchxylp.getYlzd1());
mpYlxxp.setDcZl(dmBchxylp.getDcZl());
mpYlxxp.setWpgg(dmBchxylp.getWpgg());
mpYlxxp.setWpxh(dmBchxylp.getWpxh());
String ls_wpgg = dmBchxylp.getWpgg();
int li_pos = ls_wpgg.indexOf('*'); // 查找 '*' 的位置
double ldgg = 0;
String ls_gg = "";
// 如果找到 '*' 符号
if (li_pos > 0) {
// 提取 '*' 前的子字符串
ls_gg = ls_wpgg.substring(0, li_pos);
ldgg = Double.parseDouble(ls_wpgg.substring(0, li_pos));
}
// 将字符串转换为 BigDecimal如果是数值型
BigDecimal t1Value;
try {
t1Value = new BigDecimal(ls_gg);
} catch (NumberFormatException e) {
// 处理转换异常
t1Value = BigDecimal.ZERO; // 或根据需要设置默认值
}
mpYlxxp.setT1(t1Value);
String ls_ly_wpgg = dmBchxylp.getYlgg(); // 示例数据
// String ls_gg = "example3"; // 示例数据
String ls_gg1 = "";
String ls_gg2 = "";
String ls_gg3 = "";
int li_pos1 = ls_ly_wpgg.indexOf('*'); // 查找 '*' 的位置
// 如果找到 '*'
if (li_pos1 > 0) {
// 提取 '*' 前的子字符串
ls_gg1 = ls_ly_wpgg.substring(0, li_pos1);
// 提取 '*' 后的子字符串
ls_gg2 = ls_ly_wpgg.substring(li_pos1 + 1);
}
// 拼接 ls_gg 和 ls_ly_wpgg 生成 ls_gg3
ls_gg3 = ls_gg + "*" + ls_ly_wpgg;
// 转换 ls_gg1 和 ls_gg2 为 BigDecimal
BigDecimal b1Value = BigDecimal.ZERO;
BigDecimal lValue = BigDecimal.ZERO;
BigDecimal ylzlValue = BigDecimal.ZERO;
BigDecimal ls_ggDecimal = BigDecimal.ZERO;
try {
b1Value = new BigDecimal(ls_gg1);
lValue = new BigDecimal(ls_gg2);
ls_ggDecimal = new BigDecimal(ls_gg);
} catch (NumberFormatException e) {
// 处理转换错误
// 设置默认值为 0
b1Value = BigDecimal.ZERO;
lValue = BigDecimal.ZERO;
ls_ggDecimal = BigDecimal.ZERO;
}
// 计算 ylzl = round(dec(ls_gg)*dec(ls_gg2)*dec(ls_gg1)*7850/1000000000, 3)
BigDecimal multiplier = new BigDecimal(7850);
BigDecimal divisor = new BigDecimal(1000000000);
ylzlValue = ls_ggDecimal.multiply(lValue).multiply(b1Value).multiply(multiplier).divide(divisor, 3, RoundingMode.HALF_UP);
mpYlxxp.setB1(b1Value);
mpYlxxp.setL(lValue);
mpYlxxp.setYlzl(ylzlValue);
mpYlxxp.setTzbh(dmBchxylp.getTzbh());
mpYlxxp.setYlbh(dmBchxylp.getYlbh());
mpYlxxp.setYlzd1(ls_gg3);
mpYlxxp.setZt("01");
mpYlxxp.setBzrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
mpYlxxp.setBzry((String) req.getAttribute("yhms"));
rList.add(mpYlxxp);
}
return new ResultBean(rList);
}
@PostMapping("/delYlxx")
@ResponseBody
public ResultBean delYlxx(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException {
return new ResultBean(mpYlxxpService.removeById((String) map.get("ylsxh")));
}
@PostMapping("/saveYl")
@ResponseBody
public ResultBean saveYl(HttpServletRequest req, @RequestBody List<MpYlxxp> list) throws Exception, CustomException {
for(MpYlxxp mpYlxxp :list){
if(StringUtils.isBlank(mpYlxxp.getYlsxh())){
}
}
return new ResultBean();
}
}

@ -210,7 +210,16 @@ public class PgdSljhController {
List<DmYdjh> ydjhs = dmYdjhService.list(qw);
// 查询上料计划
List<DmCzjbb> czList = dmCzjbbService.list();
for(DmYdjh dmYdjh :ydjhs){
String cjs="";
DmCzjbb dmCzjbb = czList.stream().filter(fst -> fst.getCzbh().equalsIgnoreCase(dmYdjh.getDcCh())).findFirst().orElse(null);
if(null!=dmCzjbb){
cjs=dmCzjbb.getCjs();
dmYdjh.setWpxh1(cjs+dmYdjh.getWpxh());
}
}
return new ResultBean(ydjhs);
}
@ -224,6 +233,7 @@ public class PgdSljhController {
// 查询库存
List<DmYdjh> list = dmYdjhService.list(new QueryWrapper<DmYdjh>().eq("id", (String) map.get("id")));
return new ResultBean(list);
}
@ -251,7 +261,7 @@ public class PgdSljhController {
}
String cjs1=cjs;
DmYdjh dmYdjh = ydjhs.stream()
.filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH()) &&StringUtils.isNotBlank(fst.getWpgg())
.filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getDCCH()) &&StringUtils.isNotBlank(fst.getWpgg())&& StringUtils.isNotBlank(fst.getWpxh())
&& fst.getWpgg().equalsIgnoreCase(slKc.getWPGG())
&& (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH())
|| (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH()))

@ -148,11 +148,14 @@ public class ZyjhController {
}
if ("QGFK".equals(dto.getZxZtName())){
//无需划线,从理料间获取时才更新垛位信息
if ("42".equals(dto.getZt())){
ycldwInfoService.updatePwWeb(list);
//if ("42".equals(dto.getZt())){
List<YcldwInfo> ycldwInfos = ycldwInfoService.updatePwWeb(list);
//}
for(YcldwInfo y :ycldwInfos){
wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(y));
wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(y));
}
wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
}
zyjhService.updateBatchById(list);
@ -189,7 +192,7 @@ public class ZyjhController {
List<DmYdjh> list = zyjhService.list(Wrappers.<DmYdjh>query()
//执行查询
.eq(StrUtil.isNotEmpty(search.getField()),search.getField(),search.getUser())
.eq(StrUtil.isNotEmpty(search.getZt()),"zt",search.getZt())
.eq(StrUtil.isNotEmpty(search.getZt()),"zt",search.getZt()).or(StrUtil.isNotEmpty(search.getZtHx()),it->it.eq("zt",search.getZtHx()))
.eq(StrUtil.isNotEmpty(search.getDcch()),"dc_ch",search.getDcch())
.le(StrUtil.isNotEmpty(search.getJhrqField()),search.getJhrqField(), DateUtil.date().toString("yyyy/MM/dd"))
//跟踪查询

@ -3,6 +3,9 @@ package com.dsic.gj_erp.mapper.pbsc;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
import java.util.List;
import java.util.Map;
/**
* <p>
* Mapper
@ -13,4 +16,6 @@ import com.dsic.gj_erp.bean.pbsc.MpYlxxp;
*/
public interface MpYlxxpMapper extends BaseMapper<MpYlxxp> {
List<Map> czzjList(Map map);
}

@ -121,13 +121,13 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
dmYdjh.setPgdTzjh(pgdTzjh);
//领取表 早于上料日期
// 套料图早于划线日期
if(StringUtils.isBlank(pgdTzjh.getLqbxfrq())||StringUtils.isBlank(dmYdjh.getSlrq()) ){
if(StringUtils.isBlank(pgdTzjh.getLqbxfrq())||StringUtils.isBlank(dmYdjh.getSljhrq()) ){
// corlor red
dmYdjh.setColor("red");
}else{
DateTime dateStr1 = DateUtil.parse(pgdTzjh.getLqbxfrq(), "yyyy/MM/dd");
DateTime dateStr2 = DateUtil.parse(dmYdjh.getSlrq(), "yyyy/MM/dd");
DateTime dateStr2 = DateUtil.parse(dmYdjh.getSljhrq(), "yyyy/MM/dd");
int result = DateUtil.compare(dateStr1, dateStr2);
if (result > 0) {
System.out.println(dateStr1 + " is after " + dateStr2);

@ -68,7 +68,7 @@ public class PgdDmjhServiceImpl extends ServiceImpl<PgdDmjhMapper, PgdDmjh> impl
DmYdjhLj e= new DmYdjhLj();
e.setDmFkry((String) request.getAttribute("yhms"));
e.setDmFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
e.setDmZt("04");
e.setDmZt("03");
e.setDmFkyy(f.getDmFkyy());
e.setId(f.getId());
ups.add(e);

@ -67,7 +67,7 @@ public class PgdPkjhServiceImpl extends ServiceImpl<PgdPkjhMapper, PgdPkjh> impl
DmYdjhLj e= new DmYdjhLj();
e.setPkFkry((String) request.getAttribute("yhms"));
e.setPkFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
e.setPkZt("04");
e.setPkZt("03");
e.setPkFkyy(f.getPkFkyy());
e.setId(f.getId());
ups.add(e);

@ -78,7 +78,7 @@ public class PgdQmjhServiceImpl extends ServiceImpl<PgdQmjhMapper, PgdQmjh> impl
DmYdjhLj e= new DmYdjhLj();
e.setQjgFkry((String) request.getAttribute("yhms"));
e.setQjgFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
e.setQjgZt("04");
e.setQjgZt("03");
e.setId(f.getId());
ups.add(e);
});

@ -664,7 +664,11 @@
pkbs,
dmbs,
dmcd,
qbs
qbs,
qjg_zt,
pk_zt,
dm_zt
)
SELECT
REPLACE(CAST(CAST(NEWID()AS BINARY(10)) + CAST(GETDATE() AS BINARY(6)) AS UNIQUEIDENTIFIER),'-','') as id,
@ -687,10 +691,20 @@
'' as gylx,
dm_bom.pklx as pklx,
dm_bom.pkcd as pkcd,
dm_bom.pkbs as pkbs,
dm_bom.dmbs as dmbs,
case when isnull(dm_ydjh.pkrq,'')&lt;&gt;''
then 'Y'
else '' end ,
case when isnull(dm_ydjh.dmrq,'')&lt;&gt;''
then 'Y'
else '' end ,
dm_bom.dmcd as dmcd,
dm_bom.qbs as qbs
case when isnull(dm_ydjh.qjgrq,'')&lt;&gt;''
then 'Y'
else '' end,
'01',
'01','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

@ -80,6 +80,12 @@
<if test="ql!= null and ql!=''">
and IM_CKWPKWP.dzwz=#{ql}
</if>
<if test="wpgg!= null and wpgg!=''">
and IM_CKWPKWP.wpgg=#{wpgg}
</if>
<if test="wpxh!= null and wpxh!=''">
and IM_CKWPKWP.wpxh=#{wpxh}
</if>
<if test="rqopt=='01'.toString() ">
and isnull(IM_CKWPKWP.zych,'')=''

@ -55,4 +55,47 @@
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>
<select id="czzjList" parameterType="map" resultType="map">
SELECT DISTINCT
RTRIM(MP_DHSJ.DHH) AS DHH,
RTRIM(MP_DHSJ.WPH) AS WPH,
MP_DHSJ.DHSL,
RTRIM(MP_DHSJ.DC_CH) as DC_CH,
RTRIM(MP_DHSJ.DC_PL) as DC_PL,
RTRIM(MP_DHSJ.DC_TH ) as DC_TH,
RTRIM(MP_DHSJ.DC_PB ) as DC_PB,
MP_DHSJ.DC_LPH,
RTRIM(MP_DHSJ.sjksrqg) as sjksrqg,
RTRIM(DM_WPJBP.WPMC) AS WPMC,
RTRIM(MP_DHSJ.dc_tpmc) AS WPGG ,
RTRIM(MP_DHSJ.dc_tpbh) AS WPXH ,
RTRIM(QC_ZBSDZP.ZBSH) AS ZBSH,
RTRIM(QC_ZBSDZP.GG) AS GG,
RTRIM(QC_ZBSDZP.CZ) AS CZ,
ZJZT = CASE WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 THEN 1
ELSE 0
END ,
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 '符合'
WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) >=10 AND (RTRIM(MP_DHSJ.dc_tpmc) <> RTRIM(QC_ZBSDZP.GG) OR RTRIM(MP_DHSJ.dc_tpbh) <> RTRIM(QC_ZBSDZP.CZ)) THEN '不符'
WHEN LEN(RTRIM(QC_ZBSDZP.ZBSH)) < 10 THEN ''
END,
'' as xz,
qc_zbsdzp.gdh ,
qc_zbsdzp.ylzd2
FROM MP_DHSJ,DM_WPJBP,QC_ZBSDZP
WHERE MP_DHSJ.WPH *= DM_WPJBP.WPH
</select>
</mapper>

Loading…
Cancel
Save