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

1.修复,上料时修改作业区导致手动修改作业区失效的问题

Browse Source 
2.优化套料图默认施工作业区修正逻辑
master
董哲奇 1 week ago
parent 1d575f5fac
commit 6f46adc49b
3 changed files with 514 additions and 471 deletions
Show Stats Download Patch File Download Diff File

38
src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java
Unescape View File

@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.dsic.gj_erp.bean.pgd.PgdTzjh;
import com.dsic.gj_erp.bean.zyjh.DmYlInfo; import com.dsic.gj_erp.bean.zyjh.DmYlInfo;
import com.dsic.gj_erp.exception.ServiceException; import com.dsic.gj_erp.exception.ServiceException;
import com.google.common.collect.ImmutableList;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -15,6 +16,9 @@ import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
@ -423,6 +427,40 @@ public class DmYdjh implements Serializable {
return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh); return StrUtil.format("{}_{}_{}_{}",this.dcCh,this.dcPl,this.dcFd,this.tzbh);
} }
@TableField(exist = false)
private static final List<String> FP2Q = ImmutableList.of("1","13","14","3","7","8");
@TableField(exist = false)
private static final List<String> FP3Q = ImmutableList.of("6","10","12","2","5","9");
@TableField(exist = false)
private static final List<String> FP4Q = ImmutableList.of("11","4","15");
@TableField(exist = false)
private static final Map<String,List<String>> zyqKwMap=new HashMap<String,List<String>>(){{
put("FP2Q",FP2Q);
put("FP3Q",FP3Q);
put("FP4Q",FP4Q);
}};
public void updateZyq(){
if (this.kw==null){
return;
}
if (FP2Q.contains(this.kw)){
this.setZyq("FP2Q");
this.setZyq1("二区");
}
if (FP3Q.contains(this.kw)){
this.setZyq("FP3Q");
this.setZyq1("三区");
}
if (FP4Q.contains(this.kw)){
this.setZyq("FP4Q");
this.setZyq1("四区");
}
}
public DmYdjh ofPrintForSl(DmYlInfo item,String date){ public DmYdjh ofPrintForSl(DmYlInfo item,String date){
DmYdjh dmYdjh = new DmYdjh(); DmYdjh dmYdjh = new DmYdjh();
dmYdjh.setId(this.id); dmYdjh.setId(this.id);

161
src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java
Unescape View File

@ -128,42 +128,42 @@ public class PgdSljhController {
ydjh.setZylx(slKc.getZYLX()); ydjh.setZylx(slKc.getZYLX());
ydjh.setSlbz(slKc.getBZ()); ydjh.setSlbz(slKc.getBZ());
ydjh.setSldrry((String) req.getAttribute("yhms")); ydjh.setSldrry((String) req.getAttribute("yhms"));
if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) // if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW())
|| "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) // || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW())
){ // ){
ydjh.setZyq("FP2Q"); // ydjh.setZyq("FP2Q");
ydjh.setZyq1("二区"); // ydjh.setZyq1("二区");
//
ydjh.setKw(slKc.getSLDW()); // ydjh.setKw(slKc.getSLDW());
} // }
if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) // if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW())
|| "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) // || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW())
){ // ){
ydjh.setZyq("FP3Q"); // ydjh.setZyq("FP3Q");
ydjh.setZyq1("三区"); // ydjh.setZyq1("三区");
//
ydjh.setKw(slKc.getSLDW()); // ydjh.setKw(slKc.getSLDW());
//
//作业区默认值修正 // //作业区默认值修正
//二跨T型材腹板对应四区 // //二跨T型材腹板对应四区
//二跨T型材面板对应三区 上面已处理 这里只做记录 // //二跨T型材面板对应三区 上面已处理 这里只做记录
if("11".equals(slKc.getSLDW())){ // if("11".equals(slKc.getSLDW())){
ydjh.setZyq("FP4Q"); // ydjh.setZyq("FP4Q");
ydjh.setZyq1("四区"); // ydjh.setZyq1("四区");
} // }
} // }
//
if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) // if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW())
){ // ){
ydjh.setZyq("FP4Q"); // ydjh.setZyq("FP4Q");
ydjh.setZyq1("四区"); // ydjh.setZyq1("四区");
//
ydjh.setKw(slKc.getSLDW()); // ydjh.setKw(slKc.getSLDW());
} // }
if("11".equals(slKc.getSLDW())) { // if("11".equals(slKc.getSLDW())) {
ydjh.setZyq("FP4Q"); // ydjh.setZyq("FP4Q");
ydjh.setZyq1("四区"); // ydjh.setZyq1("四区");
} // }
ydupList.add(ydjh); ydupList.add(ydjh);
} }
if(StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH()) ){ if(StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH()) ){
@ -192,7 +192,6 @@ public class PgdSljhController {
ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm"));
ydjh.setSldrry((String) req.getAttribute("yhms")); ydjh.setSldrry((String) req.getAttribute("yhms"));
if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW())
|| "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW())
){ ){
@ -229,6 +228,12 @@ public class PgdSljhController {
ydjh.setZyq("FP4Q"); ydjh.setZyq("FP4Q");
ydjh.setZyq1("四区"); ydjh.setZyq1("四区");
} }
//20251212 傅春晓 三跨平铁默认三区施工
if("6".equals(slKc.getSLDW())) {
ydjh.setZyq("FP3Q");
ydjh.setZyq1("三区");
}
dmYdjhService.save(ydjh); dmYdjhService.save(ydjh);
} }
} }
@ -668,10 +673,10 @@ public class PgdSljhController {
//作业区默认值修正 //作业区默认值修正
//二跨T型材腹板对应四区 //二跨T型材腹板对应四区
if("11".equals(slKc.getSLDW())){ // if("11".equals(slKc.getSLDW())){
dmYdjh.setZyq("FP4Q"); // dmYdjh.setZyq("FP4Q");
dmYdjh.setZyq1("四区"); // dmYdjh.setZyq1("四区");
} // }
ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 ydjhs.remove(dmYdjh); // 从列表中移除找到的元素
ups.add(dmYdjh); ups.add(dmYdjh);
} }
@ -689,43 +694,43 @@ public class PgdSljhController {
dmYdjh.setId(slKc.getYdid()); dmYdjh.setId(slKc.getYdid());
DmYdjh byId = dmYdjhService.getById(slKc.getYdid()); // DmYdjh byId = dmYdjhService.getById(slKc.getYdid());
if(!byId.getKw().equals(slKc.getSLDW())){ // if(!byId.getKw().equals(slKc.getSLDW())){
// 修改跨位 // 修改作业区 // // 修改跨位 // 修改作业区
//
if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW()) // if("1".equals(slKc.getSLDW()) || "13".equals(slKc.getSLDW()) || "14".equals(slKc.getSLDW()) ||"3".equals(slKc.getSLDW())
|| "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW()) // || "6".equals(slKc.getSLDW())|| "7".equals(slKc.getSLDW())||"8".equals(slKc.getSLDW())
){ // ){
dmYdjh.setZyq("FP2Q"); // dmYdjh.setZyq("FP2Q");
dmYdjh.setZyq1("二区"); // dmYdjh.setZyq1("二区");
dmYdjh.setYkw(byId.getKw()); // dmYdjh.setYkw(byId.getKw());
dmYdjh.setKw(slKc.getSLDW()); // dmYdjh.setKw(slKc.getSLDW());
} // }
if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW()) // if("10".equals(slKc.getSLDW()) || "11".equals(slKc.getSLDW()) || "12".equals(slKc.getSLDW()) ||"2".equals(slKc.getSLDW())
|| "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW()) // || "5".equals(slKc.getSLDW())|| "9".equals(slKc.getSLDW())
){ // ){
dmYdjh.setZyq("FP3Q"); // dmYdjh.setZyq("FP3Q");
dmYdjh.setZyq1("三区"); // dmYdjh.setZyq1("三区");
dmYdjh.setYkw(byId.getKw()); // dmYdjh.setYkw(byId.getKw());
dmYdjh.setKw(slKc.getSLDW()); // dmYdjh.setKw(slKc.getSLDW());
//
//作业区默认值修正 // //作业区默认值修正
//二跨T型材腹板对应四区 // //二跨T型材腹板对应四区
//二跨T型材面板对应三区 上面已处理 这里只做记录 // //二跨T型材面板对应三区 上面已处理 这里只做记录
if("11".equals(slKc.getSLDW())){ // if("11".equals(slKc.getSLDW())){
dmYdjh.setZyq("FP4Q"); // dmYdjh.setZyq("FP4Q");
dmYdjh.setZyq1("四区"); // dmYdjh.setZyq1("四区");
} // }
} // }
//
if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) // if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW())
){ // ){
dmYdjh.setZyq("FP4Q"); // dmYdjh.setZyq("FP4Q");
dmYdjh.setZyq1("四区"); // dmYdjh.setZyq1("四区");
dmYdjh.setYkw(byId.getKw()); // dmYdjh.setYkw(byId.getKw());
dmYdjh.setKw(slKc.getSLDW()); // dmYdjh.setKw(slKc.getSLDW());
} // }
} // }
ups.add(dmYdjh); ups.add(dmYdjh);
} }
ups1.add(imCkwpkwp); ups1.add(imCkwpkwp);

28
src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
Unescape View File

@ -3,7 +3,6 @@ package com.dsic.gj_erp.service.jcsj.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@ -190,9 +189,6 @@ public class BomUploadServiceImpl {
} }
// List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", czbh) // List<DmBom> list = dmBomService.list(new QueryWrapper<DmBom>().eq("sjch", czbh)
// .eq(StrUtil.isNotEmpty((String) pl), "pl",pl) // .eq(StrUtil.isNotEmpty((String) pl), "pl",pl)
// ); // );
@ -351,7 +347,7 @@ public class BomUploadServiceImpl {
// 修正数据 // 修正数据
dmYdjhMapper.xzylbs(czbh, pl); dmYdjhMapper.xzylbs(czbh, pl);
dmYdjhMapper.updatezyq(czbh,pl); //dmYdjhMapper.updatezyq(czbh, pl);
for (MultipartFile f : file) { for (MultipartFile f : file) {
String fname = f.getOriginalFilename(); String fname = f.getOriginalFilename();
fname = fname.substring(fname.lastIndexOf('/') + 1); fname = fname.substring(fname.lastIndexOf('/') + 1);
@ -563,6 +559,7 @@ public class BomUploadServiceImpl {
return map; return map;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map xclqbUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int xcdel, MultipartFile file, String path) throws CustomException { public Map xclqbUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int xcdel, MultipartFile file, String path) throws CustomException {
// 判断是否重复导入 // 判断是否重复导入
@ -1005,6 +1002,7 @@ public class BomUploadServiceImpl {
} }
return map; return map;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map bctltUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int tld, MultipartFile file, String path) throws CustomException, ScriptException { public Map bctltUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int tld, MultipartFile file, String path) throws CustomException, ScriptException {
Map map = new HashMap(); Map map = new HashMap();
@ -1245,6 +1243,7 @@ public class BomUploadServiceImpl {
map.put("yd", "yd"); map.put("yd", "yd");
return map; return map;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map ljptbUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int ldpt, MultipartFile file, String path) throws CustomException { public Map ljptbUpload(List<String> lines, String fileName, HttpServletRequest req, String zt, int ldpt, MultipartFile file, String path) throws CustomException {
List<DmWlqd> adds = new ArrayList<>(); List<DmWlqd> adds = new ArrayList<>();
@ -1373,6 +1372,7 @@ public class BomUploadServiceImpl {
// 根据文件名字得到第二个- 进行拆分 // 根据文件名字得到第二个- 进行拆分
return map; return map;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void insertWpjbbByLjptb(List<DmWlqd> list) { public void insertWpjbbByLjptb(List<DmWlqd> list) {
int wph = dmWpjbpServicel.count(new QueryWrapper<DmWpjbp>().eq("wph", list.get(0).getDcCh() + list.get(0).getDcFd())); int wph = dmWpjbpServicel.count(new QueryWrapper<DmWpjbp>().eq("wph", list.get(0).getDcCh() + list.get(0).getDcFd()));
@ -1422,6 +1422,7 @@ public class BomUploadServiceImpl {
dmWpjbpServicel.saveBatch(adds); dmWpjbpServicel.saveBatch(adds);
} }
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void insertwpjbbByxcLq(String wpmc, String wpxh, String wpgg, String ch, String username) { public void insertwpjbbByxcLq(String wpmc, String wpxh, String wpgg, String ch, String username) {
String wpid = syService.f_getpjh("SS", "SYSTEM", "WPH"); String wpid = syService.f_getpjh("SS", "SYSTEM", "WPH");
@ -1700,7 +1701,8 @@ public class BomUploadServiceImpl {
dmBom.setBh(new BigDecimal(e.getWpgg().split("\\*")[0])); dmBom.setBh(new BigDecimal(e.getWpgg().split("\\*")[0]));
try { try {
dmBom.setBc(new BigDecimal(e.getWpgg().split("\\*")[2])); dmBom.setBc(new BigDecimal(e.getWpgg().split("\\*")[2]));
}catch (Exception e0){} } catch (Exception e0) {
}
String tzbh = e.getTzbh(); String tzbh = e.getTzbh();
String hxlx = ""; String hxlx = "";
@ -2040,6 +2042,7 @@ public class BomUploadServiceImpl {
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjh.setKw(zzcj); dmYdjh.setKw(zzcj);
dmYdjh.updateZyq();
if (null != bchxylp) { if (null != bchxylp) {
dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl()); dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl());
} }
@ -2134,6 +2137,7 @@ public class BomUploadServiceImpl {
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjh.setKw(zzcj); dmYdjh.setKw(zzcj);
dmYdjh.updateZyq();
// dmYdjh.setDcFd(dmBchxjbp.getDcFd()); // dmYdjh.setDcFd(dmBchxjbp.getDcFd());
if (tzbh.substring(4, 5).equals("X")) { if (tzbh.substring(4, 5).equals("X")) {
@ -2213,6 +2217,7 @@ public class BomUploadServiceImpl {
String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String s = (String) kwxxMap.get(tzbh.substring(4, 7));
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjhadd.setKw(zzcj); dmYdjhadd.setKw(zzcj);
dmYdjhadd.updateZyq();
if (null != bchxmxp) { if (null != bchxmxp) {
dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4));
} }
@ -2259,23 +2264,17 @@ public class BomUploadServiceImpl {
} }
} }
} }
rMap.put("adds", adds); rMap.put("adds", adds);
rMap.put("ups", ups); rMap.put("ups", ups);
rMap.put("ydjhs", ydjhs); rMap.put("ydjhs", ydjhs);
return rMap; return rMap;
} }
public void bomxzjhByDm_bchxylp(String dcch, String dcpl, HttpServletRequest req) { public void bomxzjhByDm_bchxylp(String dcch, String dcpl, HttpServletRequest req) {
List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB"); List<Dm_zhbmp> zllbs = dm_zhbmpRepository.findByBMLB("ZLLB");
List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX"); List<Dm_zhbmp> kwxxs = dm_zhbmpRepository.findByBMLB("KWXX");
@ -2373,6 +2372,7 @@ public class BomUploadServiceImpl {
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjh.setKw(zzcj); dmYdjh.setKw(zzcj);
dmYdjh.updateZyq();
// if(null!=bchxylp){ // if(null!=bchxylp){
dmYdjh.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl()); dmYdjh.setYlbs(null == dmBchxylp1.getSfyl() ? "" : dmBchxylp1.getSfyl());
// } // }
@ -2461,6 +2461,7 @@ public class BomUploadServiceImpl {
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjh.setKw(zzcj); dmYdjh.setKw(zzcj);
dmYdjh.updateZyq();
// dmYdjh.setDcFd(dmBchxjbp.getDcFd()); // dmYdjh.setDcFd(dmBchxjbp.getDcFd());
if (tzbh.substring(4, 5).equals("X")) { if (tzbh.substring(4, 5).equals("X")) {
@ -2538,6 +2539,7 @@ public class BomUploadServiceImpl {
String s = (String) kwxxMap.get(tzbh.substring(4, 7)); String s = (String) kwxxMap.get(tzbh.substring(4, 7));
String zzcj = (String) qgKwMap.get(s); //xhj String zzcj = (String) qgKwMap.get(s); //xhj
dmYdjhadd.setKw(zzcj); dmYdjhadd.setKw(zzcj);
dmYdjhadd.updateZyq();
// dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4)); // dmYdjhadd.setDcFd(StringUtils.isBlank(bchxmxp.getWph()) ? "" : bchxmxp.getWph().substring(0, 4));
dmYdjhadd.setZt("2"); dmYdjhadd.setZt("2");
@ -2581,8 +2583,6 @@ public class BomUploadServiceImpl {
} }
} }
} }
// rMap.put("adds",adds); // rMap.put("adds",adds);

Write Preview
Loading…
Cancel
Save