From 515e3c6355157774471a90800a535ecd595e52ae Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Thu, 4 Jul 2024 16:20:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scm/WarehousingNotificationMapper.xml     |  2 ++
 .../saleCenter/saleOutBoundNotice/form.vue    | 34 +++++++++++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingNotificationMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingNotificationMapper.xml
index 1b781a11..096ddede 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingNotificationMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingNotificationMapper.xml
@@ -15,6 +15,8 @@
         <result column="received_quantity" property="receivedQuantity"></result>
         <result column="remaining_stockable_quantity" property="remainingStockableQuantity"></result>
         <result column="notification_storage_number" property="notificationStorageNumber"></result>
+        <result column="ord_ln" property="ordLn"></result>
+        <result column="order_line" property="orderLine"></result>
     </resultMap>
 
     <resultMap id="warehousingNotificationMap" type="jnpf.entity.WarehousingNotificationEntity">
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
index 5e10ec05..5ace1329 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOutBoundNotice/form.vue
@@ -482,6 +482,26 @@
                     </JnpfPopupSelectInnerName>
                   </template>
                 </el-table-column>
+                <el-table-column label="库存数量"
+                  v-if="judgeShow('warehousingproduct-warehousingUnitId')" prop="inventoryNo"
+                  width="120">
+                  <template slot="header">
+                    <span class="required-sign" v-if="
+                        judgeRequired(
+                          'warehousingproductList-warehousingUnitId'
+                        )
+                      ">*</span>库存数量
+                  </template>
+                  <template slot-scope="scope">
+                    <JnpfInput v-model="scope.row.inventoryNo" @change="
+                        changeData(
+                          'warehousingproduct-warehousingUnitId',
+                          scope.$index
+                        )
+                      " placeholder="请输入" :disabled="true" clearable :style="{ width: '100%' }">
+                    </JnpfInput>
+                  </template>
+                </el-table-column>
                 <el-table-column label="出库单位"
                   v-if="judgeShow('warehousingproduct-warehousingUnitId')" prop="warehousingUnitId"
                   width="120">
@@ -933,21 +953,21 @@ export default {
       let idx = index
       for (let i = 0; i < val2.length; i++) {
         if (i == 0) {
-          // this.dataForm.warehousingProductList[idx].storageAreaId = undefined
-          // this.dataForm.warehousingProductList[idx].batchNo = undefined
-          // this.dataForm.warehousingProductList[idx].produceDate = undefined
-          // this.dataForm.warehousingProductList[idx].inventoryNo = undefined
+          this.dataForm.warehousingProductList[idx].storageAreaId = undefined
+          this.dataForm.warehousingProductList[idx].batchNo = undefined
+          this.dataForm.warehousingProductList[idx].produceDate = undefined
+          this.dataForm.warehousingProductList[idx].inventoryNo = undefined
           this.dataForm.warehousingProductList[idx].storageAreaId = val2[0].cargoId
           this.dataForm.warehousingProductList[idx].batchNo = val2[0].batch_number
           this.dataForm.warehousingProductList[idx].produceDate = val2[0].produce_date
-          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
+          this.dataForm.warehousingProductList[idx].inventoryNo = val2[0].inventory_number
         } else {
           let item = JSON.parse(JSON.stringify(this.dataForm.warehousingProductList[index]))
           this.createwarehousingproductList(item)
           this.dataForm.warehousingProductList[idx].storageAreaId = val2[i].cargoId
           this.dataForm.warehousingProductList[idx].batchNo = val2[i].batch_number
           this.dataForm.warehousingProductList[idx].produceDate = val2[i].produce_date
-          // this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
+          this.dataForm.warehousingProductList[idx].inventoryNo = val2[i].inventory_number
         }
         idx++
       }
@@ -1102,7 +1122,7 @@ export default {
         }
         if (!e.notificationStorageNumber) {
           this.$message({
-            message: '通知出库数量',
+            message: '通知出库数量不能为空',
             type: 'error',
             duration: 1000
           });