diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index 3074734..f06131c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/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 map = new HashMap<>(); map.put("id", authAdmin.getId()); map.put("token", token); - - return ResultVOUtils.success(map); + LoginResponse loginResponse = new LoginResponse(); + loginResponse.setId(authAdmin.getId() + ""); + loginResponse.setToken(token); + loginResponse.setDept(authAdmin.getDept()); + loginResponse.setDeptName(authAdmin.getDeptName()); + return ResultVOUtils.success(loginResponse); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 873eb51..90949b6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/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) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java index 3bee39a..1ebdbe8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderDetailController.java +++ b/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.setReCount(codeDetaiEntity.getCount()); - item.setErpCount(codeDetaiEntity.getCount()); + item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService)); + item.setReCount(erpOrderEntity.getReCount()); + 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; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 0148cf2..1a47902 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/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); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index a41780d..b18e041 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java index e08ae79..4fa0842 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java +++ b/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; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginResponse.java new file mode 100644 index 0000000..9ba6058 --- /dev/null +++ b/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; + +} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index de78356..a955e46 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/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}) @@ -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} ) @@ -140,6 +141,7 @@ replicateNo=#{replicateNo}, fromSubInvCode=#{fromSubInvCode}, createTime=#{createTime}, + deptCode=#{deptCode}, WHERE id = #{id} @@ -191,13 +193,15 @@ - - - - -