采购入库及返厂入库接收仓库接口修改

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue

@@ -6,7 +6,7 @@
 */
 <template>
   <div class="storageDetails-create">
-    <dee-dialog :dialog-visible="dialogVisibleDetails" title="采购入库申请创建" width="90%" @handleClose="handleClose">
+    <dee-dialog :dialog-visible="dialogVisibleDetails" title="返厂入库明细编辑" width="90%" @handleClose="handleClose">
       <dee-form
         ref="form"
         :form="form"
@@ -28,7 +28,7 @@
 import { post } from '@/utils/http'
 
 export default {
-  componentName: '采购入库申请创建',
+  // componentName: '采购入库申请创建',
   name: 'StorageDetailsCreate', // name写在组件的最前方,自定义组件为必填
   components: {},
   props: {
@@ -230,6 +230,13 @@ export default {
             message: '请填写表单信息',
             trigger: ['blur', 'change']
           }
+        ],
+        storageZone: [
+          {
+            required: true,
+            message: '请填写表单信息',
+            trigger: ['blur', 'change']
+          }
         ]
         // purchaseAmount: [{ required: true, message: '请填写表单信息', trigger: ['blur', 'change'] }],
       },
@@ -1772,17 +1779,19 @@ export default {
     },
     // 默认带出接收仓库
     defaultStorage() {
-      post(
-        `/ExtDxProductWorkCenter/search`,
-        {
+      const params = {
         'pageFrom': 1,
         'pageSize': 9999,
         'searchItems': {
           'children': [
             {
-                'items': [
+              'items': [{
+                'fieldName': 'targetId',
+                'operator': 'EQ',
+                'value': this.basicData.materialTypeId || ''
+              },
               {
-                    'fieldName': 'extDxProductArea.id',
+                'fieldName': 'source.extDxProductAreaId',
                 'operator': 'EQ',
                 'value': this.basicData.extDxProductAreaId || ''
               }
@@ -1790,27 +1799,21 @@ export default {
               'operator': 'AND'
             }
           ],
-            'items': []
+          'items': [],
+          'operator': 'AND'
         },
-          'openProps': [],
-          'sortItem': [
-            {
-              'fieldName': 'modifyTime',
-              'sortOrder': 'desc'
+        'openProps': [{ 'name': 'source' }]
+
       }
-          ]
-        },
-      )
+      post(`ExtCenterResourceTypeLink/search`, params)
         .then((res) => {
-          this.form.storageZone =
-            res.items && res.items.content.length ? res.items.content[0].id : ''
           const STORAGE = this.formFileds[0].data.find(
             (item) => item.key === 'storageZone'
           )
           STORAGE.component.options = res.items.content.map((item) => {
             return {
-              label: item.extname,
-              value: item.id
+              label: item.source && item.source.extname,
+              value: item.source && item.source.id
             }
           })
         })

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue

@@ -230,6 +230,13 @@ export default {
             message: '请填写表单信息',
             trigger: ['blur', 'change']
           }
+        ],
+        storageZone: [
+          {
+            required: true,
+            message: '请填写表单信息',
+            trigger: ['blur', 'change']
+          }
         ]
         // purchaseAmount: [{ required: true, message: '请填写表单信息', trigger: ['blur', 'change'] }],
       },
@@ -1769,17 +1776,19 @@ export default {
     },
     // 默认带出接收仓库
     defaultStorage() {
-      post(
-        `/ExtDxProductWorkCenter/search`,
-        {
+      const params = {
         'pageFrom': 1,
         'pageSize': 9999,
         'searchItems': {
           'children': [
             {
-                'items': [
+              'items': [{
+                'fieldName': 'targetId',
+                'operator': 'EQ',
+                'value': this.basicData.materialTypeId || ''
+              },
               {
-                    'fieldName': 'extDxProductArea.id',
+                'fieldName': 'source.extDxProductAreaId',
                 'operator': 'EQ',
                 'value': this.basicData.extDxProductAreaId || ''
               }
@@ -1787,27 +1796,21 @@ export default {
               'operator': 'AND'
             }
           ],
-            'items': []
+          'items': [],
+          'operator': 'AND'
         },
-          'openProps': [],
-          'sortItem': [
-            {
-              'fieldName': 'modifyTime',
-              'sortOrder': 'desc'
+        'openProps': [{ 'name': 'source' }]
+
       }
-          ]
-        },
-      )
+      post(`ExtCenterResourceTypeLink/search`, params)
         .then((res) => {
-          this.form.storageZone =
-            res.items && res.items.content.length ? res.items.content[0].id : ''
           const STORAGE = this.formFileds[0].data.find(
             (item) => item.key === 'storageZone'
           )
           STORAGE.component.options = res.items.content.map((item) => {
             return {
-              label: item.extname,
-              value: item.id
+              label: item.source && item.source.extname,
+              value: item.source && item.source.id
             }
           })
         })