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

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

@@ -86,7 +86,7 @@
                       <span class="pending-value">{{ formatTime(pending.updateTime) }}</span>
                     </div>
                   </div>
-                  <coil-selector @select="selectCoil($event, index)">
+                  <coil-selector @select="selectCoil($event, index)" :filters="{ exclusiveStatus: 0 }">
                     <div class="pending-coil-item">
                       选择其他钢卷
                     </div>
@@ -510,7 +510,7 @@ export default {
     renderPendingMergeList() {
       // 从pendingMergeList中筛选出不好含在sourceCoils中的,通过enterCoilNo
       if (this.pendingMergeList.length > 0) {
-        return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.enterCoilNo === pending.enterCoilNo))
+        return this.pendingMergeList.filter(pending => !this.sourceCoils.some(source => source.actionId === pending.actionId))
       }
       return [];
     },

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

@@ -660,6 +660,15 @@ export default {
 
       this.$set(row, 'picking', true)
 
+      let lockValue = undefined;
+      if (this.acidRollingActionType == 11) {
+        lockValue = 3
+      } else if (this.acidRollingActionType == 120) {
+        lockValue = 4
+      } else if (this.acidRollingActionType >= 200 && this.acidRollingActionType <= 299) {
+        lockValue = 5
+      }
+
       const pendingData = {
         coilId: row.coilId,
         currentCoilNo: row.currentCoilNo,
@@ -668,7 +677,8 @@ export default {
         sourceType: 'manual', // 手动创建
         warehouseId: row.warehouseId,
         priority: 0, // 默认普通优先级
-        remark: `PC端领料创建-${this.label}`
+        remark: `PC端领料创建-${this.label}`,
+        lockValue
       }
 
       this.$modal.confirm(`是否确认从${row.warehouseName || '仓库'}领料${row.currentCoilNo || '物料'}？`).then(() => {