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 a858eaf70..b7b756b7c 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ 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);