From 1989875570058620f47284f7b2e1f103966e2fb4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Tue, 8 Apr 2025 11:14:42 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E5=A4=87=E8=B4=A7?= =?UTF-8?q?=E5=8C=BA=E7=AE=A1=E8=8A=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/util/SlitterTaskUtil.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 ce8e7b2be..7f8e3cf8f 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 @@ -269,6 +269,9 @@ public class SlitterTaskUtil { String[] material_codes = new String[paperList.size()]; String[] material_specs = new String[paperList.size()]; int[] qtys = new int[paperList.size()]; + String[] material_codes1 = {null,null,null,null,null}; + String[] material_specs1 = {null,null,null,null,null}; + int[] qtys1 = {0,0,0,0,0}; for (int i = 0; i < paperList.size(); i++) { MdPbPapervehicle vehicle = paperList.get(i); String materialCode = vehicle.getMaterial_code(); @@ -282,14 +285,28 @@ public class SlitterTaskUtil { material_specs[i] = spec; qtys[i] = qty; } + //新规格数据处理 + int row_num = Integer.parseInt(vehicle.getRow_num()); + String spec = getComposePaperTubeInformation(vehicle.getMaterial_name(), vehicle.getMaterial_code().startsWith("4") ? "1" : "2"); + material_codes1[row_num-1] = materialCode; + material_specs1[row_num-1] = spec; + qtys1[row_num-1] = qty; } // 转成String String[] qtysStr = Arrays.stream(qtys) .mapToObj(String::valueOf) .toArray(String[]::new); + // 转成String + String[] qtysStr1 = Arrays.stream(qtys1) + .mapToObj(String::valueOf) + .toArray(String[]::new); param.put("to_material", String.join(",", material_codes)); param.put("to_spec", String.join(",", material_specs)); param.put("to_qty", String.join(",", qtysStr)); + + param.put("to_material1", String.join(",", material_codes1)); + param.put("to_spec1", String.join(",", material_specs1)); + param.put("to_qty1", String.join(",", qtysStr1)); param.put("device_code", material_specs); }