From 0dbf8c8e298ac26e69851352cf0745434e3632b4 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 8 Sep 2023 16:43:43 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BA=A7=E8=83=BD=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/pdm/service/impl/CapacityTemplateServiceImpl.java  | 2 +-
 .../main/java/org/nl/wms/pdm/wql/QMPS_CAPACITYTEMPLATE01.wql  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/CapacityTemplateServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/CapacityTemplateServiceImpl.java
index 49b61f97..bd534443 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/CapacityTemplateServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/CapacityTemplateServiceImpl.java
@@ -212,7 +212,7 @@ public class CapacityTemplateServiceImpl implements CapacityTemplateService {
             JSONArray ret2 = new JSONArray();
             for(int i = 0;i<ret.size();i++){
                 JSONObject jo_i = ret.getJSONObject(i);
-                double totalproducecapacity_qty = jo_i.getDouble("totalproducecapacity_qty");
+                double totalproducecapacity_qty = jo_i.getDoubleValue("totalproducecapacity_qty");
                 if(totalproducecapacity_qty>0){
                     JSONArray tableData1 = this.getWorklist(jo_i);
                     JSONArray new_tableData1 = new JSONArray();
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QMPS_CAPACITYTEMPLATE01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QMPS_CAPACITYTEMPLATE01.wql
index e7dce8e0..2a209bd3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QMPS_CAPACITYTEMPLATE01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QMPS_CAPACITYTEMPLATE01.wql
@@ -96,13 +96,11 @@
             FROM
                 md_pb_classstandard classstandard
             LEFT JOIN MPS_BD_CapacityTemplateSeries CapacityTemplateSeries ON CapacityTemplateSeries.product_series_id = classstandard.class_id
+            AND CapacityTemplateSeries.captemplate_id = 输入.captemplate_id
             WHERE
                 1 = 1
             AND classstandard.is_leaf = '1'
             AND classstandard.base_data_type = '07'
-            OPTION 输入.captemplate_id <> ""
-                CapacityTemplateSeries.captemplate_id = 输入.captemplate_id
-            ENDOPTION
             order by classstandard.class_code
             ENDSELECT
         ENDQUERY