From d9578b597ff7ed97ebabef9e8bf61eeaae2918f6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 16 Dec 2022 17:32:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/auth/AuthAdminController.java   |  8 ++++----
 .../thrsys/ThrOrderReceiveController.java      | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java
index d490537d..c3a2e36d 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthAdminController.java
@@ -13,10 +13,7 @@ import com.glxp.api.admin.req.auth.AuthAdminSaveRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.auth.AuthAdminResponse;
 import com.glxp.api.admin.res.auth.AuthAdminRoleResponse;
-import com.glxp.api.admin.service.auth.AuthAdminService;
-import com.glxp.api.admin.service.auth.AuthRoleAdminService;
-import com.glxp.api.admin.service.auth.AuthRoleService;
-import com.glxp.api.admin.service.auth.DeptService;
+import com.glxp.api.admin.service.auth.*;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.util.GennerOrderUtils;
 import com.glxp.api.admin.util.PasswordUtils;
@@ -52,6 +49,8 @@ public class AuthAdminController {
     private InvSubWarehouseService invSubWarehouseService;
     @Resource
     private DeptService deptService;
+    @Resource
+    private CustomerService customerService;
 
     /**
      * 获取管理员列表
@@ -158,6 +157,7 @@ public class AuthAdminController {
         }
 
         authAdmin.setLastModifyTime(new Date());
+        authAdmin.setCustomerId(customerService.getUserBean().getCustomerId());
 
         authAdmin.setId(gennerOrderUtils.getRelId());
         boolean b = authAdminService.insertAuthAdmin(authAdmin);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java
index c05aa2e1..e98caa44 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderReceiveController.java
@@ -55,21 +55,21 @@ public class ThrOrderReceiveController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         Integer userId = customerService.getUserId();
-        ThrOrderEntity stockOrderEntity = new ThrOrderEntity();
-        BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
-        stockOrderEntity.setCreateUser(userId + "");
-        stockOrderEntity.setType(1);//领用单据
-        stockOrderEntity.setUpdateTime(new Date());
-        stockOrderEntity.setBilldate(DateUtil.parse(stockOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString());
+        ThrOrderEntity thrOrderEntity = new ThrOrderEntity();
+        BeanUtils.copyProperties(stockOrderPostRequest, thrOrderEntity);
+        thrOrderEntity.setCreateUser(userId + "");
+        thrOrderEntity.setType(1);//领用单据
+        thrOrderEntity.setUpdateTime(new Date());
+        thrOrderEntity.setBilldate(DateUtil.parse(thrOrderEntity.getBilldate(), DatePattern.NORM_DATETIME_PATTERN).toString());
         String orderNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.LIN_YONG, "yyyyMMdd"));
-        stockOrderEntity.setBillNo(orderNo);
-        thrOrderService.insertThrOrder(stockOrderEntity);
+        thrOrderEntity.setBillNo(orderNo);
+        thrOrderService.insertThrOrder(thrOrderEntity);
         if (stockOrderPostRequest.getSubErpOrders() != null) {
             List<StockOrderDetailEntity> stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders();
             for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
                 ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity();
                 BeanUtils.copyProperties(stockOrderDetailEntity, thrOrderDetailEntity);
-                thrOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId() + "");
+                thrOrderDetailEntity.setOrderIdFk(thrOrderEntity.getId() + "");
                 thrOrderDetailEntity.setReCount(
                         stockOrderDetailEntity.getReCount());
                 thrOrderDetailEntity.setCount(