From 2dbc3c0644aa2eb5f97036ff0aea67c08e9fdb6d Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 6 Sep 2024 16:58:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=B3=E8=AF=B7=E5=A5=97=E8=BD=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/controller/SlitterPdaController.java | 6 ++ .../pda/mps/service/SlitterPdaService.java | 7 +++ .../service/impl/SlitterPdaServiceImpl.java | 58 +++++++++++++++++++ .../wms/pda/mps/service/vo/CallShaftVo.java | 18 ++++++ .../tasks/slitter/SlitterDownAGVTask.java | 16 ++--- 5 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/vo/CallShaftVo.java diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/SlitterPdaController.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/SlitterPdaController.java index 8b493e58e..116349266 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/SlitterPdaController.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/controller/SlitterPdaController.java @@ -81,4 +81,10 @@ public class SlitterPdaController { public ResponseEntity bindSlitterSubVolumeInfo(@RequestBody JSONObject param) { return new ResponseEntity<>(slitterPdaService.bindSlitterSubVolumeInfo(param), HttpStatus.OK); } + + @PostMapping("/requestTubeShaft") + @Log("套轴申请 - 请求套轴") + public ResponseEntity requestTubeShaft(@RequestBody JSONObject param) { + return new ResponseEntity<>(slitterPdaService.requestTubeShaft(param), HttpStatus.OK); + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/SlitterPdaService.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/SlitterPdaService.java index 5b08c0a5e..f436fe34a 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/SlitterPdaService.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/SlitterPdaService.java @@ -72,4 +72,11 @@ public interface SlitterPdaService { * @return */ JSONObject bindSlitterSubVolumeInfo(JSONObject param); + + /** + * 套轴申请 - 请求套轴 + * @param param + * @return + */ + JSONObject requestTubeShaft(JSONObject param); } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java index ebd04fc57..81c427d7f 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/impl/SlitterPdaServiceImpl.java @@ -1,6 +1,8 @@ package org.nl.wms.pda.mps.service.impl; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -11,6 +13,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.config.lucene.TagNameEnum; import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.pda.mps.service.SlitterPdaService; +import org.nl.wms.pda.mps.service.vo.CallShaftVo; import org.nl.wms.pdm.bi.dao.PdmBiRawfoilworkorder; import org.nl.wms.pdm.bi.dao.PdmBiSlittingproductionplan; import org.nl.wms.pdm.bi.service.IpdmBiRawfoilworkorderService; @@ -34,7 +37,10 @@ import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -375,4 +381,56 @@ public class SlitterPdaServiceImpl implements SlitterPdaService { res.put("message", "子卷信息绑定成功!"); return res; } + + @Override + public JSONObject requestTubeShaft(JSONObject param) { + log.info("请求套轴 - {}", param); + // param: row: point_code,left_or_right,material_code,material_spec,paper_or_frp,qzz_size + List row = param.getJSONArray("row").toJavaList(CallShaftVo.class); + String pointCode = row.get(0).getPoint_code(); + StIvtCutpointivt cutDevice = cutpointivtService.getPintByUpOrDownCode(pointCode, false); + List plans = new ArrayList<>(); + for (CallShaftVo callShaftVo : row) { + // 保存工单 + PdmBiSlittingproductionplan plan = new PdmBiSlittingproductionplan(); + plan.setWorkorder_id(IdUtil.getSnowflake(1,1).nextIdStr()); + plan.setOrder_type("1"); + plan.setContainer_name("-"); + plan.setProduct_name("-"); + plan.setDescription("-"); + plan.setWare_house("-"); + plan.setResource_name(cutDevice.getExt_code()); + plan.setSplit_group("-"); + plan.setManufacture_sort("1"); + plan.setMfg_order_name("-"); + plan.setManufacture_date(DateUtil.format(new Date(), "yyyy-MM-dd")); + plan.setPaper_tube_or_FRP(callShaftVo.getPaper_or_frp()); + if ("1".equals(callShaftVo.getPaper_or_frp())) { + // 纸管 + plan.setPaper_tube_material(callShaftVo.getMaterial_code()); + plan.setPaper_tube_model(callShaftVo.getMaterial_spec()); + plan.setPaper_tube_description(callShaftVo.getMaterial_spec()); + } else { + // frp + plan.setFRP_material(callShaftVo.getMaterial_code()); + plan.setFRP_model(callShaftVo.getMaterial_spec()); + plan.setFRP_description(callShaftVo.getMaterial_spec()); + } + plan.setStatus("01"); + plan.setSplit_height(BigDecimal.valueOf(1)); + plan.setSplit_breadth(BigDecimal.valueOf(1)); + plan.setSplit_weight(BigDecimal.valueOf(1)); + plan.setSale_order_name("-"); + plan.setQzz_size(callShaftVo.getQzz_size()); + plan.setUp_or_down(cutDevice.getUp_point_code().equals(callShaftVo.getPoint_code()) + ? "1" : "2"); + plan.setLeft_or_right(callShaftVo.getLeft_or_right()); + plans.add(plan); + } + slittingproductionplanService.saveBatch(plans); + JSONObject res = new JSONObject(); + res.put("status", cn.hutool.http.HttpStatus.HTTP_OK); + res.put("message", "请求套轴成功!"); + return res; + } } diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/vo/CallShaftVo.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/vo/CallShaftVo.java new file mode 100644 index 000000000..ee6400e9e --- /dev/null +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/mps/service/vo/CallShaftVo.java @@ -0,0 +1,18 @@ +package org.nl.wms.pda.mps.service.vo; + +import lombok.Data; + +/** + * 请求套轴Vo + * @Author: lyd + * @Date: 2024/9/6 + */ +@Data +public class CallShaftVo { + private String point_code; + private String left_or_right; + private String material_code; + private String material_spec; + private String paper_or_frp; + private String qzz_size; +} diff --git a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java index 512f01e06..2c2d6402c 100644 --- a/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java +++ b/lms2/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/tasks/slitter/SlitterDownAGVTask.java @@ -147,15 +147,15 @@ public class SlitterDownAGVTask extends AbstractTask { slittingproductionplanService.update(p, new LambdaQueryWrapper() .in(PdmBiSlittingproductionplan::getQzzno, qzzNo)); } - PdmBiSlittingproductionplan demoPlan = list.get(0); +// PdmBiSlittingproductionplan demoPlan = list.get(0); // hint: 创建送气胀轴任务 - JSONObject taskParam = new JSONObject(); - taskParam.put("up_task_code", taskObj.getTask_code()); - taskParam.put("config_code", "SendShaftAGVTask"); - taskParam.put("resource_name", demoPlan.getResource_name()); - taskParam.put("create_mode", GeneralDefinition.TASK_CREATION); - taskParam.put("device_code", startPointCode); - sendShaftAGVTask.apply(taskParam); +// JSONObject taskParam = new JSONObject(); +// taskParam.put("up_task_code", taskObj.getTask_code()); +// taskParam.put("config_code", "SendShaftAGVTask"); +// taskParam.put("resource_name", demoPlan.getResource_name()); +// taskParam.put("create_mode", GeneralDefinition.TASK_CREATION); +// taskParam.put("device_code", startPointCode); +// sendShaftAGVTask.apply(taskParam); // 任务更新 taskObj.setTask_status(TaskStatus.FINISHED.getCode()); taskObj.setFinished_type(taskFinishedType.getCode());