代码备份

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java

@@ -14,6 +14,7 @@ import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.auth.LoginRequest;
 import com.glxp.sale.admin.req.auth.PCLoginRequest;
 import com.glxp.sale.admin.req.auth.UpdatePasswordRequest;
+import com.glxp.sale.admin.res.auth.LoginResponse;
 import com.glxp.sale.admin.res.auth.LoginUserInfoResponse;
 import com.glxp.sale.admin.service.auth.AuthAdminService;
 import com.glxp.sale.admin.service.auth.AuthLoginService;
@@ -140,8 +141,12 @@ public class LoginController {
         Map<String, Object> map = new HashMap<>();
         map.put("id", authAdmin.getId());
         map.put("token", token);
-
+        LoginResponse loginResponse = new LoginResponse();
-        return ResultVOUtils.success(map);
+        loginResponse.setId(authAdmin.getId() + "");
+        loginResponse.setToken(token);
+        loginResponse.setDept(authAdmin.getDept());
+        loginResponse.setDeptName(authAdmin.getDeptName());
+        return ResultVOUtils.success(loginResponse);
     }
 
 

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -272,6 +272,9 @@ public class UdiRelevanceController {
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
+        if (udiRelevanceResponse.getIsUseDy() == 1) {
+            udiRelevanceEntity.setIsUseDy(true);
+        } else udiRelevanceEntity.setIsUseDy(false);
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         long customerId = customerService.getCustomerId();
         if (customerId != 110) {

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java

@@ -21,6 +21,7 @@ import com.glxp.sale.admin.req.thrsys.FilterThrOrderDetailRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.BussinessOriginTypeResponse;
+import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.res.inout.ErpOrderResponse;
 import com.glxp.sale.admin.service.auth.CustomerService;
 import com.glxp.sale.admin.service.basic.BussinessOriginTypeService;
@@ -386,9 +387,9 @@ public class OrderDetailController {
                             ErpOrderEntity item = new ErpOrderEntity();
                             BeanUtils.copyProperties(erpOrderEntity, item);
                             item.setCode(codeDetaiEntity.getCode());
-                            item.setCount(codeDetaiEntity.getCount());
+                            item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService));
-                            item.setReCount(codeDetaiEntity.getCount());
+                            item.setReCount(erpOrderEntity.getReCount());
-                            item.setErpCount(codeDetaiEntity.getCount());
+                            item.setErpCount(erpOrderEntity.getErpCount());
                             item.setCodeId(codeDetaiEntity.getId().intValue());
                             item.setSerialNo(codeDetaiEntity.getSerialNo());
                             resultList.add(item);
@@ -587,4 +588,21 @@ public class OrderDetailController {
 
         return ResultVOUtils.success("后台已开始校验，请稍后刷新重试！");
     }
+
+
+    public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) {
+        UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
+        if (udiInfoBean != null) {
+            if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
+                if (udiInfoBean.getBhzxxsbzsl() == 0)
+                    return udiInfoBean.getZxxsbzbhsydysl();
+                else
+                    return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
+            } else {
+                return udiInfoBean.getBhzxxsbzsl();
+            }
+        }
+
+        return 1;
+    }
 }

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -858,6 +858,7 @@ public class WareHouseController {
                 orderSaveRequest.setInvWarehouseCode(addOrderRequest.getInvWarehouseCode());
                 orderSaveRequest.setFromSubInvCode(addOrderRequest.getFromSubInvCode());
                 orderSaveRequest.setCustomerId(customerId + "");
+                orderSaveRequest.setDeptCode(addOrderRequest.getDeptCode());
                 orderService.insertOrder(orderSaveRequest);
             }
 

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java

@@ -64,5 +64,7 @@ public class OrderEntity {
     private String billTypeName;
     private String subInvName;
     private String invName;
+    private String deptCode;
+    private String deptName;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java

@@ -34,4 +34,5 @@ public class AddOrderRequest {
     private String produceDate;
     private String expireDate;
     private String serialNo;
+    private String deptCode;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginResponse.java

@@ -0,0 +1,15 @@
+package com.glxp.sale.admin.res.auth;
+
+import lombok.Data;
+
+@Data
+public class LoginResponse {
+
+    private String id;
+    private String token;
+
+
+    private String dept;
+    private String deptName;
+
+}

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -34,7 +34,7 @@
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
                              outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode,
-                             fromSubInvCode, createTime)
+                             fromSubInvCode, createTime, deptCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -54,7 +54,7 @@
                 #{stockCheckFk},
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
                 #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
-                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime})
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}, #{deptCode})
     </insert>
 
 
@@ -65,7 +65,7 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime,deptCode)
         values (
         #{id},
         #{action},
@@ -99,7 +99,8 @@
         #{replicateNo},
         #{invWarehouseCode},
         #{fromSubInvCode},
-        #{createTime}
+        #{createTime},
+        #{deptCode}
         )
     </insert>
 
@@ -140,6 +141,7 @@
             <if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo},</if>
             <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
+            <if test="deptCode != null and deptCode != ''">deptCode=#{deptCode},</if>
 
         </trim>
         WHERE id = #{id}
@@ -191,13 +193,15 @@
     </update>
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
-        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name billTypeName FROM
+        SELECT io_order.* ,inv_warehouse.name invName, iws.name subInvName ,basic_bussiness_type.name
+        billTypeName,auth_dept.name deptName FROM
         io_order
         left join basic_bussiness_type on io_order.action = basic_bussiness_type.action
         LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_sub iws ON io_order.invWarehouseCode = iws.`code`
         LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
+        left join auth_dept on io_order.deptCode =auth_dept.code
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
@@ -276,7 +280,7 @@
                 io_order.action in
                 (select basic_bussiness_type.action from inv_bustype_user INNER JOIN basic_bussiness_type on
                 inv_bustype_user.scAction = basic_bussiness_type.action
-                WHERE userId =#{userId} and invWarehouseCode  =#{invWarehouseCode}
+                WHERE userId =#{userId} and invWarehouseCode =#{invWarehouseCode}
                 GROUP BY inv_bustype_user.id)
             </if>
 
@@ -286,11 +290,6 @@
 
     </select>
 
-    <!--    <if test="unionUser != '' and unionUser!=null">-->
-    <!--        and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is-->
-    <!--        null) )-->
-    <!--    </if>-->
-
     <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* ,