From da54fc67abb6edb0a6f00e6a781664cc2e8b36d9 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Tue, 17 Jun 2025 18:27:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A5=97=E8=BD=B4=E9=80=BB=E8=BE=91SQL?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/BstIvtCutpointivtMapper.xml    |  2 +-
 .../PdmBiSlittingproductionplanMapper.xml     |  2 +-
 .../util/impl/InBoxManageServiceImpl.java     |  4 +-
 lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 56 +++++++++----------
 4 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
index 51f3a1ccb..be5fe4937 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
@@ -131,7 +131,7 @@
         SELECT bc.*
         FROM bst_ivt_cutpointivt bc
                  LEFT JOIN pdm_bi_slittingproductionplan p ON p.qzzno = bc.qzz_no1 OR p.qzzno = bc.qzz_no2
-        WHERE bc.point_type IN ('1', '3') AND bc.point_status = '2'
+        WHERE bc.point_type IN ('1', '3') AND bc.point_status = '2' and p.is_delete = '0'
           AND (IFNULL(bc.qzz_no1,'') <![CDATA[ <> ]]> '' OR IFNULL(bc.qzz_no2,'') <![CDATA[ <> ]]> '')
           AND p.resource_name = #{resource_name} AND IFNULL(p.qzzno, '') <![CDATA[ <> ]]> ''
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
index 36d9f4ee3..b21d6aab8 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml
@@ -64,7 +64,7 @@
             p.qzz_generation
             ) AS combined_data
         ORDER BY
-            start_time
+            start_time,split_group
     </select>
     <select id="getAllHalfPlan" resultType="org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto">
         WITH RankedData AS (
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
index bb0582380..69face4f2 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
@@ -123,14 +123,14 @@ public class InBoxManageServiceImpl implements InBoxManageService {
         }
 
         //查询托盘重量
-        JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicleCode2 + "'").uniqueResult(0);
+        JSONObject vehicle_ext = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0);
         if (ObjectUtil.isEmpty(vehicle_ext)) {
             throw new BadRequestException("未查询到托盘的扩展信息");
         }else {
             //判断托盘重量是否为空或小于等于0
             String qty = vehicle_ext.getString("qty");
             if (StrUtil.isEmpty(qty) || Double.parseDouble(qty) <= 0){
-                throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量！");
+                throw new BadRequestException("托盘【"+whereJson.getString("vehicle_code")+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量！");
             }
         }
 
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index d47c4421f..f03a8cc01 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -236,19 +236,19 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱唯一码" prop="package_box_sn">
-                <el-input v-model="form.package_box_sn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.package_box_sn" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="箱内子卷数量">
-                <el-input v-model="form.quanlity_in_box" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.quanlity_in_box" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱自身重量">
-                <el-input v-model="form.box_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.box_weight" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -260,120 +260,120 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="客户编码" prop="customer_name">
-                <el-input v-model="form.customer_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.customer_name" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="客户名称" prop="customer_description">
-                <el-input v-model="form.customer_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.customer_description" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="产品编码" prop="product_name">
-                <el-input v-model="form.product_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.product_name" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品描述" prop="product_description">
-                <el-input v-model="form.product_description" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.product_description" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="业务日期">
-                <el-input v-model="form.date_of_fg_inbound" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.date_of_fg_inbound" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷号" prop="container_name">
-                <el-input v-model="form.container_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.container_name" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="产品规格(幅宽)" prop="width">
-                <el-input v-model="form.width" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.width" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="产品厚度" prop="thickness">
-                <el-input v-model="form.thickness" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.thickness" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="单位面积质量" prop="mass_per_unit_area">
-                <el-input v-model="form.mass_per_unit_area" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.mass_per_unit_area" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="净重" prop="net_weight">
-                <el-input v-model="form.net_weight" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.net_weight" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="长度" prop="length">
-                <el-input v-model="form.length" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.length" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="制造完成日期" prop="date_of_production">
-                <el-input v-model="form.date_of_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.date_of_production" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="计划外分切的子卷" prop="is_un_plan_production">
-                <el-input v-model="form.is_un_plan_production" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.is_un_plan_production" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷的物性值1">
-                <el-input v-model="form.un_plan_product_property1" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.un_plan_product_property1" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="子卷的物性值2">
-                <el-input v-model="form.un_plan_product_property2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.un_plan_product_property2" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="子卷的物性值3">
-                <el-input v-model="form.un_plan_product_property3" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.un_plan_product_property3" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="木箱料号">
-                <el-input v-model="form.box_type" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.box_type" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="SAP批次" prop="sap_pcsn">
-                <el-input v-model="form.sap_pcsn" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.sap_pcsn" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="是否重打外包装标签">
-                <el-input v-model="form.isreprintpackageboxlabel" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.isreprintpackageboxlabel" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="是否拆包重打子卷标签">
-                <el-input v-model="form.isunpackbox" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.isunpackbox" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -418,33 +418,33 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="销售订单及行号" prop="sale_order_name">
-                <el-input v-model="form.sale_order_name" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.sale_order_name" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="物料主数据厚度" prop="thickness_request">
-                <el-input v-model="form.thickness_request" :disabled="crud.status.edit > 0 && form.status !== '0'" :controls="false" style="width: 300px;" />
+                <el-input v-model="form.thickness_request" :disabled="true" :controls="false" style="width: 300px;" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="要求幅宽" prop="width_standard">
-                <el-input v-model="form.width_standard" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.width_standard" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="保质期">
-                <el-input v-model="form.quality_guaran_period" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 300px;" />
+                <el-input v-model="form.quality_guaran_period" :disabled="true" style="width: 300px;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="备注">
-                <el-input v-model="form.remark" type="textarea" :rows="2" :disabled="crud.status.edit > 0 && form.status !== '0'" style="width: 750px;" />
+                <el-input v-model="form.remark" type="textarea" :rows="2" :disabled="true" style="width: 750px;" />
               </el-form-item>
             </el-col>
           </el-row>