From c19fee09096fc251eaee14ab5600bf92a82bb825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Mon, 12 Jan 2026 13:54:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8C=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复delivery.vue导出时缺少状态参数的问题
修正product/index.vue和rawMaterial/index.vue中productCode生成逻辑
放宽ship.vue中钢卷质量状态的校验范围
为ActualWarehouseSelect组件添加空库位筛选功能
---
 .../KLPService/ActualWarehouseSelect/index.vue   | 16 ++++++++++++++++
 klp-ui/src/views/wms/coil/do/ship.vue            |  7 +++++--
 klp-ui/src/views/wms/product/index.vue           |  2 +-
 klp-ui/src/views/wms/rawMaterial/index.vue       |  6 ++++--
 klp-ui/src/views/wms/report/delivery.vue         |  3 ++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue b/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
index fb8fcf5a..a2eea4be 100644
--- a/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ActualWarehouseSelect/index.vue
@@ -53,6 +53,11 @@ export default {
     size: {
       type: String,
       default: 'small'
+    },
+    // 展示空库位筛选条件
+    showEmpty: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -129,6 +134,17 @@ export default {
           return nodeData;
         });
 
+        if (this.showEmpty && level === 0) {
+          list.unshift({
+            value: '-1',
+            label: '空库位',
+            leaf: true,
+            disabled: false,
+            raw: {},
+            level: 1
+          });
+        }
+
         resolve(list);
       }).catch(err => {
         console.error('加载仓库树失败：', err);
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index 0d5ef89b..3c30dd9a 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -316,8 +316,11 @@ export default {
         return;
       }
       // 判断钢卷的质量状态，必须是A+, A，A-, B+其中之一
-      if (!['A+', 'A', 'A-', 'B+'].includes(this.form.qualityStatus)) {
-        this.$message.warning('钢卷质量状态需在B+及以上');
+      if (!['A+', 'A', 'A-', 'B+', 'B', 'B-'].includes(this.form.qualityStatus)
+         && !(this.form.qualityStatus == null 
+         || this.form.qualityStatus == ''
+         || this.form.qualityStatus == undefined)) {
+        this.$message.warning('钢卷质量状态需在B-及以上');
         return;
       }
       this.$refs["form"].validate(valid => {
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index dc294bd8..b77c0041 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -332,7 +332,7 @@ export default {
           } else {
             addProductWithBom({
               ...this.form,
-              productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
+              productCode: this.form.material + (this.form.zincLayer || '') + new Date().getTime(),
             }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index 7415ff20..2dca8628 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -369,7 +369,6 @@ export default {
           if (this.form.rawMaterialId != null) {
             updateRawMaterial({
               ...this.form,
-              productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
             }).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -379,7 +378,10 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            addRawMaterialWithBom(this.form).then(response => {
+            addRawMaterialWithBom({
+              ...this.form,
+              rawMaterialCode: this.form.material + (this.form.zincLayer || '') + new Date().getTime(),
+            }).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/klp-ui/src/views/wms/report/delivery.vue b/klp-ui/src/views/wms/report/delivery.vue
index e6957d7d..dc4ded47 100644
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -168,7 +168,8 @@ export default {
     // 导出
     exportData() {
       this.download('wms/materialCoil/export', {
-        coilIds: this.list.map(item => item.coilId).join(',')
+        coilIds: this.list.map(item => item.coilId).join(','),
+        status: 1
       }, `materialCoil_${new Date().getTime()}.xlsx`)
     },
   },