三期入库流程修改

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/equipmenCheckNo.vue

@@ -360,7 +360,7 @@ export default {
             this.$api.recursion('JobResponseInTest', params).then(res => {
               this.$utils.showMessageSuccess('保存成功！')
               const subTypeName = this.basicData && this.basicData.subTypeName || ''
-              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem') {
+              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem' || subTypeName === 'InStorageExpireItem') {
                 this.$bus.$emit('refreshBackItem')
               }
               resolve(true)

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/materialCheckNo.vue

@@ -941,7 +941,7 @@ export default {
             this.$api.recursion('JobResponseInTest', params).then(res => {
               this.$utils.showMessageSuccess('保存成功！')
               const subTypeName = this.basicData && this.basicData.subTypeName || ''
-              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem') {
+              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem' || subTypeName === 'InStorageExpireItem') {
                 this.$bus.$emit('refreshBackItem')
               }
               resolve(true)

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/outSourceCheckNo.vue

@@ -330,7 +330,7 @@ export default {
             this.$api.recursion('JobResponseInTest', params).then(res => {
               this.$utils.showMessageSuccess('保存成功！')
               const subTypeName = this.basicData && this.basicData.subTypeName || ''
-              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem') {
+              if (subTypeName === 'InStorageUseBackItem' || subTypeName === 'InStorageOutBackItem' || subTypeName === 'InStorageMatchBackItem' || subTypeName === 'InStoragePurchaseItem' || subTypeName === 'InStorageRecallItem' || subTypeName === 'InStorageExpireItem') {
                 this.$bus.$emit('refreshBackItem')
               }
               resolve(true)

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingProcess_view/index.vue

@@ -102,7 +102,7 @@ export default {
                 },
                 icon: '/icons/o-noc.png',
                 showFun: (row) => {
-                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem') && row.state === 'Check_Result_Maintain'
+                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem' || row.subTypeName === 'InStorageExpireItem') && row.state === 'Check_Result_Maintain'
                 }
               },
               { // 物料检验及入库确认节点展示
@@ -115,7 +115,7 @@ export default {
                 },
                 icon: '/icons/b-inspection.png',
                 showFun: (row) => {
-                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem') && (row.state === 'Material_Check' || row.state === 'In_Confirm')
+                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem' || row.subTypeName === 'InStorageExpireItem') && (row.state === 'Material_Check' || row.state === 'In_Confirm')
                 }
               },
               { // 物料检验阶段及入库确认阶段展示
@@ -125,7 +125,7 @@ export default {
                 },
                 icon: '/icons/o-noc.png',
                 showFun: (row) => {
-                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem') && (row.state === 'In_Confirm' || row.state === 'Material_Check')
+                  return (row.subTypeName === 'InStoragePurchaseItem' || row.subTypeName === 'InStorageRecallItem' || row.subTypeName === 'InStorageExpireItem') && (row.state === 'In_Confirm' || row.state === 'Material_Check')
                 }
               }
             ]
@@ -234,7 +234,7 @@ export default {
           }
         }
       ]
-      if (this.basicData.subTypeName === 'InStoragePurchaseItem' && this.basicData.state === 'In_Confirm') {
+      if ((this.basicData.subTypeName === 'InStoragePurchaseItem' || this.basicData.subTypeName === 'InStorageRecallItem' || this.basicData.subTypeName === 'InStorageExpireItem') && this.basicData.state === 'In_Confirm') {
         return tableConlumn
       } else {
         return tableConlumn.filter(item => item.title !== '库位')

applications/dee-mes/src/privateComponents/components/WarehousingConfirmationConfirm/component/warehouseSelect.vue

@@ -12,7 +12,7 @@
       :loading="tableColumnSelect"
       size="small"
       placeholder="请选择库位"
-      :disabled="!scope.row.isRoot&&scope.row.subTypeName==='InStoragePurchaseItem'"
+      :disabled="!scope.row.isRoot&&(scope.row.subTypeName==='InStoragePurchaseItem'||scope.row.subTypeName==='InStorageRecallItem'||scope.row.subTypeName==='InStorageExpireItem')"
       filterable
       remote
       loading-text="数据正在加载中..."
@@ -131,7 +131,7 @@ export default {
       if (!this.selectVal) this.$utils.showMessageWarning('请选择库位')
       this.$emit('save', this.selectVal)
       // 适配验收入库确认批量签审
-      if (this.scope.row.subTypeName === 'InStorageRecallItem' || this.scope.row.subTypeName === 'InStoragePurchaseItem') {
+      if (this.scope.row.subTypeName === 'InStorageRecallItem' || this.scope.row.subTypeName === 'InStoragePurchaseItem' || this.scope.row.subTypeName === 'InStorageExpireItem') {
         const resValue = this.selectVal
         this.$emit('input', resValue)
         this.setParams(resValue, this.scope.row)