配套退库申请及配套退库确认联调

applications/dee-mes/src/privateComponents/components/ERP_AddInStorageBackItem/components/ERPAddInStorageBackItemDialog.vue

@@ -99,6 +99,7 @@ export default {
             if (this.selection.subTypeName === 'JobResponseOutStorageMatch') { // 历史配套数据（配套退库使用）
               responseName = 'oldOutStorage'
               scrapCount = -(this.selection.scrapCount)
+              delete this.selection.erpInventory
             } else {
               responseName = 'jobResponseSorting'
             }
@@ -126,7 +127,7 @@ export default {
             'aoPlan': aoNo,
             'mdsItemCode': inventoryData.extMaterial.resCode
           }]
-          data[0][responseName] = this.selection
+          data[0][responseName] = JSON.parse(JSON.stringify(this.selection))
           this.$emit('submitEvent', { formData: data, addContinue })
           addContinue && this.cleanAddForm()
         } else {

applications/dee-task-center/src/views/home/compontents/my-task.vue

@@ -126,8 +126,13 @@ export default {
           appId: 1626782774851
         },
         {
-          taskType: '配套自动退库确认',
-          type: 'ERP_MatchAutoReturnConfirm',
+          taskType: '配套退库申请',
+          type: 'ERP_MatchReturnApply',
+          appId: 1626782774851
+        },
+        {
+          taskType: '配套退库确认',
+          type: 'ERP_MatchReturnConfirm',
           appId: 1626782774851
         },
         {
@@ -230,7 +235,7 @@ export default {
         get(`/indexTask/task/ProdTask`, {}).then(res => {
           this.$set(this.quickAccessList[index], 'taskCount', res.items.count)
         })
-      } else if (item.taskType === '准备工出库调整' || item.taskType === '操作工确认' || item.taskType === '配套自动退库确认') {
+      } else if (item.taskType === '准备工出库调整' || item.taskType === '操作工确认' || item.taskType === '配套退库确认') {
         post(`/ErpSorting/currentUserSortingTaskCount`, {}).then(res => {
           let resKey = ''
           switch (item.taskType) {
@@ -240,7 +245,7 @@ export default {
             case '操作工确认':
               resKey = '操作工任务数量'
               break
-            case '配套自动退库确认':
+            case '配套退库确认':
               resKey = '自动配套退库任务'
               break
             default:
@@ -248,6 +253,30 @@ export default {
           }
           this.$set(this.quickAccessList[index], 'taskCount', res.items[resKey])
         })
+      } else if (item.taskType === '配套退库申请') {
+        post(`/ErpRetirementRequest/searchBackApplyTaskCount`, {
+          'searchItems': {
+            'items': [
+              {
+                'fieldName': 'state',
+                'operator': 'EQ',
+                'value': 'Apply'
+              },
+              {
+                'fieldName': 'subTypeName',
+                'operator': 'EQ',
+                'value': 'MatchStockBackRequest'
+              },
+              {
+                'fieldName': 'creatorId',
+                'operator': 'EQ',
+                'value': localStorage.getItem('userId')
+              }
+            ]
+          }
+        }).then(res => {
+          this.$set(this.quickAccessList[index], 'taskCount', res.items)
+        })
       } else if (item.taskType === '库内退库确认') {
         post(`/ErpRetirementRequest/searchBackTaskCount`, {}).then(res => {
           this.$set(this.quickAccessList[index], 'taskCount', res.items)
@@ -305,7 +334,7 @@ export default {
             }
           })
           this.$store.dispatch('app/closeSideBar', false)
-        } else if (['准备工出库调整', '操作工确认', '配套自动退库确认', '库内退库确认', '领用出库确认', '入库台账确认'].includes(item.taskType)) {
+        } else if (['准备工出库调整', '操作工确认', '配套退库申请', '配套退库确认', '库内退库确认', '领用出库确认', '入库台账确认'].includes(item.taskType)) {
           let pageNo = ''
           switch (item.taskType) {
             case '准备工出库调整':
@@ -314,7 +343,10 @@ export default {
             case '操作工确认':
               pageNo = '038a430e-facf-4fcb-9b98-2bf75c226681'
               break
-            case '配套自动退库确认':
+            case '配套退库申请':
+              pageNo = '4db88bc5-b77d-4020-84fb-01271a75dd3d'
+              break
+            case '配套退库确认':
               pageNo = '102e307a-342e-4786-8a9a-a50465ab1721'
               break
             case '库内退库确认':