1.修复划线切割界面操作时板材图片错位问题

2.上料理料反馈时增加作业计划id数据
master
董哲奇 8 months ago
parent a22446e628
commit 2a3f0c85d1

@ -20,6 +20,8 @@ public class YcldwInfo {
private Integer dwId; private Integer dwId;
private Integer ceng; private Integer ceng;
private String ydid;
private String czbh; private String czbh;
private String pl; private String pl;
private String fd; private String fd;

@ -17,6 +17,7 @@ public class ShangLiao {
private String pgdId;//只完成即可 private String pgdId;//只完成即可
private Integer dwId; private Integer dwId;
private String ydid;
private Integer ceng; private Integer ceng;
private String czbh; private String czbh;
private String pl; private String pl;

@ -248,11 +248,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
); );
// 生成 数据 // 生成 数据
// baseMapper.xfbc(list);
baseMapper.getTzjh(list,bzry,bzrq); baseMapper.getTzjh(list,bzry,bzrq);
baseMapper.getSljh(list,bzry,bzrq);
baseMapper.getPwjh(list,bzry,bzrq);
baseMapper.getQgjh(list,bzry,bzrq);
baseMapper.tqlj(list); baseMapper.tqlj(list);
do { do {
@ -261,11 +257,7 @@ public class DmYdjhServiceImpl extends ServiceImpl<DmYdjhMapper, DmYdjh> impleme
this.update(new UpdateWrapper<DmYdjh>().set("zt", "2") this.update(new UpdateWrapper<DmYdjh>().set("zt", "2")
.in("id", list1) .in("id", list1)
); );
// baseMapper.xfbc(list1);
baseMapper.getTzjh(list1,bzry,bzrq); baseMapper.getTzjh(list1,bzry,bzrq);
baseMapper.getSljh(list1,bzry,bzrq);
baseMapper.getPwjh(list1,bzry,bzrq);
baseMapper.getQgjh(list1,bzry,bzrq);
baseMapper.tqlj(list1); baseMapper.tqlj(list1);
}while (index.get()>1); }while (index.get()>1);

Loading…
Cancel
Save