Merge remote-tracking branch 'origin/master'

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 !!!

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 {
             //手机号