From 183f66e9b27ad422f2d95a726316a1ba3494b1fd Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Tue, 12 Nov 2024 10:35:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/router/index.js | 57 +++++++++++++++++++++++++++++++----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index 42843b4692..43d0b682c0 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -1477,23 +1477,23 @@ export const constantRoutes = [{
 
   // 调拨(一级站内) -- 编辑
   {
-    path: '/adjustmentFlow/aodjustmentEdit',
+    path: '/allocationFlow/allocationEdit',
     component: () =>
-      import('@/views/workFlow/adjustmentFlow/adjustmentEdit.vue'),
+      import('@/views/workFlow/allocationFlow/allocationEdit.vue'),
     name: 'AdjustmentEdit'
   },
   // 调拨(一级站内)   -- 待办
   {
-    path: '/adjustmentFlow/adjustmentDaiBan',
+    path: '/allocationFlow/allocationDaiBan',
     component: () =>
-      import('@/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue'),
+      import('@/views/workFlow/allocationFlow/allocationDaiBan.vue'),
     name: 'AdjustmentDaiBan'
   },
   // 调拨(一级站内)   -- 已办
   {
-    path: '/adjustmentFlow/adjustmentYiBan',
+    path: '/allocationFlow/allocationYiBan',
     component: () =>
-      import('@/views/workFlow/adjustmentFlow/adjustmentYiBan.vue'),
+      import('@/views/workFlow/allocationFlow/allocationYiBan.vue'),
     name: 'AdjustmentYiBan'
   },
 
@@ -1592,6 +1592,51 @@ export const constantRoutes = [{
     name: 'StocktakingLossYiBan'
   },
 
+  // 旧件盘盈入库 -- 编辑
+  {
+    path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue'),
+    name: 'OldpPartStocktakingSurplusEdit'
+  },
+  // 旧件盘盈入库   -- 待办
+  {
+    path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusDaiBan',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusDaiBan.vue'),
+    name: 'OldpPartStocktakingSurplusDaiBan'
+  },
+  // 旧件盘盈入库   -- 已办
+  {
+    path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusYiBan',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusYiBan.vue'),
+    name: 'OldpPartStocktakingSurplusYiBan'
+  },
+
+
+  // 旧件盘亏出库 -- 编辑
+  {
+    path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue'),
+    name: 'OldpPartStocktakingLossEdit'
+  },
+  // 旧件盘亏出库   -- 待办
+  {
+    path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossDaiBan',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossDaiBan.vue'),
+    name: 'OldpPartStocktakingLossDaiBan'
+  },
+  // 旧件盘亏出库   -- 已办
+  {
+    path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossYiBan',
+    component: () =>
+      import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossYiBan.vue'),
+    name: 'OldpPartStocktakingLossYiBan'
+  },
+
 
 
   // 404 page must be placed at the end !!!

From a742b4387c8d0d5e6193b106f7d6da4e08be7511 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Tue, 12 Nov 2024 10:49:25 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
index 87c55544db..adf35e38e0 100644
--- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
+++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java
@@ -679,6 +679,7 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
             if (StringUtils.isNotBlank(dto.getUseOrgSid())) {
                 crmCustomerTemp.setUseOrgSid(dto.getUseOrgSid());
             }
+            crmCustomerTemp.setCreateBySid(dto.getUserSid());
             save(crmCustomerTemp);
         } else {
             //手机号