Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/actflow.vue

@@ -194,12 +194,7 @@
     <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="钢卷" prop="coilId">
-          <el-button size="small" @click="showCoilSelector">
+          <coil-selector v-model="form.coilId" :use-trigger="true" @select="handleCoilSelect" />
-            <i class="el-icon-search"></i> 选择钢卷
-          </el-button>
-          <span v-if="form.currentCoilNo" style="margin-left: 10px;">
-            <el-tag type="info">{{ form.currentCoilNo }}</el-tag>
-          </span>
         </el-form-item>
         <el-form-item label="操作类型" prop="actionType">
           <div class="action-type-cards">
@@ -262,12 +257,6 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-    <!-- 钢卷选择器 -->
-    <coil-selector
-      :visible.sync="coilSelectorVisible"
-      @select="handleCoilSelect"
-    />
   </div>
 </template>
 
@@ -284,6 +273,7 @@ import {
 } from '@/api/wms/pendingAction';
 import CoilSelector from '@/components/CoilSelector';
 
+
 export default {
   name: 'CoilActflow',
   dicts: ['action_type'],

klp-ui/src/views/wms/coil/split.vue

@@ -662,6 +662,17 @@ export default {
         }
 
         // 不复制 itemType 和 itemId，让它们由 materialType 自动决定
+        if (item.itemType) {
+          item.itemType = this.motherCoil.itemType;
+        }
+
+        if (item.itemId) {
+          item.itemId = this.motherCoil.itemId;
+        }
+
+        if (item.materialType) {
+          item.materialType = this.motherCoil.materialType;
+        }
       });
 
       // 不再预加载物品列表，改为实时搜索

klp-ui/src/views/wms/coil/typing.vue

@@ -308,9 +308,6 @@ export default {
         warehouseId: [
           { required: true, message: '请选择逻辑库区', trigger: 'change' }
         ],
-        actualWarehouseId: [
-          { required: true, message: '请选择真实库区', trigger: 'change' }
-        ]
       },
       warehouseList: [],
       historySteps: [],
@@ -587,12 +584,13 @@ export default {
 
     // 复制当前信息到更新表单
     copyFromCurrent() {
+      const itemType = this.currentInfo.materialType === '原料' ? 'raw_material' : 'product';
       this.updateForm = {
         currentCoilNo: this.currentInfo.currentCoilNo,
         team: this.currentInfo.team,
         materialType: this.currentInfo.materialType,
         // 不复制 itemType 和 itemId，让它们由 materialType 自动决定
-        itemType: null,
+        itemType,
         itemId: null,
         grossWeight: parseFloat(this.currentInfo.grossWeight) || null,
         netWeight: parseFloat(this.currentInfo.netWeight) || null,