From f606c6a16a9c20899e3e7803d0901668e9b7d935 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Tue, 2 Jul 2024 22:43:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20pc=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=88=86?= =?UTF-8?q?=E5=88=87=E8=AE=A1=E5=88=92=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPdmBiSlittingproductionplanService.java | 7 +++++ ...dmBiSlittingproductionplanServiceImpl.java | 30 +++++++++++++++++++ .../service/impl/SlitterServiceImpl.java | 1 + .../tasks/slitter/util/SlitterTaskUtil.java | 17 +++++++++++ .../SlittingproductionplanController.java | 9 ++++++ 5 files changed, 64 insertions(+) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index 42aa1309e..3a2d9a6a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -1,5 +1,6 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.common.domain.query.PageQuery; @@ -77,4 +78,10 @@ public interface IPdmBiSlittingproductionplanService extends IService workorderId = SlitterTaskUtil.getAllStringByName(data, "workorder_id"); + if (ObjectUtil.isNotEmpty(upOrDown)) { + // 设置上下轴 + PdmBiSlittingproductionplan demo = new PdmBiSlittingproductionplan(); + demo.setUp_or_down(upOrDown); + TaskUtils.updateOptMessageBySlitterPlan(demo); + this.saveOrUpdate(demo, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getWorkorder_id, workorderId)); + } + if (ObjectUtil.isNotEmpty(leftOrRight)) { + // 设置上下轴 + PdmBiSlittingproductionplan demo = new PdmBiSlittingproductionplan(); + demo.setLeft_or_right(leftOrRight); + TaskUtils.updateOptMessageBySlitterPlan(demo); + this.saveOrUpdate(demo, new LambdaQueryWrapper() + .in(PdmBiSlittingproductionplan::getWorkorder_id, workorderId)); + } + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index d6f543da3..42890437d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -729,6 +729,7 @@ public class SlitterServiceImpl implements SlitterService { if (ObjectUtil.isEmpty(plan.getLevel())) { throw new BadRequestException("子卷[" + plan.getContainer_name() + "]对应的级别不能为空"); } + plan.setLevel("4"); String point_type = "5".equals(plan.getLevel()) ? "5" : "4"; // 查找终点 确认是废箔还是成品： 根据分切计划的子卷等级来区分，5为报废 BstIvtShafttubeivt one = shafttubeivtService.getOne(new LambdaQueryWrapper() diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java index 48bbb2d7e..d632a7315 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java @@ -2,12 +2,14 @@ package org.nl.b_lms.sch.tasks.slitter.util; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.modules.common.exception.BadRequestException; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -243,4 +245,19 @@ public class SlitterTaskUtil { param.put("to_qty", String.join(",", qtysStr)); param.put("device_code", material_specs); } + + /** + * 传入JSONArray返回筛选字符串 + * @param array / + * @param name / + * @return / + */ + public static List getAllStringByName(JSONArray array, String name) { + List res = new ArrayList<>(); + for (int i = 0; i < array.size(); i++) { + JSONObject jsonObject = array.getJSONObject(i); + res.add(jsonObject.getString(name)); + } + return res; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java index 68b787224..d3627290d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java @@ -4,6 +4,7 @@ package org.nl.wms.pdm.rest; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.modules.logging.annotation.Log; import org.nl.wms.pdm.service.SlittingproductionplanService; import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; @@ -28,6 +29,8 @@ public class SlittingproductionplanController { private final SlittingproductionplanService slittingproductionplanService; + private final IPdmBiSlittingproductionplanService biSlittingproductionplanService; + @GetMapping @Log("查询分切计划") @@ -102,4 +105,10 @@ public class SlittingproductionplanController { slittingproductionplanService.compelFinish(whereJson); return new ResponseEntity<>(HttpStatus.OK); } + @Log("修改子卷放置方向") + @PostMapping("/setDirection") + public ResponseEntity setDirection(@RequestBody JSONObject whereJson) { + biSlittingproductionplanService.setDirection(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } }