fix: pc可修改分切计划信息

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<PdmBiSlitt
      * @return /
      */
     PdmBiSlittingproductionplan getByContainerName(String containerName);
+
+    /**
+     * 设置气胀轴方向
+     * @param whereJson /
+     */
+    void setDirection(JSONObject whereJson);
 }

lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java

@@ -2,6 +2,9 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,8 +15,10 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproducti
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan;
 import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper;
 import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto;
+import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
 import org.nl.common.domain.query.PageQuery;
 import org.nl.common.utils.SecurityUtils;
+import org.nl.common.utils.TaskUtils;
 import org.nl.modules.common.exception.BadRequestException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,6 +26,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @description 服务实现
@@ -111,5 +117,29 @@ public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl<PdmBiSli
         return pdmBiSlittingproductionplanMapper.selectOne(lam);
     }
 
+    @Override
+    public void setDirection(JSONObject whereJson) {
+        JSONArray data = whereJson.getJSONArray("data");
+        String upOrDown = whereJson.getString("up_or_down");
+        String leftOrRight = whereJson.getString("left_or_right");
+        List<String> 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<PdmBiSlittingproductionplan>()
+                    .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<PdmBiSlittingproductionplan>()
+                    .in(PdmBiSlittingproductionplan::getWorkorder_id, workorderId));
+        }
+    }
+
 
 }

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<BstIvtShafttubeivt>()

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<String> getAllStringByName(JSONArray array, String name) {
+        List<String> res = new ArrayList<>();
+        for (int i = 0; i < array.size(); i++) {
+            JSONObject jsonObject = array.getJSONObject(i);
+            res.add(jsonObject.getString(name));
+        }
+        return res;
+    }
 }

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<Object> setDirection(@RequestBody JSONObject whereJson) {
+        biSlittingproductionplanService.setDirection(whereJson);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 }