From aa142ae6bbdd7416d4c1264b58280e13e1559ac6 Mon Sep 17 00:00:00 2001 From: Allenxy <13762749+chaosallen@user.noreply.gitee.com> Date: Thu, 16 Jan 2025 14:08:28 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BA=A7=E5=87=BA=E5=AE=9E=E7=BB=A9?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=92=A2=E5=8D=B7=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CrmPdiPlanController.java | 7 ++ .../controller/CrmPdoExcoilController.java | 1 + .../controller/SteelGradeInfoController.java | 47 +++++++++-- .../com/fizz/business/domain/ModCoilMap.java | 8 +- .../com/fizz/business/domain/StdAlloy.java | 36 ++++++++ .../fizz/business/form/WebOperateMatForm.java | 3 + .../business/mapper/SteelGradeInfoMapper.java | 3 +- .../mq/RabbitMQ/RabbitQueueListener.java | 7 +- .../business/service/CrmPdiPlanService.java | 2 + .../business/service/ModCoilMapService.java | 2 + .../service/SteelGradeInfoService.java | 3 +- .../service/impl/CrmPdiPlanServiceImpl.java | 82 +++++++++++++++---- .../service/impl/CrmPdoExcoilServiceImpl.java | 4 +- .../service/impl/ModCoilMapServiceImpl.java | 21 +++++ .../impl/ModSetupResultServiceImpl.java | 2 +- .../impl/SteelGradeInfoServiceImpl.java | 4 +- .../service/impl/TrackServiceImpl.java | 44 +++++++--- .../fizz/business/vo/ModSetupResultKeyVO.java | 2 + .../java/com/fizz/business/vo/StdAlloyVO.java | 12 +++ .../src/main/resources/application-druid.yml | 8 +- 20 files changed, 251 insertions(+), 47 deletions(-) create mode 100644 business/src/main/java/com/fizz/business/domain/StdAlloy.java create mode 100644 business/src/main/java/com/fizz/business/vo/StdAlloyVO.java diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java index 414f071..b1feeb1 100644 --- a/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java +++ b/business/src/main/java/com/fizz/business/controller/CrmPdiPlanController.java @@ -29,6 +29,13 @@ public class CrmPdiPlanController { return R.ok(crmPdiPlanService.getByCoilIdAndOperId(coilid)); } + @GetMapping("/getOnlineCoil") + @ApiOperation("通过钢卷号或者状态查询计划") + public R getByCoilId() { + return R.ok(crmPdiPlanService.getOnlineCoil()); + } + + @GetMapping("/getCoilInfoAndSetupList") @ApiOperation("通过钢卷号获取钢卷信息和设定值列表") public R getCoilInfoAndSetupList(@RequestParam String coilid) { diff --git a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java index 9184113..078cf7f 100644 --- a/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java +++ b/business/src/main/java/com/fizz/business/controller/CrmPdoExcoilController.java @@ -39,6 +39,7 @@ public class CrmPdoExcoilController { @DeleteMapping("/delete/{excoilid}/{operid}") @ApiOperation("删除实绩") + public R delete(@PathVariable String excoilid, @PathVariable Integer operid) { return R.ok(crmPdoExcoilService.deleteCrmPdoExcoil(excoilid, operid)); } diff --git a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java index c7775fa..c96bf52 100644 --- a/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java +++ b/business/src/main/java/com/fizz/business/controller/SteelGradeInfoController.java @@ -1,13 +1,17 @@ package com.fizz.business.controller; -import com.fizz.business.domain.SteelGradeInfo; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fizz.business.domain.StdAlloy; import com.fizz.business.service.SteelGradeInfoService; +import com.fizz.business.vo.StdAlloyVO; import com.ruoyi.common.core.domain.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; @@ -21,19 +25,52 @@ public class SteelGradeInfoController { @GetMapping("/list") @ApiOperation("查询钢种列表") - public R> list() { - return R.ok(steelGradeInfoService.list()); + public R> list() { + + // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.select(StdAlloy::getGradeid, StdAlloy::getName); // 只查询 gradeId 和 name 字段 + + // 查询 StdAlloy 数据 + List stdAlloyList = steelGradeInfoService.list(queryWrapper); + + // 使用 BeanUtils 将 StdAlloy 对象的字段映射到 StdAlloyVO + List stdAlloyVOList = new ArrayList<>(); + for (StdAlloy stdAlloy : stdAlloyList) { + StdAlloyVO stdAlloyVO = new StdAlloyVO(); + BeanUtils.copyProperties(stdAlloy, stdAlloyVO); // 将 StdAlloy 属性复制到 StdAlloyVO + stdAlloyVOList.add(stdAlloyVO); + } + + // 返回结果 + return R.ok(stdAlloyVOList); } + @GetMapping("/info") + @ApiOperation("查询单个钢种详情") + public R getSteelGradeInfo(@RequestParam Integer gradeid) { + + // 使用 LambdaQueryWrapper 查询 StdAlloy 表中的数据 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StdAlloy::getGradeid, gradeid); // 只查询 gradeId 和 name 字段 + + // 查询 StdAlloy 数据 + StdAlloy stdAlloyList = steelGradeInfoService.getById(queryWrapper); + + // 返回结果 + return R.ok(stdAlloyList); + } + + @PostMapping("/add") @ApiOperation("新增") - public R add(@RequestBody SteelGradeInfo steelGradeInfo) { + public R add(@RequestBody StdAlloy steelGradeInfo) { return R.ok(steelGradeInfoService.save(steelGradeInfo)); } @PutMapping("/update") @ApiOperation("更新") - public R update(@RequestBody SteelGradeInfo steelGradeInfo) { + public R update(@RequestBody StdAlloy steelGradeInfo) { return R.ok(steelGradeInfoService.updateById(steelGradeInfo)); } diff --git a/business/src/main/java/com/fizz/business/domain/ModCoilMap.java b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java index 53e0c3c..8fa85a0 100644 --- a/business/src/main/java/com/fizz/business/domain/ModCoilMap.java +++ b/business/src/main/java/com/fizz/business/domain/ModCoilMap.java @@ -1,6 +1,7 @@ package com.fizz.business.domain; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; @@ -10,6 +11,10 @@ import java.time.LocalDateTime; @Data public class ModCoilMap { + @TableField("id") + @TableId(type = IdType.AUTO) + private Integer id; + @TableField("POSID") private Integer posid; @@ -76,9 +81,6 @@ public class ModCoilMap { @TableField("SETUP_MODE_DSC") private String setupModeDsc; - @TableField("STATUS") - private Integer status; - @TableField("STATUS_MODE_DSC") private String statusModeDsc; diff --git a/business/src/main/java/com/fizz/business/domain/StdAlloy.java b/business/src/main/java/com/fizz/business/domain/StdAlloy.java new file mode 100644 index 0000000..51f083d --- /dev/null +++ b/business/src/main/java/com/fizz/business/domain/StdAlloy.java @@ -0,0 +1,36 @@ +package com.fizz.business.domain; + + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class StdAlloy { + + private Integer gradeid; // GRADEID + private String name; // NAME + private Integer origin; // ORIGIN + private Float sigma0; // SIGMA0 + private Float firstSigma0; // FIRST_SIGMA0 + private Float initSigma; // INIT_SIGMA + private Float ro; // RO + private Integer classId; // CLASSID + private Float a; // A + private Float b; // B + private Float c; // C + private Float d; // D + private Float kc0; // KC0 + private Float kc1; // KC1 + private Float kc2; // KC2 + private Float kc3; // KC3 + private Float kc4; // KC4 + private Float nu; // NU + private Float e; // E + private Float chal; // CHAL + private Float temp0; // TEMP0 + private Float strength; // STRENGTH + private Integer weldCode; // WELD_CODE + private LocalDateTime insDate; // INSDATE + +} diff --git a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java index 2d2b462..c968d56 100644 --- a/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java +++ b/business/src/main/java/com/fizz/business/form/WebOperateMatForm.java @@ -36,4 +36,7 @@ public class WebOperateMatForm implements Serializable { @ApiModelProperty(value = "计划号") private String planNo; + @ApiModelProperty(value = "重量") + private Double weight; + } diff --git a/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java index 46f9e63..1bf6504 100644 --- a/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java +++ b/business/src/main/java/com/fizz/business/mapper/SteelGradeInfoMapper.java @@ -2,9 +2,10 @@ package com.fizz.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fizz.business.domain.StdAlloy; import com.fizz.business.domain.SteelGradeInfo; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface SteelGradeInfoMapper extends BaseMapper { +public interface SteelGradeInfoMapper extends BaseMapper { } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java index ff0aa4b..e103233 100644 --- a/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java +++ b/business/src/main/java/com/fizz/business/mq/RabbitMQ/RabbitQueueListener.java @@ -80,11 +80,16 @@ public class RabbitQueueListener { ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO(); modSetupResultKeyVO.setKey(ModSetupResultServiceImpl.WS_EKY); + modSetupResultKeyVO.setFlag(true); modSetupResultKeyVO.setLists(setup); //socket WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO)); } else if ("TOTAL_PRESET_FAILED".equalsIgnoreCase(messageId)) { - WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(Lists.newArrayList())); + + ModSetupResultKeyVO modSetupResultKeyVO = new ModSetupResultKeyVO(); + modSetupResultKeyVO.setKey(ModSetupResultServiceImpl.WS_EKY); + modSetupResultKeyVO.setFlag(false); + WebSocketUtil.sendMessage(WsTypeEnum.calc_setup_result,JSONUtil.toJsonStr(modSetupResultKeyVO)); } } diff --git a/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java index bed20b4..69d7244 100644 --- a/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java +++ b/business/src/main/java/com/fizz/business/service/CrmPdiPlanService.java @@ -29,4 +29,6 @@ public interface CrmPdiPlanService extends IService { String editCoilInfo(CrmPdiPlanForm coilid); String calcSetup(CalcPdiPlanForm coilid); + + CrmPdiPlan getOnlineCoil(); } diff --git a/business/src/main/java/com/fizz/business/service/ModCoilMapService.java b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java index f0f42dd..9405690 100644 --- a/business/src/main/java/com/fizz/business/service/ModCoilMapService.java +++ b/business/src/main/java/com/fizz/business/service/ModCoilMapService.java @@ -6,5 +6,7 @@ import com.fizz.business.domain.ModCoilMap; public interface ModCoilMapService extends IService { void saveModCoilInfo(ModCoilMap modCoilMap); + void updateModCoil(String coilId); + // 你可以添加自定义的业务方法 } diff --git a/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java b/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java index 14df197..0e8b403 100644 --- a/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java +++ b/business/src/main/java/com/fizz/business/service/SteelGradeInfoService.java @@ -1,7 +1,8 @@ package com.fizz.business.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.fizz.business.domain.StdAlloy; import com.fizz.business.domain.SteelGradeInfo; -public interface SteelGradeInfoService extends IService { +public interface SteelGradeInfoService extends IService { } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java index 2026170..a604df0 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdiPlanServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.domain.CrmPdiPlan; import com.fizz.business.domain.ModCoilMap; +import com.fizz.business.domain.ProMatmap; import com.fizz.business.form.*; import com.fizz.business.mapper.CrmPdiPlanMapper; import com.fizz.business.service.CrmPdiPlanService; @@ -20,6 +21,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.List; @@ -46,17 +48,26 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - if (coilid.equals("ONLINE")) { + if (coilid.equalsIgnoreCase("ONLINE")) { queryWrapper.eq("STATUS", coilid); CrmPdiPlan one = this.getOne(queryWrapper); return BeanUtil.copyProperties(one, CrmPdiPlanVO.class); + }else { + queryWrapper.like("coilid", coilid); + CrmPdiPlan one = this.getOne(queryWrapper); + + return BeanUtil.copyProperties(one, CrmPdiPlanVO.class); } - queryWrapper.like("coilid", coilid); - CrmPdiPlan one = this.getOne(queryWrapper); + } - return BeanUtil.copyProperties(one, CrmPdiPlanVO.class); + private CrmPdiPlan getByCoilId(String coilid) { + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CrmPdiPlan::getCoilid,coilid); + + return this.baseMapper.selectOne(queryWrapper); } @Override @@ -112,30 +123,47 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.in("STATUS", "NEW", "READY"); - return BeanUtil.copyToList(this.list(), CrmPdiPlanVO.class); + return BeanUtil.copyToList(this.list(queryWrapper), CrmPdiPlanVO.class); } @Override public void updateCrmPdiPlanById(ChangePlanStatusForm form) { - if (StringUtils.compare(form.getOperation(), "ONLINE") == 0) { - log.info("上线时通知通讯程序下发设定到L1,matId: {}", form.getCoilId()); - modSetupResultService.retrySetup(form.getCoilId()); - } CrmPdiPlan crmPdiPlan = this.getById(form.getId()); - crmPdiPlan.setStatus(form.getOperation()); + if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) { + crmPdiPlan.setStatus("READY"); + this.updateById(crmPdiPlan); + log.info("退回钢卷,matId: {}", form.getCoilId()); + this.updateById(crmPdiPlan); + } - this.updateById(crmPdiPlan); + + if (StringUtils.compare(form.getOperation(), "ONLINE") == 0 && StringUtils.compare(form.getOperation(), "PRODUCT") != 0) { + + crmPdiPlan.setStatus(form.getOperation()); + + LocalDateTime now = LocalDateTime.now(); + crmPdiPlan.setOnlineTime(now); + crmPdiPlan.setStartDate(now); + this.updateById(crmPdiPlan); + log.info("上线时通知通讯程序下发设定到L1,matId: {}", form.getCoilId()); + modSetupResultService.retrySetup(form.getCoilId()); + + ModCoilMap bean = BeanUtil.toBean(crmPdiPlan, ModCoilMap.class); + modCoilMapService.saveModCoilInfo(bean); + + } + + if (StringUtils.compare(form.getOperation(), "PRODUCT") == 0) { + + modCoilMapService.updateModCoil(form.getCoilId()); + + } proMatmapService.updateMatid(form.getCoilId()); - - ModCoilMap bean = BeanUtil.toBean(crmPdiPlan, ModCoilMap.class); - modCoilMapService.saveModCoilInfo(bean); - - } @Override @@ -172,6 +200,8 @@ public class CrmPdiPlanServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProMatmap::getL1mapidx,0); + + ProMatmap one = proMatmapService.getOne(queryWrapper); + + if (one == null){ + + return new CrmPdiPlan(); + + } + + CrmPdiPlan byCoilId = getByCoilId(one.getMatid()); + + + return byCoilId; + } + } diff --git a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java index 9d97452..7dcda02 100644 --- a/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/CrmPdoExcoilServiceImpl.java @@ -23,7 +23,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("excoilid", excoilid).eq("operid", operid); + queryWrapper.eq("exit_coilid", excoilid).eq("operid", operid); return this.getOne(queryWrapper); } @@ -56,7 +56,7 @@ public class CrmPdoExcoilServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("excoilid", excoilid).eq("operid", operid); + queryWrapper.eq("exit_coilid", excoilid).eq("operid", operid); return this.remove(queryWrapper); } diff --git a/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java index b78ad95..87dd7ae 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ModCoilMapServiceImpl.java @@ -1,6 +1,7 @@ package com.fizz.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.fizz.business.domain.ModCoilMap; import com.fizz.business.mapper.ModCoilMapMapper; @@ -18,4 +19,24 @@ public class ModCoilMapServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + + queryWrapper.eq(ModCoilMap::getCoilid,coilId); + + ModCoilMap coilMap = this.baseMapper.selectOne(queryWrapper); + + if (coilMap == null){ + return; + } + coilMap.setPosid(0); + + this.baseMapper.updateById(coilMap); + + + + } + } \ No newline at end of file diff --git a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java index 1f8101f..252783f 100644 --- a/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/ModSetupResultServiceImpl.java @@ -117,7 +117,7 @@ public class ModSetupResultServiceImpl extends ServiceImpl implements SteelGradeInfoService { +public class SteelGradeInfoServiceImpl extends ServiceImpl implements SteelGradeInfoService { } diff --git a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java index b05fe85..49dd6a3 100644 --- a/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java +++ b/business/src/main/java/com/fizz/business/service/impl/TrackServiceImpl.java @@ -4,9 +4,11 @@ import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.fizz.business.domain.CrmPdiPlan; import com.fizz.business.domain.CrmPdoExcoil; +import com.fizz.business.domain.ProMatmap; import com.fizz.business.form.WebOperateMatForm; import com.fizz.business.mapper.CrmPdiPlanMapper; import com.fizz.business.service.CrmPdoExcoilService; +import com.fizz.business.service.ProMatmapService; import com.fizz.business.service.TrackService; import com.fizz.business.utils.CalcUtil; import com.fizz.business.vo.Plan2PdoVO; @@ -15,7 +17,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; - +import java.time.LocalDateTime; /** @@ -29,6 +31,9 @@ public class TrackServiceImpl implements TrackService { @Resource CrmPdiPlanMapper crmPdiPlanMapper; + @Resource + ProMatmapService proMatmapService; + @Resource CrmPdoExcoilService crmPdoExcoilService; @@ -48,22 +53,37 @@ public class TrackServiceImpl implements TrackService { this.operateMatWeb(form); CrmPdiPlan pdiPlan = crmPdiPlanMapper.selectById(form.getId()); + pdiPlan.setEndDate(LocalDateTime.now()); + + pdiPlan.setStatus("PRODUCT"); + crmPdiPlanMapper.updateById(pdiPlan); + Plan2PdoVO bean = BeanUtil.toBean(pdiPlan, Plan2PdoVO.class); CrmPdoExcoil excoil = BeanUtil.toBean(bean, CrmPdoExcoil.class); - double calcCoilWeight = CalcUtil.calcCoilWeight(excoil.getExitLength(), excoil.getEntryThick(), excoil.getEntryWidth()); - excoil.setEncoilid(bean.getCoilid()); - excoil.setExitCoilid(bean.getCoilid()); - excoil.setCalcExitWeight(calcCoilWeight); - excoil.setMeasExitWeight(calcCoilWeight); - excoil.setHeadpos(0d); - excoil.setTailpos(excoil.getExitLength()); - excoil.setSubid(1); - excoil.setOuterDiameter(Double.valueOf(bean.getEntryOuterDiameter())); - excoil.setStatus("PRODUCT"); + CrmPdoExcoil operId = crmPdoExcoilService.getByExcoilIdAndOperId(excoil.getExitCoilid(), excoil.getOperid()); - crmPdoExcoilService.addCrmPdoExcoil(excoil); + if (operId == null){ + double calcCoilWeight = CalcUtil.calcCoilWeight(excoil.getExitLength(), excoil.getEntryThick(), excoil.getEntryWidth()); + excoil.setEncoilid(bean.getCoilid()); + excoil.setExitCoilid(bean.getCoilid()); + excoil.setCalcExitWeight(calcCoilWeight); + excoil.setMeasExitWeight(calcCoilWeight); + excoil.setHeadpos(0d); + excoil.setTailpos(excoil.getExitLength()); + excoil.setSubid(1); + excoil.setOuterDiameter(Double.valueOf(bean.getEntryOuterDiameter())); + excoil.setStatus("PRODUCT"); + excoil.setOnlineDate(pdiPlan.getOnlineTime()); + excoil.setStartDate(pdiPlan.getStartDate()); + excoil.setEndDate(pdiPlan.getEndDate()); + + crmPdoExcoilService.addCrmPdoExcoil(excoil); + + proMatmapService.updateMatid(""); + + } } diff --git a/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java b/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java index 94728cf..8cf8a8a 100644 --- a/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java +++ b/business/src/main/java/com/fizz/business/vo/ModSetupResultKeyVO.java @@ -10,6 +10,8 @@ public class ModSetupResultKeyVO { String key; + boolean flag; + List lists; } diff --git a/business/src/main/java/com/fizz/business/vo/StdAlloyVO.java b/business/src/main/java/com/fizz/business/vo/StdAlloyVO.java new file mode 100644 index 0000000..ff77b28 --- /dev/null +++ b/business/src/main/java/com/fizz/business/vo/StdAlloyVO.java @@ -0,0 +1,12 @@ +package com.fizz.business.vo; + + +import lombok.Data; + +@Data +public class StdAlloyVO { + + private Integer gradeid; // GRADEID + private String name; // NAME + +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 89d8a2c..3ffb9d7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,9 +7,11 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://47.109.139.82:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: ngcrm - password: ngcrm + url: jdbc:mysql://localhost:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.160.155.0:3306/ngcrm?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: root*-2024 +# password: root # 从库数据源 slave: # 从数据源开关/默认关闭