From f921753024a6e4f8cc3f2d41dcc68d14a16434ea Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 14 Mar 2022 09:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E5=85=B3=E8=81=94=E7=94=A8?= =?UTF-8?q?=E6=88=B7=EF=BC=8C=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF=E7=AD=89?= =?UTF-8?q?=EF=BC=9Bbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BussinessLocalTypeController.java | 26 ++++++ .../basic/BussinessTypeController.java | 26 +++++- .../controller/inout/OrderController.java | 18 ++-- .../inout/OrderDetailController.java | 19 +++-- .../inout/StockOrderController.java | 8 +- .../controller/inout/WareHouseController.java | 17 +++- .../inout/utils/CheckOrderUtils.java | 1 + .../inventory/InvWarehouseController.java | 19 ++++- .../dao/basic/BussinessLocalTypeDao.java | 2 + .../admin/dao/basic/BussinessTypeDao.java | 2 + .../admin/dao/inventory/InvWarehouseDao.java | 2 + .../admin/req/inout/OrderFilterRequest.java | 2 + .../admin/req/inout/PostOrderRequest.java | 1 + .../req/inout/PostUdimsOrderRequest.java | 2 +- .../req/inout/StockOrderFilterRequest.java | 2 + .../inventory/FilterInvWarehouseRequest.java | 2 +- .../admin/service/auth/CustomerService.java | 67 +++++++++++++++ .../basic/BussinessLocalTypeService.java | 2 + .../service/basic/BussinessTypeService.java | 2 + .../impl/BussinessLocalTypeServiceImpl.java | 13 +++ .../basic/impl/BussinessTypeServiceImpl.java | 13 +++ .../inventory/InvWarehouseService.java | 2 + .../impl/InvWarehouseServiceImpl.java | 13 +++ .../admin/thread/IoTransInoutService.java | 5 ++ .../mapper/basic/BussinessLocalTypeDao.xml | 40 +++++++-- .../mybatis/mapper/basic/BussinessTypeDao.xml | 39 +++++++++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 7 +- .../mybatis/mapper/inout/OrderDao.xml | 82 ++++++++++++++++++- .../mybatis/mapper/inout/StockOrderDao.xml | 9 +- .../mybatis/mapper/inout/StockOrderDetail.xml | 2 +- .../mapper/inventory/InvWarehouseDao.xml | 38 +++++++++ 31 files changed, 447 insertions(+), 36 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java index 9051ce3..888d181 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessLocalTypeController.java @@ -76,6 +76,32 @@ public class BussinessLocalTypeController { return ResultVOUtils.success(pageSimpleResponse); } + + @AuthRuleAnnotation("") + @GetMapping("/udiwms/localBusType/filterJoinByUser") + public BaseResponse filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String customerId = getCustomerId(); + if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { + bussinessTypeFilterRequest.setSpUse(true); + } + + List bussinessTypeEntities; + bussinessTypeEntities = bussinessLocalTypeService.filterJoinByUser( + bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") @GetMapping("/udiwms/localBusType/filterByBus") public BaseResponse filterByBus(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java index 55fe84b..7a6feb4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessTypeController.java @@ -91,9 +91,9 @@ public class BussinessTypeController { if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) { BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction()); - if(bussinessLocalTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + if (bussinessLocalTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_OUT); - }else { + } else { bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT); } @@ -111,6 +111,28 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } + @AuthRuleAnnotation("") + @GetMapping("/udiwms/bussinessType/filterAllByUser") + public BaseResponse filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String customerId = getCustomerId(); + if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) { + bussinessTypeFilterRequest.setSpUse(true); + } + List bussinessTypeEntities; + bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("/udiwms/bussinessType/udimsFilter") public BaseResponse udimsFilter(BussinessTypeFilterRequest bussinessTypeFilterRequest, diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 21b5508..5748925 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -7,12 +7,14 @@ import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.Constant; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.inout.*; @@ -62,6 +64,9 @@ public class OrderController { @Value("${file_path}") private String filePath; + @Resource + CustomerService customerService; + @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/getUdi") public BaseResponse getUdi(@RequestParam("code") String code) { @@ -89,9 +94,10 @@ public class OrderController { // orderFilterRequest.setStatusOrOne(ConstantStatus.ORDER_STATUS_TEMP_SAVE); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) + if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { orderFilterRequest.setCustomerId(null); - else { + orderFilterRequest.setUserId(customerService.getUserId()); + } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); if (companyEntity.getUnitIdFk().equals("110")) { orderFilterRequest.setFromCorpId(null); @@ -164,10 +170,9 @@ public class OrderController { BindingResult bindingResult) { if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) + if (orderFilterRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { orderFilterRequest.setCustomerId(null); - else { - + } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); if (companyEntity.getUnitIdFk().equals("110")) { orderFilterRequest.setFromCorpId(null); @@ -249,8 +254,10 @@ public class OrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + AuthAdmin authAdmin = customerService.getUserBean(); OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); orderEntity.setReceiveStatus(1); + orderEntity.setReviewUser(authAdmin.getId().intValue()); orderService.updateOrder(orderEntity); List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); if (erpIds != null && erpIds.size() > 0) { @@ -259,6 +266,7 @@ public class OrderController { stockOrderFilterRequest.setBillNo(id); StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); + stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); stockOrderService.updateById(stockOrderEntity); } 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 5c0c420..19659ec 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 @@ -6,6 +6,7 @@ import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.controller.inout.utils.CheckOrderUtils; import com.glxp.sale.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.sale.admin.controller.inout.utils.DataTransUtil; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; @@ -21,6 +22,7 @@ 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.inout.ErpOrderResponse; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessOriginTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; @@ -99,6 +101,10 @@ public class OrderDetailController { IoTransInoutService ioTransInoutService; @Resource BussinessOriginTypeService bussinessOriginTypeService; + @Resource + CustomerService customerService; + + @AuthRuleAnnotation("") @GetMapping("/spms/erpOrder/filter") public BaseResponse filterSpmsOrder(FilterOrderRequest filterErpOrderRequest, @@ -202,6 +208,7 @@ public class OrderDetailController { return ResultVOUtils.success(pageSimpleResponse); // } } + @AuthRuleAnnotation("") @GetMapping("/udiwms/erpOrder/addStockOrder") public BaseResponse addStockOrder(FilterOrderRequest filterErpOrderRequest, @@ -335,6 +342,7 @@ public class OrderDetailController { return ResultVOUtils.error(500, "删除失败"); } } + @AuthRuleAnnotation("") @GetMapping(value = "/warehouse/inout/order/detail")//TODO 订单详情 public BaseResponse orderDetail(FilterErpOrderRequest filterErpOrderRequest, @@ -350,6 +358,7 @@ public class OrderDetailController { List erpOrderEntities = orderDetailService.filterMyErpOrder(filterErpOrderRequest); return ResultVOUtils.success(erpOrderEntities); } + @AuthRuleAnnotation("") @GetMapping(value = "/warehouse/inout/order/uploadOrder") public BaseResponse uploadOrder(FilterErpOrderRequest filterErpOrderRequest, @@ -445,6 +454,8 @@ public class OrderDetailController { } } if (erpOrderEntities != null && erpOrderEntities.size() > 0) { + + AuthAdmin authAdmin = customerService.getUserBean(); ErpOrderEntity temp = erpOrderEntities.get(0); for (int i = 0; i < erpOrderEntities.size(); i++) { if (!temp.getCompanyname().equals(erpOrderEntities.get(i).getCompanyname())) { @@ -455,6 +466,7 @@ public class OrderDetailController { OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setId(importErpOrderRequest.getOrderId()); OrderEntity orderEntity = orderService.findOne(orderFilterRequest); + orderEntity.setReviewUser(authAdmin.getId().intValue()); ErpOrderEntity exitErp = new ContrastErpUtil().vailErpExit(orderDetailService, erpOrderEntities, importErpOrderRequest.getOrderId()); if (exitErp != null) { String errMsg = "所选ERP单" + exitErp.getErpOrderId() + "已被其他出入库单" + exitErp.getOrderIdFk() + "绑定"; @@ -469,13 +481,6 @@ public class OrderDetailController { List warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); transInoutService.genOrderDetail(warehouseEntityList); checkOrderUtils.check(orderEntity.getId(), erpOrderEntities); -// transInoutService.printOrder(orderEntity.getId()); -// List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); -// orderDetailService.insertErpOrders(returnOrders); -// List warehouseEntityList = codesService.findByReceiptId(importErpOrderRequest.getOrderId()); -// new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, orderDetailService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity); - - } else { return ResultVOUtils.error(500, "ERP订单不能为空"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 0f31af8..cc07d9a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -22,6 +22,7 @@ import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.ErpOrderResponse; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.UdiInfoService; @@ -84,6 +85,8 @@ public class StockOrderController { BasicUnitMaintainService basicUnitMaintainService; @Resource OrderService orderService; + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/order/error") @@ -132,7 +135,7 @@ public class StockOrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - + Integer userId = customerService.getUserId(); boolean noRepeatBillNo = false; boolean newBillNo = false; StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); @@ -156,7 +159,7 @@ public class StockOrderController { StockOrderEntity stockOrderEntity = new StockOrderEntity(); BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); - + stockOrderEntity.setCreateUser(userId); stockOrderEntity.setStatus( StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交 : stockOrderEntity.getStatus()); @@ -274,6 +277,7 @@ public class StockOrderController { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId())); if (companyEntity.getUnitIdFk().equals("110")) { stockOrderFilterRequest.setUnitIdFk(null); + stockOrderFilterRequest.setUserId(customerService.getUserId()); } else stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); stockOrderFilterRequest.setCorpId(null); 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 88604ed..53a4bac 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 @@ -19,6 +19,7 @@ import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.inout.WarehouseResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.info.CompanyService; @@ -71,6 +72,8 @@ public class WareHouseController { private WarehouseUserService warehouseUserService; @Resource private WarehouseBussinessTypeService warehouseBussinessTypeService; + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/list") @@ -287,7 +290,7 @@ public class WareHouseController { orderSaveRequest.setActDate(addOrderRequest.getActDate()); } - + Integer userId = customerService.getUserId(); orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); orderSaveRequest.setAction(bussinessTypeEntity.getAction()); orderSaveRequest.setActor(addOrderRequest.getActor()); @@ -302,6 +305,7 @@ public class WareHouseController { orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); orderSaveRequest.setCustomerId(addOrderRequest.getCustomerId()); + orderSaveRequest.setCreateUser(userId); orderService.insertOrder(orderSaveRequest); } WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest(); @@ -356,7 +360,9 @@ public class WareHouseController { } try { String customerId = getCustomerId(); + Integer userId = customerService.getUserId(); postOrderRequest.setCustomerId(customerId); + postOrderRequest.setUserId(userId); ioTransInoutService.creatOrderWeb(postOrderRequest); } catch (Exception e) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -375,7 +381,9 @@ public class WareHouseController { } try { String customerId = getCustomerId(); + Integer userId = customerService.getUserId(); postOrderRequest.setCustomerId(customerId); + postOrderRequest.setUserId(userId); ioTransInoutService.creatOrder(postOrderRequest); } catch (Exception e) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -392,8 +400,10 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } try { - String customerId = getCustomerIdBykey(); - postOrderRequest.setCustomerId(customerId); + AuthAdmin authAdmin = customerService.getUserBeanByKey(); + + postOrderRequest.setCustomerId(authAdmin.getCustomerId() + ""); + postOrderRequest.setUserId(authAdmin.getId().intValue()); ioTransInoutService.createOrderUdims(postOrderRequest); } catch (Exception e) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -461,6 +471,7 @@ public class WareHouseController { /** * 根据仓位码获取关联用户数据 + * * @param code * @return */ diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java index f1739ea..227fb7a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java @@ -139,6 +139,7 @@ public class CheckOrderUtils { status = getStockOrderStatus(orderEntity, bussinessTypeEntity); stockOrderEntity.setStatus(status); stockOrderEntity.setOrderIdFk(orderId); + stockOrderEntity.setReviewUser(orderEntity.getReviewUser()); stockOrderService.updateById(stockOrderEntity); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index 9753e11..c794656 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.inventory.InvWarehouseExportResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.util.DateUtil; import com.glxp.sale.admin.util.FileUtils; @@ -35,9 +36,12 @@ public class InvWarehouseController { @Resource InvWarehouseService invWarehouseService; + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("spms/inv/warehouse/filter") + public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); List merge = merge(invWarehouseEntities, 0); @@ -55,6 +59,17 @@ public class InvWarehouseController { return ResultVOUtils.success(invWarehouseEntities); } + @AuthRuleAnnotation("") + @GetMapping("spms/inv/warehouse/filterAllByUser") + public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { + Integer userId = customerService.getUserId(); + filterInvWarehouseRequest.setUserId(userId); + filterInvWarehouseRequest.setPid(0); + List invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); + return ResultVOUtils.success(invWarehouseEntities); + } + + public List merge(List invWarehouseEntities, Integer pid) { List invWarehouseResponses = new ArrayList<>(); @@ -90,10 +105,10 @@ public class InvWarehouseController { filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid()); InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest); InvWarehouseEntity pEntity = invWarehouseService.selectById(invWarehouseEntity.getPid() + ""); - if(codeEntity == null){ + if (codeEntity == null) { int code = Integer.parseInt(pEntity.getCode()) * 1000; invWarehouseEntity.setCode(code + ""); - }else { + } else { invWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); } invWarehouseEntity.setAdvanceType(pEntity.getAdvanceType()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java index cb7d9f5..346de35 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessLocalTypeDao.java @@ -14,6 +14,8 @@ public interface BussinessLocalTypeDao { List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java index 8ff7fb8..d65ceee 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java @@ -16,6 +16,8 @@ public interface BussinessTypeDao { List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest); + boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean insertIgnoreBussinessType(BussinessTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java index a394a9d..fdee334 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvWarehouseDao.java @@ -10,6 +10,8 @@ public interface InvWarehouseDao { List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + List filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest); + InvWarehouseEntity selectMaxCode(FilterInvWarehouseRequest filterInvWarehouseRequest); List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java index 8d87a7d..3f9de86 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java @@ -29,4 +29,6 @@ public class OrderFilterRequest extends ListPageRequest { private Integer createUser; private Integer reviewUser; + private Integer userId; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java index 34b0662..598e65a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostOrderRequest.java @@ -11,6 +11,7 @@ public class PostOrderRequest { int submitType;//0：提交，1：保存 String oldOrderId;//保存再编辑后再保存或提交，根据旧id删除旧数据。 private String customerId; + private Integer userId; public List getPostOrder() { return postOrders; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java index 102493c..77f0a5c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/PostUdimsOrderRequest.java @@ -11,6 +11,7 @@ public class PostUdimsOrderRequest { List orderBeans; private String customerId; + private Integer userId; @Data public static class OrderBean { @@ -56,5 +57,4 @@ public class PostUdimsOrderRequest { } - } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java index afa4317..263c1a2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java @@ -32,4 +32,6 @@ public class StockOrderFilterRequest extends ListPageRequest { private String locStorageCode; private Integer createUser; private Integer reviewUser; + private Integer userId; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java index 49a3e04..5dfbd15 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java @@ -15,7 +15,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private Boolean advanceType; private Boolean isDefault; private Date updateTime; - private Integer level; private String pcode; + private Integer userId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java new file mode 100644 index 0000000..fac79e5 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java @@ -0,0 +1,67 @@ +package com.glxp.sale.admin.service.auth; + +import com.glxp.sale.admin.dao.auth.AuthLicenseDao; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.AuthLicense; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.common.enums.ResultEnum; +import org.springframework.stereotype.Service; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@Service +public class CustomerService { + + @Resource + private AuthAdminService authAdminService; + @Resource + private AuthLicenseDao authLicenseDao; + + public AuthAdmin getUserBean() { + Integer userId = getUserId(); + AuthAdmin authAdmin = authAdminService.findById(userId.longValue()); + return authAdmin; + } + + public Integer getUserId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + return Integer.parseInt(userId); + } + + public long getCustomerId() { + AuthAdmin authAdmin = getUserBean(); + return authAdmin.getCustomerId(); + } + + + public long getCustomerIdByKey() { + AuthAdmin authAdmin = getUserBeanByKey(); + return authAdmin.getCustomerId(); + } + + public Integer getUserIdByKey() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("api_key"); + return Integer.parseInt(userId); + } + + + public AuthAdmin getUserBeanByKey() { + Integer userId = getUserIdByKey(); + AuthAdmin authAdmin = authAdminService.findById(userId.longValue()); + return authAdmin; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java index bb186a1..2db320b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessLocalTypeService.java @@ -13,6 +13,8 @@ public interface BussinessLocalTypeService { List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java index c4cfc3a..2bb2b79 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BussinessTypeService.java @@ -13,6 +13,8 @@ public interface BussinessTypeService { List filterJoinList(BussinessTypeFilterRequest bussinessTypeFilterRequest); + List filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest); + BussinessTypeEntity selectById(String id); BussinessTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index f85af09..209a18a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -43,6 +43,19 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService return data; } + @Override + public List filterJoinByUser(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { + if (bussinessTypeFilterRequest == null) { + return Collections.emptyList(); + } + if (bussinessTypeFilterRequest.getPage() != null) { + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + } + List data = bussinessLocalTypeDao.filterJoinByUser(bussinessTypeFilterRequest); + return data; + } + @Override public List filterLeftJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java index 75489b6..a7569ad 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -50,6 +50,19 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { return data; } + @Override + public List filterAllByUser(BussinessTypeFilterRequest bussinessTypeFilterRequest) { + if (bussinessTypeFilterRequest == null) { + return Collections.emptyList(); + } + if (bussinessTypeFilterRequest.getPage() != null) { + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + } + List data = bussinessTypeDao.filterAllByUser(bussinessTypeFilterRequest); + return data; + } + @Override public BussinessTypeEntity selectById(String id) { return bussinessTypeDao.selectById( diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java index 322e201..0a2011b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvWarehouseService.java @@ -14,6 +14,8 @@ public interface InvWarehouseService { List filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); + List filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest); + List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest); boolean insertInvWarehouse(InvWarehouseEntity invWarehouseEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java index 89f9b0c..00de528 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvWarehouseServiceImpl.java @@ -49,6 +49,19 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return data; } + @Override + public List filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { + if (filterInvWarehouseRequest == null) { + return Collections.emptyList(); + } + if (filterInvWarehouseRequest.getPage() != null) { + int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit()); + } + List data = invWarehouseDao.filterAllByUser(filterInvWarehouseRequest); + return data; + } + @Override public List filterGroupInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { if (filterInvWarehouseRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 4c2a99e..713e88a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -126,6 +126,7 @@ public class IoTransInoutService { orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId()); orderSaveRequest.setReceiveStatus(0); + orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); @@ -189,6 +190,7 @@ public class IoTransInoutService { orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setReceiveStatus(0); + orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); @@ -237,6 +239,7 @@ public class IoTransInoutService { orderEntity.setFromType(ConstantStatus.FROM_UDIMS); orderEntity.setReceiveStatus(0); orderEntity.setId(orderId); + orderEntity.setCreateUser(postUdimsOrderRequest.getUserId()); orderEntity.setMainAction(ConstantType.TYPE_PUT); orderEntity.setActDate(DateUtil.getDate()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); @@ -859,6 +862,8 @@ public class IoTransInoutService { stockOrderEntity.setCustomerId(orderEntity.getCustomerId()); stockOrderEntity.setUnitIdFk(orderEntity.getFromCorpId()); stockOrderEntity.setSourceType(ConstantStatus.ST_SCAN_ADD); + stockOrderEntity.setCreateUser(orderEntity.getCreateUser()); + stockOrderEntity.setReviewUser(orderEntity.getReviewUser()); stockOrderEntity.setLocStorageCode(orderEntity.getLocStorageCode()); stockOrderEntity.setCorpId(orderEntity.getFromCorpId()); if (bussinessTypeEntity.isSecCheckEnable()) { diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index bbe586a..a16ba13 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -32,12 +32,42 @@ SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction, basic_bussiness_type.name , - basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable - , + basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable, basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction - FROM basic_bustype_local inner join - basic_bussiness_type - on basic_bustype_local.action = basic_bussiness_type.localAction + FROM basic_bustype_local + inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction + + + AND basic_bustype_local.name LIKE concat(#{name},'%') + + + AND basic_bustype_local.action LIKE concat(#{action},'%') + + + AND basic_bustype_local.enable =#{enabled} + + + AND basic_bussiness_type.enable =#{enabled} + + + AND spUse =#{spUse} + + + + + + + replace diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 50cf6d6..a31be5f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -96,10 +96,13 @@ ON basic_products.uuid = basic_udirel.uuid - AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%') + AND ylqxzcrbarmc LIKE concat('%',#{ylqxzcrbarmc},'%') - AND cpmctymc LIKE concat(#{cpmctymc},'%') + AND cpmctymc LIKE concat('%',#{cpmctymc},'%') + + + AND ggxh LIKE concat('%',#{ggxh},'%') AND nameCode LIKE concat(#{nameCode},'%') 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 53cdada..f6b6eea 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -140,7 +140,8 @@ - SELECT * FROM io_order + SELECT io_order.* FROM io_order + INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code` and id =#{id} @@ -266,15 +270,84 @@ and ullageSupNo =#{ullageSupNo} + + and inv_warehouse_user.userId =#{userId} + ORDER BY actDate DESC + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index f7534a2..8250578 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -7,6 +7,7 @@ resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity"> SELECT * FROM stock_order + INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code` where status = 'success' @@ -15,6 +16,7 @@ select * from stock_order + INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code` where `status` = '101' ORDER BY id DESC @@ -93,7 +95,8 @@ + + +