出入库的路由

api/pages/ivt/inboundOther.js

@@ -12,7 +12,7 @@ module.exports = {
     // 前缀
     prefix: 'mdm-server/ivt/inbound_other/',
     otherInboundInsert: 'inbound_insert',
-    otherHandleInbound: 'inbound_handle'
+    inBoundHandle: 'inbound_handle'
   },
 
   routeUrl: {

api/pages/ivt/inboundProcessing.js

@@ -11,7 +11,7 @@ module.exports = {
   inboundProcessingService: {
       // 前缀
       prefix: 'mdm-server/ivt/inbound_purchase/',   
-      purchaseHandleInbound:'inbound_handle'
+      inBoundHandle:'inbound_handle'
   },
 
   routeUrl: {

api/pages/ivt/inboundPurchaseReturn.js

@@ -5,13 +5,13 @@
  *		2.功能描述：入库办理-采购退货入库 （原来销售退货入库改为采购退货入库）
  * 编辑履历：
  *		作者				日期					版本				修改内容
- *		姜永辉		2024-1-19   		1.00		       	新建
+ *		姜永辉		2024-1-19   		1.00		     新建
  *******************************************************************************/
 module.exports = {
   inboundSaleReturnService: {
     // 前缀
     prefix: 'mdm-server/ivt/inbound_purchase_return/',
-    saleReturnHandleInbound: 'inbound_handle'
+    inBoundHandle: 'inbound_handle'
   },
 
   routeUrl: {

api/pages/ivt/inboundSaleReturn.js

@@ -2,7 +2,7 @@
  * Copyright(c) 2024 dongke All rights reserved. / Confidential
  * 类的信息：
  *		1.程序名称：
- *		2.功能描述：销售退货入库
+ *		2.功能描述：销售退货入库--作废240321
  * 编辑履历：
  *		作者				日期					版本				修改内容
  *		姜永辉		  	     2024-1-19       			1.00		       	新建
@@ -11,8 +11,7 @@ module.exports = {
   inboundSaleReturnService: {
       // 前缀
       prefix: 'mdm-server/ivt/inbound_sale_return/',   
-      saleReturnHandleInbound:'inbound_handle'
-
+      inBoundHandle:'inbound_handle'
   },
 
   routeUrl: {

api/pages/ivt/outboundOther.js

@@ -12,6 +12,7 @@ module.exports = {
     // 前缀
     prefix: 'mdm-server/ivt/outbound_other/',
     otheroutBoundInsert: 'outbound_insert', 
+    outBoundHandle:'outbound_handle',
   },
 
   routeUrl: {

api/pages/ivt/outboundPurchaseReturn.js

@@ -2,30 +2,30 @@
  * Copyright(c) 2024 dongke All rights reserved. / Confidential
  * 类的信息：
  *		1.程序名称：
- *		2.功能描述：待办出库-销售退货出库 （原来采购退货出库改为：销售退货出库）
+ *		2.功能描述：待办出库-销售退货出库 --作废240321
  * 编辑履历：
  *		作者				日期					版本				修改内容
  *		姜永辉		 2024-1-19  		1.00		       	新建
  *******************************************************************************/
 module.exports = {
   outboundPurchaseReturnService: {
-      // 前缀
-      prefix: 'mdm-server/ivt/outbound_purchse_return/',   
-      outBoundHandle: 'outbound_handle'
+    // 前缀
+    prefix: 'mdm-server/ivt/outbound_purchse_return/',
+    outBoundHandle: 'outbound_handle'
   },
 
   routeUrl: {
-    outboundPurchaseReturn: {       
-      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail'  },
-      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add'  },
-      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing'  },
-      chooseSupplier: { key: 'chooseSupplier', url: '/package-purchase/pages/purchase-receipt/choose-supplier/choose-supplier'  },
-      chooseStaff: { key: 'chooseStaff', url: '/package-purchase/pages/purchase-receipt/choose-staff/choose-staff'  },
-      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add'  },
-      chooseOrg: { key: 'chooseOrg',url: '/package-purchase/pages/purchase-receipt/choose-org/choose-org' }, 
-      chooseWh: { key: 'chooseWh', url: '/package-basic-data/pages/product-file/warehouse-archives/warehouse-archives'  },
-      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order'  },
-      
+    outboundPurchaseReturn: {
+      detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail' },
+      add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add' },
+      addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing' },
+      chooseSupplier: { key: 'chooseSupplier', url: '/package-purchase/pages/purchase-receipt/choose-supplier/choose-supplier' },
+      chooseStaff: { key: 'chooseStaff', url: '/package-purchase/pages/purchase-receipt/choose-staff/choose-staff' },
+      staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add' },
+      chooseOrg: { key: 'chooseOrg', url: '/package-purchase/pages/purchase-receipt/choose-org/choose-org' },
+      chooseWh: { key: 'chooseWh', url: '/package-basic-data/pages/product-file/warehouse-archives/warehouse-archives' },
+      choosePurchaseOrder: { key: 'choosePurchaseOrder', url: '/package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order' },
+
     }
-  } 
+  }
 };

package-inventory/pages/outbound-processing/detail/detail.js

@@ -60,9 +60,10 @@ Page({
     ],
 
     // 路由
-    routeObjName: 'outboundProcessing',
+    routeObjName: 'outbound',
     outboundOtherService: app.globalData['outboundOtherService'],
-    outboundPurchaseReturnService: app.globalData['outboundPurchaseReturnService'],
+    outboundProcessingService: app.globalData['outboundProcessingService'],
+    outboundSaleReturnService: app.globalData['outboundSaleReturnService'],
     // 主键Id
     primaryKey: 'outId',
   },
@@ -288,11 +289,11 @@ Page({
   saveData() {
     if (this.data.itemData.outStatus == Constants.outStatus.outBounding) {
       if (this.data.item.outType == Constants.outType.sale) {
-        return this.excute(this.data.service, this.data.service.purchaseHandleInbound, this.data.params)
+        return this.excute(this.data.outboundProcessingService, this.data.outboundProcessingService.outBoundHandle, this.data.params)
       } else if (this.data.item.outType == Constants.outType.other) {
-        return this.excute(this.data.outboundOtherService, this.data.outboundOtherService.otherHandleInbound, this.data.params)
+        return this.excute(this.data.outboundOtherService, this.data.outboundOtherService.outBoundHandle, this.data.params)
       } else {
-        return this.excute(this.data.inboundSaleReturnService, this.data.inboundSaleReturnService.saleReturnHandleInbound, this.data.params)
+        return this.excute(this.data.outboundSaleReturnService, this.data.outboundSaleReturnService.outBoundHandle, this.data.params)
       }
     } else {
       wx.navigateBack({

package-inventory/pages/outbound-processing/outbound-processing.js

@@ -176,7 +176,7 @@ Page({
     btnFormData: null, 
 
     // 路由
-    routeObjName: 'outboundProcessing',
+    routeObjName: 'outbound',
     active: 0,
     // 主键Id
     primaryKey: 'outId',

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -63,7 +63,7 @@ Page({
         routeObjName: 'inbound',
         inboundProcessingService: app.globalData['inboundProcessingService'],
         inboundOtherService: app.globalData['inboundOtherService'],
-        inboundSaleReturnService: app.globalData['inboundSaleReturnService'],
+        inboundPurchaserReturnService: app.globalData['inboundPurchaserReturnService'],
         // 主键Id
         primaryKey: 'intoId',
     },
@@ -290,11 +290,11 @@ Page({
         console.log("this.data.formType", this.data.formType, this.data.item);
         if (this.data.itemData.intoStatus == Constants.intoStatus.inBounding) {
             if (this.data.item.intoType == Constants.intoType.pur) {
-                return this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.purchaseHandleInbound, this.data.params)
+                return this.excute(this.data.inboundProcessingService, this.data.inboundProcessingService.inBoundHandle, this.data.params)
             } else if (this.data.item.intoType == Constants.intoType.other) {
-                return this.excute(this.data.inboundOtherService, this.data.inboundOtherService.otherHandleInbound, this.data.params)
+                return this.excute(this.data.inboundOtherService, this.data.inboundOtherService.inBoundHandle, this.data.params)
             } else {
-                return this.excute(this.data.inboundSaleReturnService, this.data.inboundSaleReturnService.saleReturnHandleInbound, this.data.params)
+                return this.excute(this.data.inboundPurchaserReturnService, this.data.inboundPurchaserReturnService.inBoundHandle, this.data.params)
             }
         } else {
             wx.navigateBack({