Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

修复镀锌工序面板中无进行中工序的显示问题，使用动态label替代硬编码
修复currentTab为0时仓库ID未清空的问题
添加纵剪分条工序的仓库选项并更新特殊分割逻辑

klp-ui/src/views/wms/coil/do/correct.vue

@@ -15,6 +15,16 @@
 
           <!-- 搜索栏 -->
           <el-form :model="materialQueryParams" ref="materialQueryForm" size="small" :inline="true" class="query-form">
+            <el-form-item label="钢卷类型" prop="dataType">
+              <el-select v-model="coilType" placeholder="请选择钢卷类型">
+                <el-option label="全部" value="all" />
+                <el-option label="当前钢卷" value="now" />
+                <el-option label="历史钢卷" value="history" />
+                <el-option label="已发货钢卷" value="trans" />
+                <el-option label="未入库钢卷" value="unIn" />
+              </el-select>
+            </el-form-item>
+            
             <el-form-item label="入场钢卷号" prop="enterCoilNo">
               <el-input v-model="materialQueryParams.enterCoilNo" placeholder="请输入入场钢卷号" clearable
                 @keyup.enter.native="handleMaterialQuery" style="width: 150px;" />
@@ -206,9 +216,13 @@
                   style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
                   size="mini" @click="handleRestoreMaterial(item)" :loading="item.cancelling"
                   class="action-btn">回滚</el-button>
+                <el-button v-if="item.dataType == 10 && item.status == 0"
+                  style="position: absolute; bottom: 10px; right: 10px;" type="success" icon="el-icon-refresh"
+                  size="mini" @click="handleForceInMaterial(item)" :loading="item.cancelling"
+                  class="action-btn">强制入库</el-button>
               </div>
 
-              <div class="card-footer" v-if="item.dataType != 10">
+              <div class="card-footer">
                 <el-button type="primary" icon="el-icon-check" size="mini" @click="handleCorrectMaterial(item)"
                   :loading="item.picking" class="action-btn">修正</el-button>
                 <el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(item)"
@@ -414,6 +428,7 @@ export default {
   },
   data() {
     return {
+      coilType: 'all',
       title: '钢卷信息修正',
       // 物料列表相关
       materialLoading: false,
@@ -731,9 +746,39 @@ export default {
         })
       })
     },
+    handleForceInMaterial(row) {
+      this.$modal.confirm('是否要强制入库改钢卷？').then(_ => {
+        const loading = this.$loading({
+          lock: true,
+          text: '处理中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        updateMaterialCoilSimple({
+          ...row,
+          dataType: 1,
+        }).then(_ => {
+          this.$modal.msgSuccess("强制入库成功");
+          this.getMaterialCoil();
+        }).finally(() => {
+          loading.close()
+        })
+      })
+    },
     getMaterialCoil() {
       this.materialLoading = true
-      listMaterialCoil(this.materialQueryParams).then(response => {
+      const payload = { ...this.materialQueryParams }
+      if (this.coilType == 'now') {
+        payload.dataType = 1;
+        payload.status = 0;
+      } else if (this.coilType == 'history') {
+        payload.dataType = 0;
+      } else if (this.coilType == 'trans') {
+        payload.status = 1;
+      } else if (this.coilType == 'unIn') {
+        payload.dataType = 10;
+      }
+      listMaterialCoil(payload).then(response => {
         this.materialCoilList = response.rows || []
         this.materialTotal = response.total || 0
         this.materialLoading = false

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

@@ -54,9 +54,16 @@
               {value: '1988151076996706306', label: '镀铬原料库'}, 
               {value: '1988151132361519105', label: '镀铬成品库'},
             ],
+            '纵剪分条工序': [
+              {value: '', label: '原料库'},
+              {value: '1988150210872930306', label: '酸连轧分条成品'},
+              {value: '1988150800092950529', label: '退火分条成品'},
+              {value: '1988150380649967617', label: '镀锌分条成品'},
+              {value: '1988151027466170370', label: '拉矫分条成品'},
+            ],
           }
 
-          if (this.actionType === '镀锌工序' || this.actionType === '脱脂工序' || this.actionType === '拉矫平整工序' || this.actionType === '双机架工序' || this.actionType === '镀铬工序') {
+          if (this.actionType === '镀锌工序' || this.actionType === '脱脂工序' || this.actionType === '拉矫平整工序' || this.actionType === '双机架工序' || this.actionType === '镀铬工序' || this.actionType === '纵剪分条工序') {
             this.useSpecialSplit = true
           }
           // 从map中获取默认的查询参数

klp-ui/src/views/wms/coil/do/warehousing.vue

@@ -747,11 +747,11 @@ export default {
         }
         delPendingAction(row.actionId).then(response => {
           this.$modal.msgSuccess("删除成功");
-          delCoilWarehouseOperationLogByCoilId({
-            coilId: row.coilId,
-            operationType: 1,
-            inOutType: 1
-          })
+          // delCoilWarehouseOperationLogByCoilId({
+          //  coilId: row.coilId,
+          //  operationType: 1,
+          //  inOutType: 1
+          // })
           this.getList();
         }).finally(() => {
           this.buttonLoading = false;

klp-ui/src/views/wms/coil/panels/do.vue

@@ -306,7 +306,7 @@
             </div>
           </div>
           <div v-else>
-            <el-empty description="暂无进行中的镀锌工序" />
+            <el-empty :description="`暂无进行中的${label}`" />
           </div>
         </div>
 
@@ -642,6 +642,12 @@ export default {
           border: '1px solid blue',
           color: '#fff'
         }
+      } else if (this.acidRollingActionType == 506) {
+        return {
+          backgroundColor: '#2bf',
+          border: '1px solid #2bf',
+          color: '#fff'
+        }
       } else {
         return {}
       }
@@ -671,9 +677,12 @@ export default {
     },
     currentTab: {
       handler(newVal) {
-        if (newVal) {
+        if (newVal && newVal != 0) {
           this.materialQueryParams.warehouseId = newVal
+        } else {
+          this.materialQueryParams.warehouseId = ''
         }
+
         this.getMaterialCoil()
       },
       immediate: true