tqSygd1(@Param("begin") String begin,@Param("end")String end);
}
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java
index 3f0c5e3..e2caed7 100644
--- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java
@@ -2,7 +2,11 @@ package com.dsic.gj_erp.mapper.jhgk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
*
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqOldMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqOldMapper.java
new file mode 100644
index 0000000..44ca491
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqOldMapper.java
@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.mapper.jhgk;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+public interface DmSygdxqOldMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmZrcjhOldMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmZrcjhOldMapper.java
new file mode 100644
index 0000000..fe2f6bf
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmZrcjhOldMapper.java
@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.mapper.jhgk;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.jhgk.DmZrcjhOld;
+
+/**
+ *
+ * Mapper 接口
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+public interface DmZrcjhOldMapper extends BaseMapper {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
index b5a6484..0251e8a 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java
@@ -51,7 +51,10 @@ public class EmSbjbbServiceImpl extends ServiceImpl impl
if(StringUtils.isNotEmpty(gysbm)){
queryWrapper.eq("GYSBM",gysbm);
}
- queryWrapper.like("SZCS","FP%");
+// queryWrapper.like("SZCS","FP%");
+ if(StringUtils.isNotEmpty(emSbjbbBean.getScbs())){
+ queryWrapper.eq("scbs",emSbjbbBean.getScbs());
+ }
queryWrapper.orderByAsc("szcs");
List emSbjbbs=emSbjbbMapper.selectList(queryWrapper);
return emSbjbbs;
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java
index 1fe5026..c36fb62 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdMxService.java
@@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.jhgk;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhxf;
import com.dsic.gj_erp.bean.jhgk.dto.*;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,7 @@ public interface DmSygdMxService extends IService {
List getTZList(List list);
List getDhList(List list);
ResultBean tqSygd();
+ List tqSygd1(String begin, String end);
Object cgjhdhqk(Map map);
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdxqOldService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdxqOldService.java
new file mode 100644
index 0000000..0dbf16c
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmSygdxqOldService.java
@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.service.jhgk;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+public interface DmSygdxqOldService extends IService {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhOldService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhOldService.java
new file mode 100644
index 0000000..8eba7bc
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/DmZrcjhOldService.java
@@ -0,0 +1,17 @@
+package com.dsic.gj_erp.service.jhgk;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsic.gj_erp.bean.jhgk.DmZrcjhOld;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+public interface DmZrcjhOldService extends IService {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java
index dee482c..d9cf377 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmQfxqServiceImpl.java
@@ -92,6 +92,7 @@ public class DmQfxqServiceImpl extends ServiceImpl impleme
}else {
l.setDrr(username);
l.setDrrq(day);
+ l.setXqzt("0");
this.save(l);
list1.add(l);
}
@@ -138,6 +139,7 @@ public class DmQfxqServiceImpl extends ServiceImpl impleme
}else {
l.setDrr(username);
l.setDrrq(day);
+ l.setXqzt("0");
this.save(l);
list1.add(l);
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index 3db9b23..e1e21b3 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -89,8 +89,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
// String begin=DateUtil.format(DateUtil.nextMonth(),"yyyy/MM/01");
// String end =DateUtil.format(DateUtil.endOfMonth(DateUtil.offsetMonth(DateUtil.date(),3)),"yyyy/MM/dd");
//测试日期
- String begin = "2024/04/01";
- String end = "2024/05/01";
+ String begin = "2023/08/01";
+ String end = "2023/10/31";
//todo 零件
ljService.remove(new QueryWrapper().between("xzglxq", begin, end));
//todo 三月滚动明细
@@ -111,7 +111,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
ypc(mxList);
this.saveBatch(mxList);
baseMapper.setParent(begin, end);
- ResultBean r = new ResultBean(mxList);
+
+ List list= tqSygd1(begin,end);
+// ResultBean r = new ResultBean(mxList);
+ ResultBean r = new ResultBean(list);
r.setSuccess(true);
return r;
}
@@ -125,7 +128,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
// Map> mxMap = list.stream().filter(l->StrUtil.isNotEmpty(l.getTzbh())).collect(Collectors.groupingBy(l -> l.getKw() + l.getZl()));
ComputePlan c=ComputePlan.instance();
c.computeRealCapacity(DateUtil.beginOfMonth(DateUtil.date()), DateUtil.endOfMonth(DateUtil.date()));
- Map> rel=c.getRealCapacityMap();
+ Map>> rel=c.getRealCapacityMap();
//加工工序list
List sbcnp =c.getSbcnList();
@@ -146,48 +149,65 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
* @param l 当前加工钢板
* @param list 加工顺序
*/
- public void jggx(Map> rel,DmSygdMx l,List list){
+ public void jggx( Map>> rel,DmSygdMx l,List list){
String date="";
+ Map map=new TreeMap<>();
for (EmSbcnp cn : list) {
//上料
if (cn.getGx().equals("19")) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),1, date);
+ map=xhcn(rel,null,cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setSlrq(date);
+ l.setSlsb(map.get("sbbh"));
}
//抛丸
if (cn.getGx().equals("20")) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),1, date);
+ map=xhcn(rel,null,cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setPwrq(date);
+ l.setPwsb(map.get("sbbh"));
}
//理料
if (cn.getGx().equals("21")) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),1, date);
+ map=xhcn(rel,null,cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setLlrq(date);
+ l.setLlsb(map.get("sbbh"));
}
// 划线
if ("01,02".indexOf(cn.getGx()) > -1 && l.getHxcd()>0) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),l.getHxcd(), date);
+ map=xhcn(rel,cn.getKw(),cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setHxrq(date);
+ l.setHxsb(map.get("sbbh"));
}
//切割
if ("03,04,05,06,07".indexOf(cn.getGx()) > -1 && l.getQgcd()>0) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),l.getQgcd(), date);
+ map=xhcn(rel,cn.getKw(),cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setQgrq(date);
+ l.setQgsb(map.get("sbbh"));
}
// 坡口
if (ObjectUtil.isNotEmpty(l.getPkcd()) && ("08,10".indexOf(cn.getGx()) > 0)) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),l.getPkcd(), date);
+ map=xhcn(rel,cn.getKw(),cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setPkrq(date);
+ l.setPksb(map.get("sbbh"));
}
// 打磨
if (ObjectUtil.isNotEmpty(l.getDmcd()) && ("16,13".indexOf(cn.getGx()) > 0)) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),l.getDmcd(), date);
+ map=xhcn(rel,cn.getKw(),cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setDmrq(date);
+ l.setDmsb(map.get("sbbh"));
}
// 曲 （个）
if (StrUtil.isNotEmpty(l.getQbs()) && cn.getGx().equals("18")) {
- date=xhcn(rel,cn.getSbbh(),cn.getGx(),l.getLjsl(), date);
+ map=xhcn(rel,cn.getKw(),cn.getGx(),1, date);
+ date=map.get("jgsj");
l.setQjgrq(date);
+ l.setQsb(map.get("sbbh"));
}
// 号料 手工切割 倒棱 切端头 自由边 预组
@@ -197,38 +217,56 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
/**
* 消耗产能
* @param rel 实际产能,默认未来三个月
- * @param sbbh 设备编号
+ * @param kw 跨位
* @param gx 工序
* @param gzl 工作量
* @param kssj 上一道工序的加工时间
* @return
*/
- public String xhcn(Map> rel,String sbbh,String gx,double gzl ,String kssj){
- String jgsj="";
- if (gzl==0)return jgsj;
+ public Map xhcn(Map>> rel,String kw,String gx,double gzl ,String kssj){
+ Map map=new TreeMap<>();
+ map.put("jgsj","");
+ map.put("sbbh","");
+ if (gzl==0)return map;
+ String kwAndGx=kw+gx;
for (String date:rel.keySet()){
- if (date.compareTo(kssj)>=0||StrUtil.isEmpty(kssj)){
- for (RealCapacity l:rel.get(date)){
- if (l.getDeviceName().equals(sbbh)&&l.getGx().equals(gx)){
- if (l.getCapacity()>=gzl){
- int index = rel.get(date).indexOf(l);
- l.setCapacity(l.getCapacity()-gzl);
- rel.get(date).set(index,l);
- jgsj=l.getDate();
- return jgsj;
- }else if (l.getCapacity()!=0.0){
- gzl=gzl-l.getCapacity();
- l.setCapacity(new Double(0.0));
- int index = rel.get(date).indexOf(l);
- rel.get(date).set(index,l);
- break;
- }
+ if (StrUtil.isEmpty(kssj)||date.compareTo(kssj)>=0){
+ //日期下 跨位+工序分组
+ Map> kwMap= rel.get(date);
+ if (ObjectUtil.isEmpty(kwMap.get(kwAndGx)))break;
+ for (RealCapacity l : kwMap.get(kwAndGx)) {
+ if (l.getCapacity()>=gzl){
+ int index = rel.get(date).get(kwAndGx).indexOf(l);
+ l.setCapacity(l.getCapacity()-gzl);
+ rel.get(date).get(kwAndGx).set(index,l);
+ map.put("jgsj",l.getDate());
+ map.put("sbbh",l.getDeviceName());
+ return map;
+ }else if (l.getCapacity()!=0.0){
+ gzl=gzl-l.getCapacity();
+ l.setCapacity(new Double(0.0));
+ int index = rel.get(date).get(kwAndGx).indexOf(l);
+ rel.get(date).get(kwAndGx).set(index,l);
+ map.put("jgsj",l.getDate());
+ map.put("sbbh",l.getDeviceName());
+// break;
}
}
+// for (String kwAndGx :kwMap.keySet()){
+// if (kwAndGx.equals(kw+gx)){
+// // 设备 list
+// }
+// }
+// for (RealCapacity l:rel.get(date)){
+// //设备 改为 跨位
+// if (l.getKw().equals(kw)&&l.getGx().equals(gx)){
+//
+// }
+// }
}
}
- return jgsj;
+ return map;
}
@@ -762,4 +800,45 @@ public class DmSygdMxServiceImpl extends ServiceImpl i
sygdService.saveBatch(sygdList);
return new ResultBean(sygdList);
}
+
+ @Transactional
+ public List tqSygd1(String begin,String end){
+
+ List list= baseMapper.tqSygd1(begin,end);
+ List list2=new ArrayList<>();
+ //1行分为两行
+ for (DmYdjhxf l : list) {
+ DmYdjhxf ydjhxf1=new DmYdjhxf();//第二行
+ ydjhxf1.setDcCh(l.getDcCh());
+ ydjhxf1.setDcPl(l.getDcPl());
+ String[] fds= l.getDcFd().split(" ");
+ double count= fds.length%2;
+ int index;
+ if (count>0){
+ index= (fds.length/2)+1;
+
+ }else {
+ index= fds.length/2;
+ }
+ String fd1= Arrays.toString(Arrays.copyOfRange(fds, 0, index)).replace(","," ");// 截取索引0（包括）到索引index（不包括）的元素
+ String fd2= Arrays.toString(Arrays.copyOfRange(fds, index, fds.length)).replace(","," ");
+
+ l.setDcFd(fd1.substring(1,fd1.lastIndexOf("]")));
+ ydjhxf1.setDcFd(fd2.substring(1,fd2.lastIndexOf("]")));
+ ydjhxf1.setEksk(l.getEksk2());
+ ydjhxf1.setEkskks(l.getEkskks2());
+ if (StrUtil.isNotEmpty(l.getSkbs())){
+ l.setZl("X");//4跨普通板
+ }
+ if (StrUtil.isNotEmpty(l.getSkbs2())){
+ ydjhxf1.setZl("Z");//2跨T型材腹板
+ }
+ ydjhxf1.setSkbs(l.getSkbs2());
+ ydjhxf1.setSkqgks(l.getSkqgks2());
+ list2.add(l);
+ list2.add(ydjhxf1);
+ }
+
+ return list2;
+ }
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqOldServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqOldServiceImpl.java
new file mode 100644
index 0000000..5f93291
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqOldServiceImpl.java
@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jhgk.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
+import com.dsic.gj_erp.mapper.jhgk.DmSygdxqOldMapper;
+import com.dsic.gj_erp.service.jhgk.DmSygdxqOldService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+@Service
+public class DmSygdxqOldServiceImpl extends ServiceImpl implements DmSygdxqOldService {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
index 41efdc7..f15f9f1 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdxqServiceImpl.java
@@ -1,13 +1,23 @@
package com.dsic.gj_erp.service.jhgk.impl;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jcsj.DmBom;
+import com.dsic.gj_erp.bean.jhgk.DmSygdMx;
import com.dsic.gj_erp.bean.jhgk.DmSygdxq;
+import com.dsic.gj_erp.bean.jhgk.DmSygdxqOld;
import com.dsic.gj_erp.mapper.jhgk.DmSygdxqMapper;
+import com.dsic.gj_erp.service.jcsj.DmBomService;
+import com.dsic.gj_erp.service.jhgk.DmSygdMxService;
+import com.dsic.gj_erp.service.jhgk.DmSygdxqOldService;
import com.dsic.gj_erp.service.jhgk.DmSygdxqService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -24,6 +34,12 @@ import java.util.List;
@Service
public class DmSygdxqServiceImpl extends ServiceImpl implements DmSygdxqService {
+ @Autowired
+ DmSygdxqOldService oldService;
+ @Autowired
+ DmSygdMxService sygdMxService;
+ @Autowired
+ DmBomService bomService;
@Override
@Transactional
public void saveXzList(List list,String username,String day){
@@ -35,6 +51,9 @@ public class DmSygdxqServiceImpl extends ServiceImpl i
.eq("DC_FD",l.getDcFd())
);
if (ObjUtil.isNotEmpty(sygdxq)){
+ //存进备份表
+ DmSygdxqOld old= BeanUtil.copyProperties(sygdxq, DmSygdxqOld.class);
+ oldService.save(old);
l.setDrcs(sygdxq.getDrcs()+1);
l.setXzglxqOld(sygdxq.getXzglxq());
l.setDrr(username);
@@ -63,13 +82,13 @@ public class DmSygdxqServiceImpl extends ServiceImpl i
.eq("dc_pl",l.getDcPl())
.eq("DC_FD",l.getDcFd())
);
+ //todo 修正三月滚动
+ correctSygdmx(l.getDcCh(),l.getDcPl(),l.getDcFd(),l.getXzglxq());
}else {
l.setDrr(username);
l.setDrrq(day);
this.save(l);
}
-
-
});
}
@@ -105,11 +124,30 @@ public class DmSygdxqServiceImpl extends ServiceImpl i
this.save(l);
}
});
+
}
//零件信息
- public void generateLjxx(List list){
+ public void correctSygdmx(String ch,String pl,String fd,String xqsj){
//根据：本次导入的三月需求期 提取BOM 生成三月需求零件信息
+ List list= sygdMxService.list(new QueryWrapper()
+ .eq("dc_ch",ch)
+ .eq("dc_pl",pl)
+ .in("tzbh"," SELECT dm_bom.tzbh FROM dm_bom WHERE dm_bom.dcch='"+ch+"' and dm_bom.pl='"+pl+"' and dm_bom.fd='"+fd+"'"));
+ DateTime dateTime= DateUtil.parse(xqsj,"yyyy/MM/dd");
+ list.forEach(l->{
+ l.setJssj(xqsj);
+ l.setSlrq(DateUtil.offsetDay(dateTime,-9).toString());//8
+ if (l.getKw().equals("16")){//型材
+ l.setPwrq(DateUtil.offsetDay(dateTime,-5).toString());//4
+ }else {
+ l.setPwrq(DateUtil.offsetDay(dateTime,-8).toString());//7
+ }
+
+ l.setHxrq(DateUtil.offsetDay(dateTime,-3).toString());//2
+ l.setQgrq(DateUtil.offsetDay(dateTime,-3).toString());//2
+ sygdMxService.save(l);
+ });
}
}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhOldServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhOldServiceImpl.java
new file mode 100644
index 0000000..6929a62
--- /dev/null
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhOldServiceImpl.java
@@ -0,0 +1,21 @@
+package com.dsic.gj_erp.service.jhgk.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsic.gj_erp.bean.jhgk.DmZrcjhOld;
+import com.dsic.gj_erp.mapper.jhgk.DmZrcjhOldMapper;
+import com.dsic.gj_erp.service.jhgk.DmZrcjhOldService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ * 服务实现类
+ *
+ *
+ * @author xn
+ * @since 2024-04-14
+ */
+@Service
+public class DmZrcjhOldServiceImpl extends ServiceImpl implements DmZrcjhOldService {
+
+}
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
index 4c2f690..032c5ea 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java
@@ -1,16 +1,16 @@
package com.dsic.gj_erp.service.jhgk.impl;
+import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelReader;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
-import com.dsic.gj_erp.bean.jhgk.DmZrcjh;
+import com.dsic.gj_erp.bean.jhgk.*;
import com.dsic.gj_erp.mapper.jhgk.DmZrcjhMapper;
+import com.dsic.gj_erp.service.jhgk.DmZrcjhOldService;
import com.dsic.gj_erp.service.jhgk.DmZrcjhService;
import com.dsic.gj_erp.util.ExcelUtil;
import com.google.common.collect.Lists;
@@ -43,6 +43,9 @@ public class DmZrcjhServiceImpl extends ServiceImpl impl
@Resource
ModelMapper modelMapper;
+ @Resource
+ DmZrcjhOldService oldService;
+
@Override
public List getList(JSONObject json) {
QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -97,6 +100,9 @@ public class DmZrcjhServiceImpl extends ServiceImpl impl
queryWrapper.eq("DC_FD", dmZrcjh.getDcFd());
DmZrcjh dmZrcjhOne = dmZrcjhMapper.selectOne(queryWrapper);
if (ObjectUtil.isNotEmpty(dmZrcjhOne)) {
+ //存进备份表
+ DmZrcjhOld old= BeanUtil.copyProperties(dmZrcjhOne, DmZrcjhOld.class);
+ oldService.save(old);
String dmZrcjhOneBzr = dmZrcjhOne.getBzr();
String dmZrcjhOneBzrq = dmZrcjhOne.getBzrq();
if (dmZrcjhOneBzr.contains(bzr)) {
diff --git a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
index 2797626..e1daa5a 100644
--- a/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
+++ b/src/main/resources/mappers/jhgk/DmSygdMxMapper.xml
@@ -177,21 +177,25 @@
xcgs,
xcshms as xcms,
bclqzl,
- bcshzl,
- bcylzl,
- bcljtlzl,
- ylbhgg,
+-- bcshzl,
+-- bcylzl,
+-- bcljtlzl,
+-- ylbhgg,
bcqpyld,
hxkc_cd,
qgkc_cd
from dm_sygd_mx_lj
where
- dm_sygd_mx_lj.xzglxq between #{begin} and #{end}
+ dm_sygd_mx_lj.xzglxq between #{begin} and #{end}
GROUP BY dcch, mbch, sjch, PL, tzbh
, lqlb, kw, zl, wpcz, wpgg, ljsl, pklx, qbs, pkbs
- , pkcd, dmbs, dmcd, hxcd,qgcd, xcgs, xcshms, bclqzl
- ,bcshzl, bcylzl, bcljtlzl, ylbhgg, bcqpyld,hxkc_cd,
+ , pkcd, dmbs, dmcd, hxcd,qgcd, xcgs, xcshms, bclqzl,
+-- bcshzl, 板材实耗重量
+-- bcylzl,板材余料重量
+-- bcljtlzl, -- 板材零件套料重量
+-- ylbhgg,
+ bcqpyld,hxkc_cd,
qgkc_cd
order BY jssj, dcch, pl, tzbh
@@ -408,4 +412,103 @@
and MS_DDJBP.sxrq<=#{jsrq}
+
+
+
diff --git a/src/main/resources/mappers/jhgk/DmSygdxqOldMapper.xml b/src/main/resources/mappers/jhgk/DmSygdxqOldMapper.xml
new file mode 100644
index 0000000..479151d
--- /dev/null
+++ b/src/main/resources/mappers/jhgk/DmSygdxqOldMapper.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/src/main/resources/mappers/jhgk/DmZrcjhOldMapper.xml b/src/main/resources/mappers/jhgk/DmZrcjhOldMapper.xml
new file mode 100644
index 0000000..41b4096
--- /dev/null
+++ b/src/main/resources/mappers/jhgk/DmZrcjhOldMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+