diff --git a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java index ad3f32c..4880561 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java @@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.dsic.gj_erp.bean.jhgk.DmYdjh; +import com.dsic.gj_erp.bean.kc.SlKc; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter @Setter @TableName("im_slxx") +@NoArgsConstructor public class Sljh { @TableId(type = IdType.AUTO) private Integer slid; @@ -51,14 +54,39 @@ public class Sljh { private String lrrq;//导入日期 + public Sljh(SlKc slKc){ + this.lsh="";//fixme 交换码（单张板唯一码）2200049281年度+流水号 + this.ysch=slKc.getDcTpbh(); + this.czbh=slKc.getDCCH(); + this.ql=slKc.getDzwz(); + this.hth=slKc.getDcFd();//购单号 + this.ghsbm=slKc.getGHSBM();//供货商--带到出库接口中-用于成本 + this.xhth=slKc.getGCDDH();//合同号 + this.wlbm=slKc.getLPH();//物料号-炉批号 + this.wph=slKc.getWPH();//物品号 + this.wpmc=slKc.getWPMC();//物品名称 + this.wpgg=slKc.getWPGG();//物品规格 + this.t="";//fixme 物品名称 + this.b="";//fixme 物品名称 + this.l="";//fixme 物品名称 - public static Sljh ofWithYdjh(DmYdjh ydjh){ - Sljh sljh=new Sljh(); - sljh.dcCh=ydjh.getDcCh(); - sljh.dcPl=ydjh.getDcPl(); - sljh.dcLx=ydjh.getLx(); - sljh.dcKw=ydjh.getKw(); - sljh.dcPw=ydjh.getPw(); - return sljh; + this.sllsh=slKc.getSllsh();//上料流水号（20230322001） + this.ylzl="";//fixme 领用重量(KG) + this.kwh=slKc.getKWH();//垛位 + this.kwcs=slKc.getCFCS1();//垛位层数01/02/03等 + + this.dcCh=slKc.getZYCH();//需求船只 + this.dcPl=slKc.getZYPL();//需求批量 + this.dcLx=slKc.getZYLX(); + this.dcKw=slKc.getSLDW();//切割跨位 + this.dcPw=slKc.getPwwz();//抛丸位置 + + this.ddlsh="";//fixme 订单流水号--带到出库接口中-用于成本 + this.ddxh="";//fixme 订单序号--带到出库接口中-用于成本 + this.wpzt="";//fixme 物品状态--新增 + this.lrry=slKc.getDyry();//导入人员 + this.lrrq=slKc.getDyrq();//导入日期 } + + } diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java index 81996fe..d92b8dd 100644 --- a/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java +++ b/src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java @@ -67,6 +67,7 @@ public class SlKc { private Integer xh; private String cz; private String pwbz; + private String GHSBM; private List list; } diff --git a/src/main/java/com/dsic/gj_erp/config/RestTemplateConfig.java b/src/main/java/com/dsic/gj_erp/config/RestTemplateConfig.java new file mode 100644 index 0000000..bab11c4 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/config/RestTemplateConfig.java @@ -0,0 +1,15 @@ +package com.dsic.gj_erp.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class RestTemplateConfig { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} + diff --git a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java index 2b9d6c6..ac65657 100644 --- a/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/pgd/PgdSljhController.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.SpringContextHolder; import com.dsic.gj_erp.bean.jcsj.DmCbxxp; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.kc.ImCkwpkwp; @@ -21,6 +22,7 @@ import com.dsic.gj_erp.controller.zyjh.dto.PwExportExcel; import com.dsic.gj_erp.controller.zyjh.dto.PwpgDto; import com.dsic.gj_erp.dao.sy.Dm_zhbmpRepository; import com.dsic.gj_erp.exception.CustomException; +import com.dsic.gj_erp.jiuzhou.SlPlanEvent; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.mapper.kc.ImCkwpkwpMapper; import com.dsic.gj_erp.service.jcsj.DmCbxxpService; @@ -45,7 +47,7 @@ import java.util.stream.Collectors; /** *

- * 前端控制器 // 入库批号 + * 前端控制器 // 入库批号 *

* * @author xn @@ -69,16 +71,14 @@ public class PgdSljhController { @Autowired ImCkwpkwpMapper imCkwpkwpMapper; @Autowired - ImCkwpkwpService imCkwpkwpService; + ImCkwpkwpService imCkwpkwpService; -// @Autowired + // @Autowired // DmCzjbbService dmCzjbbService; @Autowired DmCbxxpService dmCbxxpService; - - @Autowired SYService syService; @@ -89,158 +89,129 @@ public class PgdSljhController { @ResponseBody @AuthFunction public ResultBean slPrint(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { - //ls_lsh = F_GETPJH("MM",'00',"MSMS") + //ls_lsh = F_GETPJH("MM",'00',"MSMS") String id = syService.f_getpjh("MM", "00", "MSMS"); //dw_1.object.sllsh[ll_ii] = ls_lsh //dw_1.object.dyry[ll_ii] = gs_user //dw_1.object.dyrq[ll_ii] = ls_datetime - ListydupList=new ArrayList<>(); - ListckupList=new ArrayList<>(); - for(SlKc slKc: list){ - String idd=IdWorker.get32UUID(); - if(StringUtils.isBlank(slKc.getSllsh())){ - ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); - imCkwpkwp.setCkh(slKc.getCKH()); - imCkwpkwp.setWph(slKc.getWPH()); - imCkwpkwp.setKwh(slKc.getKWH()); - imCkwpkwp.setNbsbm(slKc.getNBSBM()); - imCkwpkwp.setSllsh(id); - imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); - imCkwpkwp.setDyry((String) req.getAttribute("yhms")); - if(StringUtils.isBlank(slKc.getYdid())){ - imCkwpkwp.setYdid(idd); - - } + List ydupList = new ArrayList<>(); + List ydAddList = new ArrayList<>(); + List ckupList = new ArrayList<>(); + for (SlKc slKc : list) { + String idd = IdWorker.get32UUID(); + if (StringUtils.isBlank(slKc.getSllsh())) { + ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); + imCkwpkwp.setCkh(slKc.getCKH()); + imCkwpkwp.setWph(slKc.getWPH()); + imCkwpkwp.setKwh(slKc.getKWH()); + imCkwpkwp.setNbsbm(slKc.getNBSBM()); + imCkwpkwp.setSllsh(id); + imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); + imCkwpkwp.setDyry((String) req.getAttribute("yhms")); + if (StringUtils.isBlank(slKc.getYdid())) { + imCkwpkwp.setYdid(idd); - ckupList.add(imCkwpkwp); - // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); } - if(StringUtils.isNotBlank(slKc.getYdid())){ - DmYdjh ydjh =new DmYdjh(); - // 库存主键 没存 - ydjh.setId(slKc.getYdid()); - ydjh.setZt("11"); - ydjh.setSllsh(id); - ydjh.setNbsbm(slKc.getNBSBM()); - ydjh.setSllph(slKc.getLPH()); - ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); - ydjh.setZylx(slKc.getZYLX()); - ydjh.setSlbz(slKc.getBZ()); - ydjh.setSldrry((String) req.getAttribute("yhms")); -// 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()) -// ){ -// ydjh.setZyq("FP2Q"); -// ydjh.setZyq1("二区"); -// -// ydjh.setKw(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()) -// ){ -// ydjh.setZyq("FP3Q"); -// ydjh.setZyq1("三区"); -// -// ydjh.setKw(slKc.getSLDW()); -// -// //作业区默认值修正 -// //二跨T型材腹板对应四区 -// //二跨T型材面板对应三区 上面已处理 这里只做记录 -// if("11".equals(slKc.getSLDW())){ -// ydjh.setZyq("FP4Q"); -// ydjh.setZyq1("四区"); -// } -// } -// -// if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) -// ){ -// ydjh.setZyq("FP4Q"); -// ydjh.setZyq1("四区"); -// -// ydjh.setKw(slKc.getSLDW()); -// } -// if("11".equals(slKc.getSLDW())) { -// ydjh.setZyq("FP4Q"); -// ydjh.setZyq1("四区"); -// } - ydupList.add(ydjh); - } - if(StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH()) ){ - DmYdjh ydjh =new DmYdjh(); - ydjh.setId(idd); - - ydjh.setSlkcdw(slKc.getKWH()); - ydjh.setSlcs(slKc.getCFCS1()); - ydjh.setSlxhth(slKc.getGCDDH()); - ydjh.setSlhth(slKc.getDcFd()); - ydjh.setNbsbm(slKc.getNBSBM()); - ydjh.setSllph(slKc.getLPH()); - ydjh.setSlwlh(slKc.getWPH()); - ydjh.setKcch(slKc.getDCCH()); - ydjh.setDcCh(slKc.getZYCH()); - ydjh.setDcPl(slKc.getZYPL()); - ydjh.setTzbh(StringUtils.isBlank(slKc.getDCTH())?"":slKc.getDCTH()); - ydjh.setWpgg(slKc.getWPGG()); + ckupList.add(imCkwpkwp); + // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); + } + + if (StringUtils.isNotBlank(slKc.getYdid())) { + DmYdjh ydjh = new DmYdjh(); + // 库存主键 没存 + ydjh.setId(slKc.getYdid()); + ydjh.setZt("11"); + ydjh.setSllsh(id); + ydjh.setNbsbm(slKc.getNBSBM()); + ydjh.setSllph(slKc.getLPH()); + ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); + ydjh.setZylx(slKc.getZYLX()); + ydjh.setSlbz(slKc.getBZ()); + ydjh.setSldrry((String) req.getAttribute("yhms")); + ydupList.add(ydjh); + } + if (StringUtils.isBlank(slKc.getYdid()) || StringUtils.isBlank(slKc.getDCTH())) { + DmYdjh ydjh = new DmYdjh(); + ydjh.setId(idd); + + ydjh.setSlkcdw(slKc.getKWH()); + ydjh.setSlcs(slKc.getCFCS1()); + ydjh.setSlxhth(slKc.getGCDDH()); + ydjh.setSlhth(slKc.getDcFd()); + ydjh.setNbsbm(slKc.getNBSBM()); + ydjh.setSllph(slKc.getLPH()); + ydjh.setSlwlh(slKc.getWPH()); + ydjh.setKcch(slKc.getDCCH()); + ydjh.setDcCh(slKc.getZYCH()); + ydjh.setDcPl(slKc.getZYPL()); + ydjh.setTzbh(StringUtils.isBlank(slKc.getDCTH()) ? "" : slKc.getDCTH()); + ydjh.setWpgg(slKc.getWPGG()); + ydjh.setKw(slKc.getSLDW()); + ydjh.setWpxh(slKc.getWPXH()); + ydjh.setZylx(slKc.getZYLX()); + ydjh.setSlbz(slKc.getBZ()); + ydjh.setZt("11"); + ydjh.setJhlx("99"); + ydjh.setSllsh(id); + ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); + ydjh.setSldrry((String) req.getAttribute("yhms")); + + 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()) + ) { + ydjh.setZyq("FP2Q"); + ydjh.setZyq1("二区"); + ydjh.setKw(slKc.getSLDW()); - ydjh.setWpxh(slKc.getWPXH()); - ydjh.setZylx(slKc.getZYLX()); - ydjh.setSlbz(slKc.getBZ()); - ydjh.setZt("11"); - ydjh.setJhlx("99"); - ydjh.setSllsh(id); - ydjh.setSldrrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); - ydjh.setSldrry((String) req.getAttribute("yhms")); - - 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()) - ){ - ydjh.setZyq("FP2Q"); - ydjh.setZyq1("二区"); - - ydjh.setKw(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()) - ){ - ydjh.setZyq("FP3Q"); - ydjh.setZyq1("三区"); - - ydjh.setKw(slKc.getSLDW()); - - //作业区默认值修正 - //二跨T型材腹板对应四区 - //二跨T型材面板对应三区 上面已处理 这里只做记录 - if("11".equals(slKc.getSLDW())){ - ydjh.setZyq("FP4Q"); - ydjh.setZyq1("四区"); - } - } + } + 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()) + ) { + ydjh.setZyq("FP3Q"); + ydjh.setZyq1("三区"); - if("4".equals(slKc.getSLDW())|| "15".equals(slKc.getSLDW()) - ){ - ydjh.setZyq("FP4Q"); - ydjh.setZyq1("四区"); + ydjh.setKw(slKc.getSLDW()); - ydjh.setKw(slKc.getSLDW()); - } - if("11".equals(slKc.getSLDW())) { + //作业区默认值修正 + //二跨T型材腹板对应四区 + //二跨T型材面板对应三区 上面已处理 这里只做记录 + if ("11".equals(slKc.getSLDW())) { ydjh.setZyq("FP4Q"); ydjh.setZyq1("四区"); } + } - //20251212 傅春晓 三跨平铁默认三区施工 - if("6".equals(slKc.getSLDW())) { - ydjh.setZyq("FP3Q"); - ydjh.setZyq1("三区"); - } - dmYdjhService.save(ydjh); + if ("4".equals(slKc.getSLDW()) || "15".equals(slKc.getSLDW()) + ) { + ydjh.setZyq("FP4Q"); + ydjh.setZyq1("四区"); + + ydjh.setKw(slKc.getSLDW()); + } + if ("11".equals(slKc.getSLDW())) { + ydjh.setZyq("FP4Q"); + ydjh.setZyq1("四区"); + } + + //20251212 傅春晓 三跨平铁默认三区施工 + if ("6".equals(slKc.getSLDW())) { + ydjh.setZyq("FP3Q"); + ydjh.setZyq1("三区"); } + ydAddList.add(ydjh); + dmYdjhService.save(ydjh); } + } - dmYdjhService.updateBatchById(ydupList); - imCkwpkwpService.updateBatchByMultiId(ckupList); + dmYdjhService.updateBatchById(ydupList); + imCkwpkwpService.updateBatchByMultiId(ckupList); + //=================发布推送上料计划到料场的事件======================== + ydAddList.addAll(ydupList); + SlPlanEvent slPlanEvent = new SlPlanEvent(this, list); + SpringContextHolder.pushEvent(slPlanEvent); + //================================================================ List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); List zylxs = dm_zhbmpRepository.findByBMLB("zylx"); @@ -253,8 +224,8 @@ public class PgdSljhController { Map pwwzMap = pwwzs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); Map wpztMap = wpzts.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); - Integer sh=1; - for(SlKc slKc: list){ + Integer sh = 1; + for (SlKc slKc : list) { slKc.setXh(sh); sh++; slKc.setZYLX(zylxMap.get(slKc.getZYLX())); @@ -264,23 +235,23 @@ public class PgdSljhController { } int ceil = (int) (Math.ceil((double) list.size() / 18)); - List slKcList= new ArrayList<>(); - if(ceil>1){ - for(int i=0;i slKcList = new ArrayList<>(); + if (ceil > 1) { + for (int i = 0; i < ceil; i++) { + SlKc slKc = new SlKc(); slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); slKc.setSllsh(id); - if (ceil - i == 1){ - slKc.setList(list.subList(i*18,list.size())); - }else{ - int num =i*18+18; + if (ceil - i == 1) { + slKc.setList(list.subList(i * 18, list.size())); + } else { + int num = i * 18 + 18; - slKc.setList(list.subList(i*18,num)); + slKc.setList(list.subList(i * 18, num)); } slKcList.add(slKc); } - }else{ - SlKc slKc =new SlKc(); + } else { + SlKc slKc = new SlKc(); slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); slKc.setSllsh(id); slKc.setList(list); @@ -288,14 +259,12 @@ public class PgdSljhController { } - - return new ResultBean(slKcList); + return new ResultBean(slKcList); } - @PostMapping("/slPrintD") @ResponseBody public ResultBean slPrintD(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { @@ -304,16 +273,16 @@ public class PgdSljhController { //dw_1.object.sllsh[ll_ii] = ls_lsh //dw_1.object.dyry[ll_ii] = gs_user //dw_1.object.dyrq[ll_ii] = ls_datetime - ListydupList=new ArrayList<>(); - ListckupList=new ArrayList<>(); - for(SlKc slKc: list){ - if(StringUtils.isBlank(slKc.getSllsh())){ + List ydupList = new ArrayList<>(); + List ckupList = new ArrayList<>(); + for (SlKc slKc : list) { + if (StringUtils.isBlank(slKc.getSllsh())) { ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); imCkwpkwp.setCkh(slKc.getCKH()); imCkwpkwp.setWph(slKc.getWPH()); imCkwpkwp.setKwh(slKc.getKWH()); imCkwpkwp.setNbsbm(slKc.getNBSBM()); - // imCkwpkwp.setSllsh(id); + // imCkwpkwp.setSllsh(id); imCkwpkwp.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm")); imCkwpkwp.setDyry((String) req.getAttribute("yhms")); ckupList.add(imCkwpkwp); @@ -337,8 +306,8 @@ public class PgdSljhController { Map pwwzMap = pwwzs.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); Map wpztMap = wpzts.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); - Integer sh=1; - for(SlKc slKc: list){ + Integer sh = 1; + for (SlKc slKc : list) { slKc.setXh(sh); sh++; slKc.setZYLX(zylxMap.get(slKc.getZYLX())); @@ -346,25 +315,25 @@ public class PgdSljhController { slKc.setWPZT(wpztMap.get(slKc.getWPZT())); } - String sllsh= list.get(0).getSllsh(); + String sllsh = list.get(0).getSllsh(); int ceil = (int) (Math.ceil((double) list.size() / 18)); - List slKcList= new ArrayList<>(); - if(ceil>1){ - for(int i=0;i slKcList = new ArrayList<>(); + if (ceil > 1) { + for (int i = 0; i < ceil; i++) { + SlKc slKc = new SlKc(); slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); slKc.setSllsh(sllsh); - if (ceil - i == 1){ - slKc.setList(list.subList(i*18,list.size())); - }else{ - int num =i*18+18; + if (ceil - i == 1) { + slKc.setList(list.subList(i * 18, list.size())); + } else { + int num = i * 18 + 18; - slKc.setList(list.subList(i*18,num)); + slKc.setList(list.subList(i * 18, num)); } slKcList.add(slKc); } - }else{ - SlKc slKc =new SlKc(); + } else { + SlKc slKc = new SlKc(); slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); slKc.setSllsh(sllsh); slKc.setList(list); @@ -372,26 +341,24 @@ public class PgdSljhController { } - - return new ResultBean(slKcList); + return new ResultBean(slKcList); } - @PostMapping("/slPrintqx") @ResponseBody public ResultBean slPrintqx(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { //ls_lsh = F_GETPJH("MM",'00',"MSMS") - // String id = syService.f_getpjh("MM", "00", "MSMS"); + // String id = syService.f_getpjh("MM", "00", "MSMS"); //dw_1.object.sllsh[ll_ii] = ls_lsh //dw_1.object.dyry[ll_ii] = gs_user //dw_1.object.dyrq[ll_ii] = ls_datetime - ListydupList=new ArrayList<>(); - ListckupList=new ArrayList<>(); - for(SlKc slKc: list){ - if(StringUtils.isNotBlank(slKc.getSllsh())){ + List ydupList = new ArrayList<>(); + List ckupList = new ArrayList<>(); + for (SlKc slKc : list) { + if (StringUtils.isNotBlank(slKc.getSllsh())) { ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); imCkwpkwp.setCkh(slKc.getCKH()); imCkwpkwp.setWph(slKc.getWPH()); @@ -409,8 +376,8 @@ public class PgdSljhController { // slKc.setDyrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd")); } - if(StringUtils.isNotBlank(slKc.getYdid())){ - DmYdjh ydjh =new DmYdjh(); + if (StringUtils.isNotBlank(slKc.getYdid())) { + DmYdjh ydjh = new DmYdjh(); // 库存主键 没存 ydjh.setId(slKc.getYdid()); ydjh.setZt("2"); @@ -423,8 +390,7 @@ public class PgdSljhController { imCkwpkwpService.updateBatchByMultiId(ckupList); - - return new ResultBean(); + return new ResultBean(); } @@ -437,30 +403,28 @@ public class PgdSljhController { // 查询库存 List slkcs = imCkwpkwpMapper.slxxKcList(map); - QueryWrapper 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")); + QueryWrapper 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")); // 库存标识 不等于 01 没有匹配上 - - if(map.get("rqopt").equals("01")){ - qw.ne("isnull(ZT,'')","11"); - }else if(map.get("rqopt").equals("02")) { - qw.eq("isnull(ZT,'')","11"); - } - qw.orderBy(true,true,"czbh","pl","fd"); - // List ydjhs = dmYdjhService.list(qw); + if (map.get("rqopt").equals("01")) { + qw.ne("isnull(ZT,'')", "11"); + } else if (map.get("rqopt").equals("02")) { + qw.eq("isnull(ZT,'')", "11"); + } + qw.orderBy(true, true, "czbh", "pl", "fd"); + // List ydjhs = dmYdjhService.list(qw); // 查询上料计划 - Map retrunMap =new HashMap(); - retrunMap.put("slkcs",slkcs); - retrunMap.put("ydjhs",null); + Map retrunMap = new HashMap(); + retrunMap.put("slkcs", slkcs); + retrunMap.put("ydjhs", null); return new ResultBean(retrunMap); } - @PostMapping("/getKcAndSljh1") @ResponseBody public ResultBean getKcAndSljh1(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { @@ -469,31 +433,30 @@ public class PgdSljhController { // 查询库存 //List slkcs = imCkwpkwpMapper.slxxKcList(map); - QueryWrapper qw =new QueryWrapper<>(); - qw.eq(StrUtil.isNotEmpty((String)map.get("xqdcch")),"dc_ch",(String)map.get("xqdcch")); - qw.eq(StrUtil.isNotEmpty((String)map.get("xqpl")),"dc_pl",(String)map.get("xqpl")); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq(StrUtil.isNotEmpty((String) map.get("xqdcch")), "dc_ch", (String) map.get("xqdcch")); + qw.eq(StrUtil.isNotEmpty((String) map.get("xqpl")), "dc_pl", (String) map.get("xqpl")); // 库存标识 不等于 01 没有匹配上 - - if(map.get("rqopt").equals("01")){ - qw.eq("isnull(ZT,'')","2").eq("isnull(slkcdw,'')",""); - }else if(map.get("rqopt").equals("02")) { - qw.eq("isnull(ZT,'')","2").ne("isnull(slkcdw,'')",""); - }else if(map.get("rqopt").equals("03")) { - qw.eq("isnull(ZT,'')","11"); + if (map.get("rqopt").equals("01")) { + qw.eq("isnull(ZT,'')", "2").eq("isnull(slkcdw,'')", ""); + } else if (map.get("rqopt").equals("02")) { + qw.eq("isnull(ZT,'')", "2").ne("isnull(slkcdw,'')", ""); + } else if (map.get("rqopt").equals("03")) { + qw.eq("isnull(ZT,'')", "11"); } - List ydjhs = dmYdjhService.list(qw); + List ydjhs = dmYdjhService.list(qw); // 查询上料计划 List czList = dmCbxxpService.list(); - for(DmYdjh dmYdjh :ydjhs){ - String cjs=""; + for (DmYdjh dmYdjh : ydjhs) { + String cjs = ""; DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(dmYdjh.getDcCh())).findFirst().orElse(null); - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); - dmYdjh.setWpxh1(cjs+dmYdjh.getWpxh()); + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); + dmYdjh.setWpxh1(cjs + dmYdjh.getWpxh()); } } return new ResultBean(ydjhs); @@ -518,39 +481,39 @@ public class PgdSljhController { @ResponseBody public ResultBean kcAdnSlBd(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { - String str= JSON.toJSONString(map.get("data1")); - List slKcs= JSONObject.parseArray(str, SlKc.class); - String str1= JSON.toJSONString(map.get("data2")); - Listydjhs= JSONObject.parseArray(str1, DmYdjh.class); + String str = JSON.toJSONString(map.get("data1")); + List slKcs = JSONObject.parseArray(str, SlKc.class); + String str1 = JSON.toJSONString(map.get("data2")); + List ydjhs = JSONObject.parseArray(str1, DmYdjh.class); List czList = dmCbxxpService.list(); - ListydupList=new ArrayList<>(); - ListckupList=new ArrayList<>(); + List ydupList = new ArrayList<>(); + List ckupList = new ArrayList<>(); // 进行比对 - for(SlKc slKc :slKcs){ + for (SlKc slKc : slKcs) { // 获取船级社 - String cjs=""; + String cjs = ""; DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null); - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); } - String cjs1=cjs; + String cjs1 = cjs; DmYdjh dmYdjh = ydjhs.stream() - .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())) + .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())) ) - .findFirst() - .orElse(null); + .findFirst() + .orElse(null); - if(null!=dmYdjh){ + if (null != dmYdjh) { System.out.println("slKc = " + slKc); dmYdjh.setSlkcdw(slKc.getKWH()); - System.out.println(slKc.getCFCS1()+dmYdjh.getId()); + System.out.println(slKc.getCFCS1() + dmYdjh.getId()); dmYdjh.setSlcs(slKc.getCFCS1()); dmYdjh.setSlxhth(slKc.getGCDDH()); dmYdjh.setSlhth(slKc.getDcFd()); @@ -571,12 +534,12 @@ public class PgdSljhController { // imCkwpkwp.setZylx(dmYdjh.getZl()); // imCkwpkwp.setSldw(dmYdjh.getKw()); ydupList.add(dmYdjh); - // ckupList.add(imCkwpkwp); + // ckupList.add(imCkwpkwp); - slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh())); + slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(), dmYdjh.getTzbh())); slKc.setZYCH(dmYdjh.getDcCh()); slKc.setZYPL(dmYdjh.getDcPl()); - // slKc.setZYLX(dmYdjh.getZl()); + // slKc.setZYLX(dmYdjh.getZl()); slKc.setSLDW(dmYdjh.getKw()); slKc.setDHH(dmYdjh.getSljhrq()); //slKc.setPwwz(dmYdjh.getKw()); @@ -587,18 +550,16 @@ public class PgdSljhController { // 填写 库存垛位 kwh 层数 cfcs1 小合同号 gcddh 合同工 dc_fd 物料号 wph 炉批号 lph } - Map retrunMap =new HashMap(); - retrunMap.put("slkcs",ckupList); - retrunMap.put("ydjhs",ydupList); + Map retrunMap = new HashMap(); + retrunMap.put("slkcs", ckupList); + retrunMap.put("ydjhs", ydupList); return new ResultBean(retrunMap); } /** - * - * @param req - * 需求船号 需求批量 流向 抛丸位置 切割跨位（根据 合同号生成） 备注 - * 根据 需求船号 需求批量 去 dm_ydjh 表中 查询 反写 库存垛位 上料层数，小合同号，合同号，物料号 - * 库存表 增加 dm_ydjh 表 id （dm_ydjh 中 有数据 ） + * @param req 需求船号 需求批量 流向 抛丸位置 切割跨位（根据 合同号生成） 备注 + * 根据 需求船号 需求批量 去 dm_ydjh 表中 查询 反写 库存垛位 上料层数，小合同号，合同号，物料号 + * 库存表 增加 dm_ydjh 表 id （dm_ydjh 中 有数据 ） * @return * @throws Exception * @throws CustomException @@ -606,14 +567,14 @@ public class PgdSljhController { @PostMapping("kcAdnSlBd1") @ResponseBody public ResultBean kcAdnSlBd1(HttpServletRequest req, @RequestBody List slKcs) throws Exception, CustomException { - // 核对 没问题 有 yd id 说明核对 成功进行反写 + // 核对 没问题 有 yd id 说明核对 成功进行反写 List ups = new ArrayList<>(); List ups1 = new ArrayList<>(); List czList = dmCbxxpService.list(); - for(SlKc slKc :slKcs){ - ImCkwpkwp imCkwpkwp =new ImCkwpkwp(); + for (SlKc slKc : slKcs) { + ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); imCkwpkwp.setCkh(slKc.getCKH()); imCkwpkwp.setWph(slKc.getWPH()); imCkwpkwp.setKwh(slKc.getKWH()); @@ -630,32 +591,31 @@ public class PgdSljhController { imCkwpkwp.setYdid(slKc.getYdid()); - - if(StringUtils.isBlank(slKc.getYdid())){ + if (StringUtils.isBlank(slKc.getYdid())) { // 手工进行 批量了 - String cjs=""; - DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null); + String cjs = ""; + DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null); - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); - } - String cjs1=cjs; - // 根据需求批量 船号 去 查询 - List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", slKc.getZYCH() ).eq("isnull(ZT,'')","2") - .eq("dc_pl",slKc.getZYPL()).eq("ifnull(slkcdw,'')","") - ); - DmYdjh dmYdjh = ydjhs.stream() - .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getZYCH()) - &&StringUtils.isNotBlank(fst.getWpgg()) - && StringUtils.isNotBlank(fst.getWpxh()) - && fst.getWpgg().equalsIgnoreCase(slKc.getWPGG()) - && (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH())) - && fst.getDcPl().equalsIgnoreCase(slKc.getZYPL()) - ) - .findFirst() - .orElse(null); - if(null!=dmYdjh){ + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); + } + String cjs1 = cjs; + // 根据需求批量 船号 去 查询 + List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", slKc.getZYCH()).eq("isnull(ZT,'')", "2") + .eq("dc_pl", slKc.getZYPL()).eq("ifnull(slkcdw,'')", "") + ); + DmYdjh dmYdjh = ydjhs.stream() + .filter(fst -> fst.getDcCh().equalsIgnoreCase(slKc.getZYCH()) + && StringUtils.isNotBlank(fst.getWpgg()) + && StringUtils.isNotBlank(fst.getWpxh()) + && fst.getWpgg().equalsIgnoreCase(slKc.getWPGG()) + && (fst.getWpxh().equalsIgnoreCase(slKc.getWPXH()) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(slKc.getWPXH())) + && fst.getDcPl().equalsIgnoreCase(slKc.getZYPL()) + ) + .findFirst() + .orElse(null); + if (null != dmYdjh) { dmYdjh.setSlkcdw(slKc.getKWH()); dmYdjh.setSlcs(slKc.getCFCS1()); dmYdjh.setSlxhth(slKc.getGCDDH()); @@ -664,7 +624,7 @@ public class PgdSljhController { dmYdjh.setSllph(slKc.getLPH()); dmYdjh.setSlwlh(slKc.getWPH()); dmYdjh.setKcch(slKc.getDCCH()); - imCkwpkwp.setZylx(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh())); + imCkwpkwp.setZylx(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(), dmYdjh.getTzbh())); imCkwpkwp.setSldw(dmYdjh.getKw()); imCkwpkwp.setDhh(dmYdjh.getSljhrq()); //slKc.setPwwz(dmYdjh.getKw()); @@ -681,8 +641,8 @@ public class PgdSljhController { ups.add(dmYdjh); } - }else{ - DmYdjh dmYdjh =new DmYdjh(); + } else { + DmYdjh dmYdjh = new DmYdjh(); dmYdjh.setSlkcdw(slKc.getKWH()); dmYdjh.setSlcs(slKc.getCFCS1()); dmYdjh.setSlxhth(slKc.getGCDDH()); @@ -865,71 +825,72 @@ public class PgdSljhController { } - public String extractNumber(String str) { + public String extractNumber(String str) { int hyphenIndex = str.indexOf('-'); if (hyphenIndex != -1) { String substring = str.substring(hyphenIndex + 1); - if(substring.equals("2N")){ + if (substring.equals("2N")) { return "11"; } - if(substring.equals("2S")){ + if (substring.equals("2S")) { return "5"; } - if(substring.equals("2")){ + if (substring.equals("2")) { return "9"; } - if(substring.equals("3S")){ + if (substring.equals("3S")) { return "6"; } - if(substring.equals("3Q")){ + if (substring.equals("3Q")) { return "13"; } - if(substring.equals("4")){ + if (substring.equals("4")) { return "15"; } - if(substring.equals("7")){ + if (substring.equals("7")) { return "7-8"; } } return ""; // Return empty string if hyphen is not found } + @PostMapping("kcAdnSlZx") @ResponseBody public ResultBean kcAdnSlZx(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { - String str= JSON.toJSONString(map.get("data1")); - List slKcs= JSONObject.parseArray(str, SlKc.class); - String str1= JSON.toJSONString(map.get("data2")); - Listydjhs= JSONObject.parseArray(str1, DmYdjh.class); + String str = JSON.toJSONString(map.get("data1")); + List slKcs = JSONObject.parseArray(str, SlKc.class); + String str1 = JSON.toJSONString(map.get("data2")); + List ydjhs = JSONObject.parseArray(str1, DmYdjh.class); - ListydupList=new ArrayList<>(); + List ydupList = new ArrayList<>(); - ListckupList=new ArrayList<>(); + List ckupList = new ArrayList<>(); //String id = syService.f_getpjh("DM", "SYSTEM", "YLBH"); - for(SlKc slKc :slKcs){ - ImCkwpkwp imCkwpkwp =new ImCkwpkwp(); - imCkwpkwp.setCkh(slKc.getCKH()); - imCkwpkwp.setWph(slKc.getWPH()); - imCkwpkwp.setKwh(slKc.getKWH()); - imCkwpkwp.setNbsbm(slKc.getNBSBM()); - imCkwpkwp.setYdid(slKc.getYdid()); - imCkwpkwp.setZych(slKc.getZYCH()); - imCkwpkwp.setZypl(slKc.getZYPL()); - imCkwpkwp.setZylx(slKc.getZYLX()); - imCkwpkwp.setSldw(slKc.getSLDW()); - imCkwpkwp.setPwwz(slKc.getPwwz()); - imCkwpkwp.setBz(slKc.getBZ()); - imCkwpkwp.setDhh(slKc.getDHH()); + for (SlKc slKc : slKcs) { + ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); + imCkwpkwp.setCkh(slKc.getCKH()); + imCkwpkwp.setWph(slKc.getWPH()); + imCkwpkwp.setKwh(slKc.getKWH()); + imCkwpkwp.setNbsbm(slKc.getNBSBM()); + imCkwpkwp.setYdid(slKc.getYdid()); + imCkwpkwp.setZych(slKc.getZYCH()); + imCkwpkwp.setZypl(slKc.getZYPL()); + imCkwpkwp.setZylx(slKc.getZYLX()); + imCkwpkwp.setSldw(slKc.getSLDW()); + imCkwpkwp.setPwwz(slKc.getPwwz()); + imCkwpkwp.setBz(slKc.getBZ()); + imCkwpkwp.setDhh(slKc.getDHH()); ckupList.add(imCkwpkwp); } imCkwpkwpService.updateBatchByMultiId(ckupList); dmYdjhService.updateBatchById(ydjhs); - return new ResultBean(); + return new ResultBean(); // } @@ -939,7 +900,7 @@ public class PgdSljhController { @ResponseBody @AuthFunction public ResultBean saveSljhPg(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { - pgdSljhService.saveSljhPg(list,req); + pgdSljhService.saveSljhPg(list, req); return new ResultBean(); } @@ -947,7 +908,7 @@ public class PgdSljhController { @ResponseBody @AuthFunction public ResultBean saveSljhPgBack(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { - pgdSljhService.saveSljhPgBack(list,req); + pgdSljhService.saveSljhPgBack(list, req); return new ResultBean(); } @@ -955,38 +916,36 @@ public class PgdSljhController { @ResponseBody @AuthFunction public ResultBean saveSljhPgdXd(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { - pgdSljhService.saveSljhPgdXd(list,req); + pgdSljhService.saveSljhPgdXd(list, req); return new ResultBean(); } @PostMapping("/saveSljhPgdXdBack") @ResponseBody @AuthFunction - public ResultBean saveSljhPgdXdBack(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { - pgdSljhService.saveSljhPgdXdBack(list,req); + public ResultBean saveSljhPgdXdBack(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdSljhService.saveSljhPgdXdBack(list, req); return new ResultBean(); } - @PostMapping("/saveSljhPgdFk") @ResponseBody @AuthFunction - public ResultBean saveSljhPgdFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { - pgdSljhService.saveSljhPgdFk(list,req); + public ResultBean saveSljhPgdFk(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdSljhService.saveSljhPgdFk(list, req); return new ResultBean(); } @PostMapping("/saveSljhFk") @ResponseBody @AuthFunction - public ResultBean saveSljhFk(HttpServletRequest req, @RequestBody Listlist) throws Exception, CustomException { - pgdSljhService.saveSljhFk(list,req); + public ResultBean saveSljhFk(HttpServletRequest req, @RequestBody List list) throws Exception, CustomException { + pgdSljhService.saveSljhFk(list, req); return new ResultBean(); } - // @PostMapping("/getKcAndSljh") // @ResponseBody // @AuthFunction @@ -996,7 +955,7 @@ public class PgdSljhController { // } - public String getLx(String lqlb ,String zl,String tzbh){ + public String getLx(String lqlb, String zl, String tzbh) { // 1000 数中大 // 1001 数小 // 1002 数中 @@ -1008,71 +967,71 @@ public class PgdSljhController { // 1007 手大 // 1008 手中大 // 1009 焊接机器人肘板 -- - String mm=""; - if(tzbh.substring(4, 5).equals("S")){ - mm="手"; - }else if(tzbh.substring(4, 5).equals("N")){ - mm="数"; + String mm = ""; + if (tzbh.substring(4, 5).equals("S")) { + mm = "手"; + } else if (tzbh.substring(4, 5).equals("N")) { + mm = "数"; } // - String bh = tzbh.substring(6, 8); // 72 - if (tzbh.substring(4, 5).equals("X")) { // 51 + String bh = tzbh.substring(6, 8); // 72 + if (tzbh.substring(4, 5).equals("X")) { // 51 // if ("XX".equalsIgnoreCase(bh)) { // return "小组立"; // } else if ("XD".equalsIgnoreCase(bh)) { // return "中大组立"; // } - return ""; - } else { - if ("XX".equalsIgnoreCase(bh)) { - return "1009"; // todo 小组 - } + return ""; + } else { + if ("XX".equalsIgnoreCase(bh)) { + return "1009"; // todo 小组 } - String bh1 = tzbh.substring(7, 8); // 81 - if ("X".equalsIgnoreCase(bh1)) { + } + String bh1 = tzbh.substring(7, 8); // 81 + if ("X".equalsIgnoreCase(bh1)) { - if(mm.equals("手")){ - return "1005"; - }else if (mm.equals("数")){ - return "1001"; - } + if (mm.equals("手")) { + return "1005"; + } else if (mm.equals("数")) { + return "1001"; } - if ("D".equalsIgnoreCase(bh1)) { - // return "中大组立"; + } + if ("D".equalsIgnoreCase(bh1)) { + // return "中大组立"; - if(mm.equals("手")){ - return "1008"; - }else if (mm.equals("数")){ - return "1000"; - } + if (mm.equals("手")) { + return "1008"; + } else if (mm.equals("数")) { + return "1000"; } - return ""; + } + return ""; } - public String getwpcz(String wpcz){ - if(wpcz.contains("ABS/CCS")){ - return wpcz.replace("ABS/CCS",""); - }else if (wpcz.contains("ABS")){ - return wpcz.replace("ABS",""); - }else if (wpcz.contains("BV/CCS")){ - return wpcz.replace("BV/CCS",""); - }else if (wpcz.contains("DNV/CCS")){ - return wpcz.replace("DNV/CCS",""); - }else if (wpcz.contains("DNV/GL")){ - return wpcz.replace("DNV/GL",""); - }else if (wpcz.contains("LR/CCS")){ - return wpcz.replace("LR/CCS",""); - }else if (wpcz.contains("LR")) { + public String getwpcz(String wpcz) { + if (wpcz.contains("ABS/CCS")) { + return wpcz.replace("ABS/CCS", ""); + } else if (wpcz.contains("ABS")) { + return wpcz.replace("ABS", ""); + } else if (wpcz.contains("BV/CCS")) { + return wpcz.replace("BV/CCS", ""); + } else if (wpcz.contains("DNV/CCS")) { + return wpcz.replace("DNV/CCS", ""); + } else if (wpcz.contains("DNV/GL")) { + return wpcz.replace("DNV/GL", ""); + } else if (wpcz.contains("LR/CCS")) { + return wpcz.replace("LR/CCS", ""); + } else if (wpcz.contains("LR")) { return wpcz.replace("LR", ""); - }else if (wpcz.contains("CCS")){ - return wpcz.replace("CCS",""); - } else if (wpcz.contains("DNV")){ - return wpcz.replace("DNV",""); - }else { + } else if (wpcz.contains("CCS")) { + return wpcz.replace("CCS", ""); + } else if (wpcz.contains("DNV")) { + return wpcz.replace("DNV", ""); + } else { return wpcz; } @@ -1083,17 +1042,17 @@ public class PgdSljhController { @ResponseBody public ResultBean kcAdnSlBd2(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { - String str= JSON.toJSONString(map.get("data1")); - List slKcs= JSONObject.parseArray(str, SlKc.class); - - boolean kwb= (boolean) map.get("flag"); - QueryWrapper qw =new QueryWrapper<>(); - qw.eq(StrUtil.isNotEmpty((String)map.get("dcch")),"dc_ch",(String)map.get("dcch")); - qw.eq(StrUtil.isNotEmpty((String)map.get("dcpl")),"dc_pl",(String)map.get("dcpl")); - qw.eq("isnull(ZT,'')","2").eq("isnull(slkcdw,'')",""); - qw.orderBy(true,true,"sljhrq"); + String str = JSON.toJSONString(map.get("data1")); + List slKcs = JSONObject.parseArray(str, SlKc.class); + + boolean kwb = (boolean) map.get("flag"); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq(StrUtil.isNotEmpty((String) map.get("dcch")), "dc_ch", (String) map.get("dcch")); + qw.eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "dc_pl", (String) map.get("dcpl")); + qw.eq("isnull(ZT,'')", "2").eq("isnull(slkcdw,'')", ""); + qw.orderBy(true, true, "sljhrq"); List ydjhs = dmYdjhService.list(qw); - //库存标识 不等于 01 没有匹配上 + //库存标识 不等于 01 没有匹配上 /*** * ABS * ABS/CCS @@ -1107,43 +1066,41 @@ public class PgdSljhController { */ - - List czList = dmCbxxpService.list(); - ListydupList=new ArrayList<>(); - ListckupList=new ArrayList<>(); + List ydupList = new ArrayList<>(); + List ckupList = new ArrayList<>(); // 进行比对 - for(SlKc slKc :slKcs){ + for (SlKc slKc : slKcs) { // 获取船级社 - String cjs=""; + String cjs = ""; DmCbxxp dmCzjbb = czList.stream().filter(fst -> fst.getCbbm().equalsIgnoreCase(slKc.getDCCH())).findFirst().orElse(null); - if(null!=dmCzjbb){ - cjs=dmCzjbb.getCjs(); + if (null != dmCzjbb) { + cjs = dmCzjbb.getCjs(); } - if(StringUtils.isNotBlank(slKc.getZYCH())||StringUtils.isNotBlank(slKc.getZYPL()) ){ + if (StringUtils.isNotBlank(slKc.getZYCH()) || StringUtils.isNotBlank(slKc.getZYPL())) { continue; } - String cjs1=cjs; - String aaa= getwpcz(slKc.getWPXH()); + String cjs1 = cjs; + String aaa = getwpcz(slKc.getWPXH()); DmYdjh dmYdjh = ydjhs.stream() - .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()) - || ("DY".equalsIgnoreCase(slKc.getWPZT()) && getwpcz(slKc.getWPXH()).equalsIgnoreCase(fst.getWpxh()))) - ) - .findFirst() - .orElse(null); - - if(null!=dmYdjh){ + .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()) + || ("DY".equalsIgnoreCase(slKc.getWPZT()) && getwpcz(slKc.getWPXH()).equalsIgnoreCase(fst.getWpxh()))) + ) + .findFirst() + .orElse(null); + + if (null != dmYdjh) { System.out.println("slKc = " + slKc); dmYdjh.setSlkcdw(slKc.getKWH()); - System.out.println(slKc.getCFCS1()+dmYdjh.getId()); + System.out.println(slKc.getCFCS1() + dmYdjh.getId()); dmYdjh.setSlcs(slKc.getCFCS1()); dmYdjh.setSlxhth(slKc.getGCDDH()); dmYdjh.setSlhth(slKc.getDcFd()); @@ -1157,30 +1114,28 @@ public class PgdSljhController { // ckupList.add(imCkwpkwp); - - slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(),dmYdjh.getTzbh())); + slKc.setZYLX(getLx(dmYdjh.getLqlb(), dmYdjh.getZl(), dmYdjh.getTzbh())); slKc.setZYCH(dmYdjh.getDcCh()); slKc.setZYPL(dmYdjh.getDcPl()); slKc.setDCTH(dmYdjh.getTzbh()); // slKc.setZYLX(dmYdjh.getZl()); - if(kwb){ + if (kwb) { - if(extractNumber(slKc.getDcFd()).equals("7-8")){ - if((extractNumber(slKc.getDcFd()).contains(dmYdjh.getKw()))){ + if (extractNumber(slKc.getDcFd()).equals("7-8")) { + if ((extractNumber(slKc.getDcFd()).contains(dmYdjh.getKw()))) { slKc.setSLDW(dmYdjh.getKw()); } - }else { - if(dmYdjh.getKw().equals(extractNumber(slKc.getDcFd()))){ + } else { + if (dmYdjh.getKw().equals(extractNumber(slKc.getDcFd()))) { slKc.setSLDW(dmYdjh.getKw()); } } - }else{ + } else { slKc.setSLDW(dmYdjh.getKw()); } - slKc.setDHH(dmYdjh.getSljhrq()); //slKc.setPwwz(dmYdjh.getKw()); slKc.setYdid(dmYdjh.getId()); @@ -1190,26 +1145,25 @@ public class PgdSljhController { // 填写 库存垛位 kwh 层数 cfcs1 小合同号 gcddh 合同工 dc_fd 物料号 wph 炉批号 lph } - Map retrunMap =new HashMap(); - retrunMap.put("slkcs",ckupList); - // retrunMap.put("ydjhs",ydupList); + Map retrunMap = new HashMap(); + retrunMap.put("slkcs", ckupList); + // retrunMap.put("ydjhs",ydupList); return new ResultBean(retrunMap); } - @PostMapping("kcAdnSlBdQX") @ResponseBody @Transactional(rollbackFor = Exception.class) public ResultBean kcAdnSlBdQX(HttpServletRequest req, @RequestBody Map map) throws Exception, CustomException { - String str= JSON.toJSONString(map.get("data1")); - List slKcs= JSONObject.parseArray(str, SlKc.class); + String str = JSON.toJSONString(map.get("data1")); + List slKcs = JSONObject.parseArray(str, SlKc.class); // - for(SlKc kc :slKcs){ - DmYdjh ydjh =new DmYdjh(); + for (SlKc kc : slKcs) { + DmYdjh ydjh = new DmYdjh(); // 库存主键 没存 ydjh.setId(kc.getYdid()); ydjh.setZt("2"); @@ -1224,7 +1178,7 @@ public class PgdSljhController { dmYdjhService.updateById(ydjh); - ImCkwpkwp imCkwpkwp =new ImCkwpkwp(); + ImCkwpkwp imCkwpkwp = new ImCkwpkwp(); imCkwpkwp.setCkh(kc.getCKH()); imCkwpkwp.setWph(kc.getWPH()); @@ -1248,7 +1202,7 @@ public class PgdSljhController { @PostMapping("/exportPW") - public void exportZztjs(HttpServletResponse response , @RequestBody PwpgDto dto) throws IOException { + public void exportZztjs(HttpServletResponse response, @RequestBody PwpgDto dto) throws IOException { List qgkws = dm_zhbmpRepository.findByBMLB("QGKW"); List zylxs = dm_zhbmpRepository.findByBMLB("zylx"); @@ -1262,43 +1216,41 @@ public class PgdSljhController { Map dhqlMap = dhql.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); Map wpztMap = wpzts.stream().collect(Collectors.toMap(Dm_zhbmp::getBM, Dm_zhbmp::getBmsm)); // - ListslKcs1 = new ArrayList<>(); - Listexcels = new ArrayList<>(); + List slKcs1 = new ArrayList<>(); + List excels = new ArrayList<>(); List list = dto.getList(); for (YcldwInfo vo : list) { - Map map =new HashMap<>(); - if(StringUtils.isNotBlank(vo.getNbsbm())){ - map.put("nbsbm",vo.getNbsbm()); + Map map = new HashMap<>(); + if (StringUtils.isNotBlank(vo.getNbsbm())) { + map.put("nbsbm", vo.getNbsbm()); List slKcs = imCkwpkwpMapper.slxxKcList(map); - if(slKcs.size()>0){ + if (slKcs.size() > 0) { slKcs1.add(slKcs.get(0)); } } - } - int num=1; - for(SlKc slKc:slKcs1){ - PwExportExcel pwExportExcel= new PwExportExcel(); + int num = 1; + for (SlKc slKc : slKcs1) { + PwExportExcel pwExportExcel = new PwExportExcel(); pwExportExcel.setLph(slKc.getLPH()); pwExportExcel.setWpxh(slKc.getWPXH()); pwExportExcel.setWpgg(slKc.getWPGG()); pwExportExcel.setWpzt(wpztMap.get(slKc.getWPZT())); - pwExportExcel.setZych(slKc.getZYCH()+" " +slKc.getZYPL()); + pwExportExcel.setZych(slKc.getZYCH() + " " + slKc.getZYPL()); pwExportExcel.setBz(slKc.getBZ()); // pwExportExcel.setZypl(slKc.getZYPL()); pwExportExcel.setZylx(zylxMap.get(slKc.getZYLX())); pwExportExcel.setSldw(qgKwMap.get(slKc.getSLDW())); - pwExportExcel.setText1(slKc.getLPH()+" "+slKc.getWPXH()+" "+slKc.getWPGG()+" "+wpztMap.get(slKc.getWPZT())+" "+slKc.getBZ()); - pwExportExcel.setText2(slKc.getZYCH()+" " +slKc.getZYPL()+" "+zylxMap.get(slKc.getZYLX())+" "+qgKwMap.get(slKc.getSLDW())+" "+slKc.getDCTH()); + pwExportExcel.setText1(slKc.getLPH() + " " + slKc.getWPXH() + " " + slKc.getWPGG() + " " + wpztMap.get(slKc.getWPZT()) + " " + slKc.getBZ()); + pwExportExcel.setText2(slKc.getZYCH() + " " + slKc.getZYPL() + " " + zylxMap.get(slKc.getZYLX()) + " " + qgKwMap.get(slKc.getSLDW()) + " " + slKc.getDCTH()); num++; excels.add(pwExportExcel); } - response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); String fileName = "example.xlsx"; @@ -1310,12 +1262,12 @@ public class PgdSljhController { // 订单跨道 - public Map ddkd (String cgkw){ - Map map= new HashMap(); - if(StringUtils.isBlank(cgkw)){ + public Map ddkd(String cgkw) { + Map map = new HashMap(); + if (StringUtils.isBlank(cgkw)) { return null; } - // if(cgkw.contains()) + // if(cgkw.contains()) return map; } diff --git a/src/main/java/com/dsic/gj_erp/jiuzhou/SlPlanEvent.java b/src/main/java/com/dsic/gj_erp/jiuzhou/SlPlanEvent.java new file mode 100644 index 0000000..260dea6 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/jiuzhou/SlPlanEvent.java @@ -0,0 +1,18 @@ +package com.dsic.gj_erp.jiuzhou; + +import com.dsic.gj_erp.bean.kc.SlKc; +import lombok.Getter; +import org.springframework.context.ApplicationEvent; + +import java.util.List; + +@Getter +public class SlPlanEvent extends ApplicationEvent { + + private final List slKcList; + + public SlPlanEvent(Object source,List slKcList) { + super(source); + this.slKcList=slKcList; + } +} diff --git a/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java b/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java index e8bdd51..e349ecb 100644 --- a/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java +++ b/src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java @@ -1,30 +1,54 @@ package com.dsic.gj_erp.service.jiuzhou; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.jiuzhou.Sljh; +import com.dsic.gj_erp.jiuzhou.SlPlanEvent; import com.dsic.gj_erp.jiuzhoumapper.SljhMapper; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.event.EventListener; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; import java.util.List; +import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; @Slf4j -//@Service +@Service +@RequiredArgsConstructor public class SljhService extends ServiceImpl { + @Value("${api-central.jiuzhou.sl-plan}") + String slPlanUrl; + + private final RestTemplate restTemplate; + @Async @EventListener - public void save(List slYdjh){ - log.info("开始执行九州接口推送:{}",slYdjh); - List collect = slYdjh.stream().map(Sljh::ofWithYdjh).collect(Collectors.toList()); - log.info("生成九州数据完成:{}",collect); + public void save(SlPlanEvent slYdjh){ + log.info("开始执行九州接口推送"); + List collect = slYdjh.getSlKcList().stream().map(Sljh::new).collect(Collectors.toList()); + log.info("生成九州数据完成:{},开始推送",collect); try { - this.saveBatch(collect); + HttpHeaders headers = new HttpHeaders(); + headers.set("Content-Type", "application/json"); + headers.set("Accept-Language", "zh-CHS"); + headers.set("X-ECC-Current-Tenant", "10000"); + headers.set("Authorization", "Bearer 10473672-12a5-2432-c1f1-1c865a814ece"); + HttpEntity> entity = new HttpEntity<>(collect,headers); + restTemplate.exchange(slPlanUrl, HttpMethod.POST, entity, JSONObject.class); }catch (Exception e){ - e.printStackTrace(); + log.error("推送失败",e); + return; } log.info("推送完成"); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 21e29c1..14b0915 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -51,5 +51,5 @@ spring.resources.static-locations=file:./static,file:D:/??????/static/upload/TWD pdfUri=D:/javaweb/static/upload - +api-central.jiuzhou.sl-plan=http://127.0.0.1:8182/jiuZhou/slPlan diff --git a/src/main/resources/mappers/kc/ImCkwpkwp.xml b/src/main/resources/mappers/kc/ImCkwpkwp.xml index c07255e..b8c290a 100644 --- a/src/main/resources/mappers/kc/ImCkwpkwp.xml +++ b/src/main/resources/mappers/kc/ImCkwpkwp.xml @@ -8,6 +8,7 @@ SELECT (IM_CKWPKWP.KWH) AS KWH , IM_CKWPKWP.SXRQ , MS_DDJBP1.dzwz, + MS_DDJBP1.GHSBM, (IM_CKWPKWP.NBSBM) AS NBSBM , (IM_CKWPKWP.BSBS) AS BSBS , (IM_CKWPKWP.BSSCH) AS BSSCH , @@ -63,14 +64,13 @@ sllsh, dyry, dyrq, - IM_CKWPKWP.ydid, + IM_CKWPKWP.ydid, 'N' as bs, 'N' as bs_all - FROM IM_CKWPKWP join DM_WPJBP on((IM_CKWPKWP.WPH) = (DM_WPJBP.WPH)) left join (select MS_DDJBP.dzwz, - MS_DDJBP.ddmc,MS_DDMXP.dc_ch + MS_DDJBP.ddmc,MS_DDMXP.dc_ch,MS_DDJBP.GHSBM from MS_DDJBP,MS_DDMXP where MS_DDJBP.CGFLM = MS_DDMXP.CGFLM and MS_DDJBP.DDH = MS_DDMXP.DDH and MS_DDJBP.CGFLM = '01' and MS_DDJBP.DDLX = 'B') as MS_DDJBP1 on(IM_CKWPKWP.gcddh =MS_DDJBP1.dc_ch )