From c7962059c24100d573942f06b156037e035f134b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Tue, 24 Dec 2024 16:58:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E6=9C=88=E5=BA=A6=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=AE=A1=E6=A0=B8=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=202.=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA=203.=E4=BF=AE=E5=A4=8D=E5=88=92?= =?UTF-8?q?=E7=BA=BF=E3=80=81=E5=88=87=E5=89=B2=E6=8A=A5=E5=B7=A5=E6=9C=AA?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84bug=204.=E5=A2=9E=E5=8A=A0=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AE=A1=E5=88=92=E4=BD=9C=E4=B8=9A=E5=8C=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8A=9F=E8=83=BD=205.=E8=B0=83=E6=95=B4=E4=B8=8A?= =?UTF-8?q?=E6=96=99=E6=91=86=E6=94=BE=E5=8C=BA=E5=9F=9F=E5=8F=AF=E6=8B=96?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/czzj/MpDhsj.java | 53 ++++++++++++++++++ .../com/dsic/gj_erp/bean/jhgk/DmYdjh.java | 1 + .../java/com/dsic/gj_erp/bean/zyjh/Ycldw.java | 8 +++ .../com/dsic/gj_erp/config/JapConfig.java | 2 +- .../controller/jhgk/DmYdjhController.java | 6 ++ .../controller/zyjh/YcldwController.java | 56 +++++++++++++++++++ .../controller/zyjh/ZyjhController.java | 24 +++++++- .../dsic/gj_erp/mapper/czzj/MpDhsjMapper.java | 9 +++ .../gj_erp/service/czzj/MpDhsjServcie.java | 10 ++++ .../dsic/gj_erp/service/zyjh/ZyjhService.java | 6 +- .../resources/mappers/czzj/YcldwMapper.xml | 5 ++ 11 files changed, 174 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java create mode 100644 src/main/java/com/dsic/gj_erp/controller/zyjh/YcldwController.java create mode 100644 src/main/java/com/dsic/gj_erp/mapper/czzj/MpDhsjMapper.java create mode 100644 src/main/java/com/dsic/gj_erp/service/czzj/MpDhsjServcie.java create mode 100644 src/main/resources/mappers/czzj/YcldwMapper.xml diff --git a/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java new file mode 100644 index 0000000..6d4449c --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/bean/czzj/MpDhsj.java @@ -0,0 +1,53 @@ +package com.dsic.gj_erp.bean.czzj; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MpDhsj { + + private String dhh; + + private String wph; + + private String wpjb; + + private String gzlx; + + private String gzbm; + + private String dhsl; + + private String cpxql; + + private String gysbh; + + private String gylb; + + private String zt; + + private String sysl; + + private String xdtz; + + private String dcCh; + + private String dcPl; + + private String dcFd;//船号+分段号 + + private String dcTh; + + private String dcZl; + + private String dcLph; + + private String dcTpbh; + + private String dcTpmc; + + private String hxfl; + + private String dhsl1; +} diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java index 50fbe5c..d87a44a 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjh.java @@ -374,6 +374,7 @@ public class DmYdjh implements Serializable { private String zyq1; private String ykw; private String kwmc; + private String zylx;//流向,对应字典编码类别:zylx @TableField(exist = false) diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java index 992e4e7..f4c9d2d 100644 --- a/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java +++ b/src/main/java/com/dsic/gj_erp/bean/zyjh/Ycldw.java @@ -20,10 +20,18 @@ public class Ycldw { private String name; private DwTypeEnum type; private String tzbh; + private String kw; @TableField(exist = false) private List list; + public void setTypeForYcl(){ + this.type=DwTypeEnum.YCL; + } + + public static DwTypeEnum getTypeForYcl(){ + return DwTypeEnum.YCL; + } public enum DwTypeEnum{ YCL,//预处理垛位 diff --git a/src/main/java/com/dsic/gj_erp/config/JapConfig.java b/src/main/java/com/dsic/gj_erp/config/JapConfig.java index 184f05a..4fd436a 100644 --- a/src/main/java/com/dsic/gj_erp/config/JapConfig.java +++ b/src/main/java/com/dsic/gj_erp/config/JapConfig.java @@ -95,7 +95,7 @@ public class JapConfig { dataSource.setIdleTimeout(60000); dataSource.setMaximumPoolSize(200); dataSource.setLeakDetectionThreshold(60000); - dataSource.setMinimumIdle(40); + dataSource.setMinimumIdle(20); dataSource.setMaxLifetime(1800000); dsInitializer.setDataSource(dataSource); ResourceDatabasePopulator dbPopulator = new ResourceDatabasePopulator(); diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index a3bb3dc..de4b71b 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -57,6 +57,12 @@ public class DmYdjhController { @Autowired private DmYdjhMapper dmYdjhMapper; + @PostMapping("editZyq") + public ResultBean editZyq(@RequestBody DmYdjh ydjh){ + service.updateById(ydjh); + return new ResultBean<>(); + } + @PostMapping("save") public ResultBean save(@RequestBody List list){ service.updateBatchById(list); diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/YcldwController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/YcldwController.java new file mode 100644 index 0000000..9ff4d70 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/YcldwController.java @@ -0,0 +1,56 @@ +package com.dsic.gj_erp.controller.zyjh; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.zyjh.Ycldw; +import com.dsic.gj_erp.service.zyjh.YcldwService; +import lombok.AllArgsConstructor; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("ycldw") +@AllArgsConstructor +public class YcldwController { + + private final YcldwService service; + + @PostMapping("list") + public ResultBean list(@RequestBody Ycldw ycldw) { + return new ResultBean<>( + service.list(Wrappers.lambdaQuery() + .eq(Ycldw::getType,Ycldw.getTypeForYcl()) + .eq(StrUtil.isNotEmpty(ycldw.getKw()),Ycldw::getKw,ycldw.getKw()) + )); + } + + @PostMapping("submit") + @Transactional(rollbackFor = Exception.class) + public ResultBean edit(@RequestBody Map> map) { + if (map.get("add")!=null){ + map.get("add").forEach(item->{ + item.setTypeForYcl(); + service.save(item); + }); + } + + if (map.get("edit")!=null){ + service.updateBatchById(map.get("edit")); + } + + if (map.get("remove")!=null){ + List remove = map.get("remove").stream().map(Ycldw::getId).collect(Collectors.toList()); + service.removeByIds(remove); + } + + return new ResultBean<>(); + } +} diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index 5518728..a4731a4 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -9,15 +9,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; +import com.dsic.gj_erp.bean.czzj.MpDhsj; import com.dsic.gj_erp.bean.jhgk.DmYdjh; import com.dsic.gj_erp.bean.kc.ImCkwpkwp; +import com.dsic.gj_erp.bean.pbsc.MpYlxxp; import com.dsic.gj_erp.bean.zyjh.PwExcel; import com.dsic.gj_erp.bean.zyjh.Ycldw; import com.dsic.gj_erp.bean.zyjh.YcldwInfo; import com.dsic.gj_erp.controller.zyjh.dto.*; import com.dsic.gj_erp.exception.ServiceException; import com.dsic.gj_erp.listeners.ExcelPwListener; +import com.dsic.gj_erp.service.czzj.MpDhsjServcie; import com.dsic.gj_erp.service.kc.ImCkwpkwpService; +import com.dsic.gj_erp.service.pgsc.MpYlxxpService; import com.dsic.gj_erp.service.zyjh.YcldwInfoService; import com.dsic.gj_erp.service.zyjh.YcldwService; import com.dsic.gj_erp.service.zyjh.ZyjhService; @@ -51,9 +55,10 @@ public class ZyjhController { private final WebSocketService webSocketService; - private final ImCkwpkwpService imCkwpkwpService; + private final MpDhsjServcie mpDhsjServcie; + /** * 抛丸导入 */ @@ -156,8 +161,8 @@ public class ZyjhController { * 根据状态或班组长,获取作业计划,用于报工 */ @GetMapping("getYdjhByZtOrForeman") - public ResultBean getYdjhByZtOrForeman(Integer zt,String foreman){ - List list = zyjhService.getYdjhByZtOrForeman(zt, foreman); + public ResultBean getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){ + List list = zyjhService.getYdjhByZtOrForeman(zt, foreman,zyq); return new ResultBean<>(list); } @@ -245,21 +250,34 @@ public class ZyjhController { wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(info)); } } + if ("HXFK".equals(dto.getZxZtName())){ if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){ ycldwInfoService.updatePw(dto.getYcldwInfo()); wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); } } + if ("QGFK".equals(dto.getZxZtName())){ //无需划线,从理料间获取时才更新垛位信息 if (ObjUtil.isNotEmpty(info)&&info.getId()!=null){ if ("42".equals(dto.getZt())){ ycldwInfoService.updatePw(dto.getYcldwInfo()); } + + //更新质量的炉批号 + List collect=new ArrayList<>(); + list.forEach(item -> { + MpDhsj mpDhsj = new MpDhsj(); + + collect.add(mpDhsj); + }); + mpDhsjServcie.saveBatch(collect); + wsHandler.sendHXComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); wsHandler.sendQGComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo())); } + } zyjhService.updateBatchById(list); diff --git a/src/main/java/com/dsic/gj_erp/mapper/czzj/MpDhsjMapper.java b/src/main/java/com/dsic/gj_erp/mapper/czzj/MpDhsjMapper.java new file mode 100644 index 0000000..c935d83 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/mapper/czzj/MpDhsjMapper.java @@ -0,0 +1,9 @@ +package com.dsic.gj_erp.mapper.czzj; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.czzj.MpDhsj; +import org.mapstruct.Mapper; + +@Mapper +public interface MpDhsjMapper extends BaseMapper { +} diff --git a/src/main/java/com/dsic/gj_erp/service/czzj/MpDhsjServcie.java b/src/main/java/com/dsic/gj_erp/service/czzj/MpDhsjServcie.java new file mode 100644 index 0000000..1f02260 --- /dev/null +++ b/src/main/java/com/dsic/gj_erp/service/czzj/MpDhsjServcie.java @@ -0,0 +1,10 @@ +package com.dsic.gj_erp.service.czzj; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dsic.gj_erp.bean.czzj.MpDhsj; +import com.dsic.gj_erp.mapper.czzj.MpDhsjMapper; +import org.springframework.stereotype.Service; + +@Service +public class MpDhsjServcie extends ServiceImpl { +} diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index ed48ecc..2dcb21f 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -36,9 +36,11 @@ public class ZyjhService extends ServiceImpl { private final DmCbxxpService dmCbxxpService; private final RedisTemplate redisTemplate; - public List getYdjhByZtOrForeman(Integer zt,String foreman){ + public List getYdjhByZtOrForeman(Integer zt,String foreman,String zyq){ QueryWrapper wrapper = new QueryWrapper() - .ge("zt",11).ge(ObjUtil.isNotEmpty(zt),"zt",zt); + .ge("zt",11) + .ge(ObjUtil.isNotEmpty(zt),"zt",zt) + .eq(StrUtil.isNotEmpty(zyq),"zyq1",zyq); switch (zt){ case 31: diff --git a/src/main/resources/mappers/czzj/YcldwMapper.xml b/src/main/resources/mappers/czzj/YcldwMapper.xml new file mode 100644 index 0000000..ebf316c --- /dev/null +++ b/src/main/resources/mappers/czzj/YcldwMapper.xml @@ -0,0 +1,5 @@ + + + + +