xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复工单上料计划生成语句

Browse Source 
2.当对应工序产能不存在时,按照文档日期计算规则设置默认计划期,自动生成抛丸日期和上料日期
3.修复bug
master
董哲奇 1 year ago
parent 3ddc6ccef8
commit f7ccd380d2
10 changed files with 61 additions and 23 deletions
Show Stats Download Patch File Download Diff File

5
src/main/java/com/dsic/gj_erp/bean/jhgk/DmQfxq.java
Unescape View File

@ -94,5 +94,8 @@ public class DmQfxq implements Serializable {
private String shrq;
private String xqzt="0";
@TableField(exist = false)
private String fan;
@TableField(exist = false)
private String zt1;
}

3
src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java
Unescape View File

@ -257,4 +257,7 @@ public class DmPpxxb implements Serializable {
private String qy;
public String getOnlyKey(){
return this.dcCh+this.dcPl+this.dcFd+this.dcTh;
}
}

37
src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java
Unescape View File

@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.jhgk;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmQfxq;
@ -50,22 +51,42 @@ public class YppController {
if (StrUtil.isNotEmpty(qfxq.getDcFd())){
builder.append(" and dc_fd=").append("'").append(qfxq.getDcFd()).append("'");
}
if (StrUtil.isNotEmpty(qfxq.getZt1())){
builder.append(" and zt=").append("'").append(qfxq.getZt1()).append("'");
}
builder.append(" group by dc_ch,dc_pl,dc_fd");
List<DmQfxq> list = qfxqService.list(Wrappers.<DmQfxq>lambdaQuery()
.eq(StrUtil.isNotEmpty(qfxq.getDcCh()),DmQfxq::getDcCh, qfxq.getDcCh())
.eq(StrUtil.isNotEmpty(qfxq.getDcPl()),DmQfxq::getDcPl, qfxq.getDcPl())
.eq(StrUtil.isNotEmpty(qfxq.getDcFd()),DmQfxq::getDcFd, qfxq.getDcFd())
.eq(StrUtil.isNotEmpty(qfxq.getZt()),DmQfxq::getZt,qfxq.getZt())
.notExists(builder.toString())
);
LambdaQueryWrapper<DmQfxq> exists = Wrappers.<DmQfxq>lambdaQuery()
.eq(StrUtil.isNotEmpty(qfxq.getDcCh()), DmQfxq::getDcCh, qfxq.getDcCh())
.eq(StrUtil.isNotEmpty(qfxq.getDcPl()), DmQfxq::getDcPl, qfxq.getDcPl())
.eq(StrUtil.isNotEmpty(qfxq.getDcFd()), DmQfxq::getDcFd, qfxq.getDcFd())
.eq(StrUtil.isNotEmpty(qfxq.getZt()), DmQfxq::getZt, qfxq.getZt());
if (StrUtil.isNotEmpty(qfxq.getFan())){
exists.notExists(builder.toString());
}else {
exists.exists(builder.toString());
}
List<DmQfxq> list = qfxqService.list(exists);
return new ResultBean<>(list);
}
@PostMapping("getLjxx")
public ResultBean<?> getLjxx(@RequestBody Map<String,Object> map){
List<DmPpxxb> dmYdjhLj = ppxxbMapper.getDmWlqd(map);
return new ResultBean<>(dmYdjhLj);
List<DmPpxxb> resultList=new ArrayList<>();
a:
for (DmPpxxb ydjh:dmYdjhLj){
for (int i=0;i<resultList.size();i++){
DmPpxxb item=resultList.get(i);
if (ydjh.getOnlyKey().equals(item.getOnlyKey())){
continue a;
}
}
resultList.add(ydjh);
}
return new ResultBean<>(resultList);
}
@PostMapping("getPpxx")

3
src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java
Unescape View File

@ -46,9 +46,8 @@ public class DmPpxxbController {
@PostMapping("saveDmppxxb")
@Transactional(rollbackFor = Exception.class)
public ResultBean<?> save(@RequestBody List<DmPpxxb> list){
list.forEach(item->item.setZt("00"));
list.forEach(item-> item.setZt("00"));
ppxxbService.saveOrUpdateBatchByMultiId(list);
return new ResultBean<>();
}

2
src/main/java/com/dsic/gj_erp/controller/pgd/PgdPkjhController.java
Unescape View File

@ -46,7 +46,7 @@ public class PgdPkjhController {
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")),"pkZt",(String)map.get("zt"));
qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"pk_zt",(String)map.get("zt"));
qw.eq("pkdr","Y");
qw.orderBy(true,true,"czbh","pl","fd");

2
src/main/java/com/dsic/gj_erp/controller/pgd/PgdQmjhController.java
Unescape View File

@ -47,7 +47,7 @@ public class PgdQmjhController {
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")),"qjgZt",(String)map.get("zt"));
qw.eq(StrUtil.isNotEmpty((String)map.get("zt")),"qjg_zt",(String)map.get("zt"));
qw.eq("qdr","Y");
qw.orderBy(true,true,"czbh","pl","fd");
return new ResultBean(dmYdjhLjService.list(qw));

13
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
Unescape View File

@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
/**
@ -128,6 +129,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
//*******
mxs.forEach(l -> {
double ljgs = 0.0;
AtomicBoolean slflag =new AtomicBoolean(true),pwflag=new AtomicBoolean(true);
for (EmSbcnp cn : cns) {
// 号料 手工切割 倒棱 切端头 自由边 预组
// 曲 （个）
@ -161,11 +163,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
if (cn.getGx().equals("19")) {
ljgs += l.getHxcd() / cn.getDegs();
l.setSlrq(getRq(ljgs, l.getJssj()));
slflag.set(false);
}
//抛丸
if (cn.getGx().equals("20")) {
ljgs += l.getHxcd() / cn.getDegs();
l.setPkrq(getRq(ljgs, l.getJssj()));
l.setPwrq(getRq(ljgs, l.getJssj()));
pwflag.set(false);
}
//理料
if (cn.getGx().equals("21")) {
@ -173,6 +177,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
l.setLlrq(getRq(ljgs, l.getJssj()));
}
}
//当对应工序产能不存在时,按照文档日期计算规则设置默认计划期
if (pwflag.get()&&StrUtil.isNotEmpty(l.getQgrq())){
l.setPwrq(DateUtil.offsetDay(DateUtil.parse(l.getQgrq(),"yyyy/MM/dd"),-2).toString("yyyy/MM/dd"));
}
if (slflag.get()&&StrUtil.isNotEmpty(l.getPwrq())){
l.setSlrq(DateUtil.offsetDay(DateUtil.parse(l.getPwrq(),"yyyy/MM/dd"),-2).toString("yyyy/MM/dd"));
}
this.save(l);
});

8
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java
Unescape View File

@ -136,9 +136,9 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
//修改状态
List<String> idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList());
if (idList.size()>1000){
List<String> list = idList.subList(idList.size() / 1000 * 1000, idList.size());
AtomicInteger index=new AtomicInteger(idList.size()/1000+1);
if (idList.size()>100){
List<String> list = idList.subList(idList.size() / 100 * 100, idList.size());
AtomicInteger index=new AtomicInteger(idList.size()/100+1);
this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
.in( "id",list)
);
@ -146,7 +146,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
baseMapper.tqlj(list);
do {
int i = index.decrementAndGet();
List<String> list1 = idList.subList((index.get()-1)*1000, i*1000);
List<String> list1 = idList.subList((index.get()-1)*100, i*100);
this.update(new UpdateWrapper<DmYdjh>().set("zt","2")
.in( "id",list1)
);

6
src/main/resources/mappers/jhgk/DmYdjhMapper.xml
Unescape View File

@ -302,12 +302,12 @@
dm_ydjh.wpgg as wpgg,
dm_ydjh.wpxh as wpcz,
dm_ydjh.bclqzl as wpzl,
dm_ydjh.slrq as sljhrq,
(IM_CKWPKWP.KWH) AS kwh ,
(IM_CKWPKWP.dc_fd) AS hth,
IM_CKWPKWP.GCDDH as xhth,
(IM_CKWPKWP.LPH) AS lph,
(IM_CKWPKWP.KWH) AS kwh ,
(IM_CKWPKWP.CFCS1) AS cs,
(IM_CKWPKWP.dc_fd) AS hth,
dm_ydjh.slrq as sljhrq,
'00' as zt
from dm_ydjh LEFT JOIN IM_CKWPKWP on

5
src/main/resources/mappers/pgd/DmPpxxbMapper.xml
Unescape View File

@ -76,7 +76,7 @@
ZXWPH, SL, JLDW, WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, drcs, tpxx, dzxqq, xzxqq, gylx, YLZD3, XWH, YLZD9, GYSBH, YHFLH, YLZD6, TQQXZL, LCM3, YLZD5, BZ, DEZL, LCM2, YXZZRQ, YLZD2, LCM5, YLZD8, XNJBS, DRRQ, LCM4, FXWPH, WPCC, FWPJB, JZL, XLCC, YLZD7, SJBCSL, YLZD4, GYLB, DRRY, WPH, YXQSRQ
</sql>
<select id="getDmYdjhLj" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
<select id="getDmYdjhLj" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj">
select
lj.*
from
@ -86,7 +86,8 @@
<select id="getDmWlqd" resultType="com.dsic.gj_erp.bean.pgd.DmPpxxb">
select
wlqd.*
wlqd.dc_ch,xq.dc_pl,wlqd.dc_fd,wlqd.dc_zl,wlqd.dc_ys as dc_th,wlqd.sl as dc_ys,wlqd.dc_ys as dc_yj,
wlqd.wpmc,wlqd.wpgg,wlqd.wpxh,wlqd.ylzd1,wlqd.FXWPH,wlqd.XWH
from
dm_qfxq xq join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl and xq.DC_FD =lj.fd
join dm_wlqd wlqd on lj.czbh=wlqd.dc_ch and lj.ljbh=wlqd.wph

Write Preview
Loading…
Cancel
Save