fix: B2生箔下料

lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_OVENINANDOUT_01.wql

@@ -334,7 +334,7 @@
             OPTION 输入.point_type <> ""
                 p.point_type = 输入.point_type
             ENDOPTION
-            AND p.point_type = '4'
+            AND p.point_type = '4' AND p.point_status = '1'
             AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status < '07'
             AND (t.point_code1 = p.point_code OR t.point_code2 = p.point_code OR t.point_code3 = p.point_code OR t.point_code4 = p.point_code)
             AND t.is_delete = '0')

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue

@@ -158,7 +158,7 @@
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;"/>
+            <el-input v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="生产区域">
             <el-select
@@ -167,7 +167,6 @@
               placeholder="生产区域"
               class="filter-item"
               style="width: 370px;"
-
             >
               <el-option
                 v-for="item in dict.product_area"
@@ -195,7 +194,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="母卷号">
-            <el-input v-model="form.container_name" style="width: 370px;"/>
+            <el-input v-model="form.container_name" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="空轴位状态" prop="empty_point_status">
             <el-select
@@ -214,7 +213,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="空轴编码">
-            <el-input v-model="form.empty_vehicle_code" style="width: 370px;"/>
+            <el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="库存状态" prop="cool_ivt_status">
             <el-select
@@ -260,6 +259,11 @@
             {{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
           </template>
         </el-table-column>
+        <el-table-column prop="point_type" label="所属类型" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.COOL_TYPE[scope.row.point_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="empty_vehicle_code" label="空轴编号" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
         <el-table-column prop="qty_unit_name" label="计量单位" />
@@ -294,7 +298,7 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <Dialog :dialog-show.sync="dialogShow" :open-param="openParam"/>
+    <Dialog :dialog-show.sync="dialogShow" :open-param="openParam" />
   </div>
 </template>
 
@@ -310,7 +314,7 @@ import Dialog from '@/views/wms/pdm/ivt/coolpointivt/Dialog.vue'
 const defaultForm = { ivt_id: null, point_code: null, full_point_code: null, container_name: null, workorder_id: null, full_vehicle_code: null, empty_point_code: null, empty_vehicle_code: null, region_id: null, pcsn: null, ivt_qty: null, qty_unit_id: null, instorage_time: null, product_area: null, point_location: null, sort_seq: null, is_used: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, full_point_status: null, cool_ivt_status: null, empty_point_status: null }
 export default {
   name: 'Inventory',
-  dicts: ['sch_full_point_status', 'sch_empty_point_status', 'sch_cool_ivt_status', 'is_used', 'point_location', 'product_area'],
+  dicts: ['sch_full_point_status', 'sch_empty_point_status', 'sch_cool_ivt_status', 'is_used', 'point_location', 'product_area', 'COOL_TYPE'],
   components: { Dialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

lms/nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue

@@ -91,13 +91,13 @@
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
           <el-form-item label="点位编码" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" disabled/>
+            <el-input v-model="form.point_code" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="满轴位编码">
-            <el-input v-model="form.full_point_code" style="width: 370px;" disabled/>
+            <el-input v-model="form.full_point_code" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="空轴位编码">
-            <el-input v-model="form.empty_point_code" style="width: 370px;" disabled/>
+            <el-input v-model="form.empty_point_code" style="width: 370px;" disabled />
           </el-form-item>
           <el-form-item label="母卷号">
             <el-input v-model="form.container_name" style="width: 370px;" />
@@ -162,6 +162,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="empty_vehicle_code" label="空轴编码" width="120px" show-overflow-tooltip />
+        <el-table-column prop="up_qzzno" label="上气胀轴编码" width="100px" show-overflow-tooltip />
+        <el-table-column prop="down_qzzno" label="下气胀轴编码" width="100px" show-overflow-tooltip />
         <el-table-column prop="ext_code" label="外部编码" width="100px" show-overflow-tooltip />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="point_location" label="位置">