Merge branch 'dev' of http://192.168.1.89:3000/hanst/wms-pda

src/views/modules/other-transaction/inventory-move.vue

@@ -318,6 +318,7 @@ export default {
 
       const params = {
         site: this.site,
+        fuSite: localStorage.getItem('site'),
         moveReason: this.moveForm.moveReason,
         targetLocationId: this.moveForm.targetLocationId,
         handlingUnitIds: handlingUnitIds,
@@ -362,7 +363,7 @@ export default {
 
       // 清空扫描框
       this.scanCode = '';
-
+      this.site = '';
       // 重置为添加模式
       this.isRemoveMode = false;
 

src/views/modules/other-transaction/other-inbound.vue

@@ -145,7 +145,7 @@ export default {
         targetLocationId: ''
       },
       scannedItems: [],
-      site: localStorage.getItem('site'),
+      site: '',
       loading: false // 加载状态
     };
   },
@@ -322,6 +322,7 @@ export default {
 
       const params = {
         site: this.site,
+        fuSite: localStorage.getItem('site'),
         inboundReason: this.inboundForm.inboundReason,
         targetLocationId: this.inboundForm.targetLocationId,
         handlingUnitIds: handlingUnitIds,
@@ -382,6 +383,7 @@ export default {
     // 清空表单数据
     clearFormData() {
       this.scanCode = '';
+      this.site = '';
       this.isRemoveMode = false;
       this.inboundForm = {
         inboundReason: '',

src/views/modules/production-inbound/inboundRegister.vue

@@ -721,6 +721,7 @@ export default {
       const submitData = {
         // 基本字段
         site: item.contract,
+        fuSite: localStorage.getItem('site'),
         warehouseId: this.warehouseId,
         orderNo: item.orderNo,
         releaseNo: item.releaseNo,

src/views/modules/recv/qualifiedStorage.vue

@@ -556,6 +556,7 @@ export default {
 
       const params = {
         site: this.selectedReceipt.contract,
+        fuSite: localStorage.getItem('site'),
         receiptSequence: this.selectedReceipt.receiptSequence,
         sourceRef1: this.selectedReceipt.sourceRef1,
         sourceRef2: this.selectedReceipt.sourceRef2,

src/views/modules/recv/recv.vue

@@ -266,7 +266,10 @@ export default {
           const sourceRows = data.rows || [];
           const authorizedSubSiteCodeList = getAuthorizedSubSiteCodeList(this.$store.state.user.subSiteCodeList);
           // 接口按site前缀查询会返回同前缀下的所有子site，这里按当前用户授权子site做二次过滤
-          this.poList = filterRowsByAuthorizedSubSite(sourceRows, authorizedSubSiteCodeList, ['contract']);
+          this.poList = filterRowsByAuthorizedSubSite(sourceRows, authorizedSubSiteCodeList, ['site']);
+          if (this.poList.length === 0) {
+            this.$message.warning('未找到匹配的采购订单或您没有权限查看');
+          }
         } else {
           this.$message.error(data.msg || '操作失败');
         }
@@ -544,7 +547,8 @@ export default {
       // 构建符合服务端TransDetailDto结构的数据
       const receiveData = {
         // 基本字段
-        site: item.contract,
+        site: item.site,
+        fuSite: localStorage.getItem('site'),
         warehouseId: this.warehouseId,
         partNo: item.partNo,
         partDesc: item.description,