From 710b59b45b8cc84850c8cd0670b13ec3d64ccb01 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sat, 29 Oct 2022 09:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/pdm/wql/pdm.xls  | Bin 280576 -> 280576 bytes
 .../org/nl/wms/sch/tasks/CutTrussTask.java    |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls
index a858eaf70bebb20db60f1b1af8890ba2dde08856..b7b756b7ca98479b0ca5f74db3e6e615dab36e3c 100644
GIT binary patch
delta 51
zcmZpeAlNWLa6>K&EBBq3e_m}aV%a9l$;H6nm!FiAs@`lU(QYWg2*gZ4%)H%Dg5|tE
E0OGR{e*gdg

delta 51
zcmZpeAlNWLa6>K&tJ{?yM_+C(V%a9l$;QBtlbV-bmfvhB(QYWg2*gZ4%)H%Dg5|tE
E0PndG0RR91

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
index a4b6927e5..928d18fa5 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
@@ -130,7 +130,7 @@ public class CutTrussTask extends AbstractAcsTask {
                 }
             }
         }
-    }
+     }
 
     @Override
     public void findStartPoint() {
@@ -202,7 +202,7 @@ public class CutTrussTask extends AbstractAcsTask {
             throw new BadRequestException("未查询到气涨轴："+json.getString("vehicle_code2")+"对应的分切计划！");
         }
         for (int i = 0; i < plan_jo2.size(); i++) {
-            JSONObject plan_row = plan_jo.getJSONObject(i);
+            JSONObject plan_row = plan_jo2.getJSONObject(i);
             plan_row.put("status","06");
             plan_row.put("end_time",DateUtil.now());
             WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").update(plan_row);