From b36eb1ce2f98562cfcfdd3420a3734e3627e4892 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 23 Jun 2022 09:12:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BA=93=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthAdminController.java | 23 ++++++++++++ .../controller/auth/LoginController.java | 27 ++++++++++++-- .../inventory/InvSubWarehouseController.java | 7 +++- .../inventory/InvWarehouseController.java | 6 +-- .../sale/admin/dao/basic/EntrustReceDao.java | 1 - .../sale/admin/entity/auth/AuthAdmin.java | 2 + .../admin/entity/basic/EntrustReceEntity.java | 3 +- .../admin/req/auth/AuthAdminSaveRequest.java | 4 +- .../req/basic/BussinessTypeFilterRequest.java | 1 + .../req/inout/StockOrderFilterRequest.java | 1 + .../inventory/FilterInvWarehouseRequest.java | 2 +- .../admin/res/auth/LoginUserInfoResponse.java | 5 +++ .../admin/res/basic/EntrustReceRespose.java | 4 ++ .../inventory/InvSubWarehouseService.java | 4 +- .../impl/InvSubWarehouseServiceImpl.java | 12 ++++++ .../mybatis/mapper/auth/AuthAdminDao.xml | 19 ++++++---- .../mybatis/mapper/basic/BussinessTypeDao.xml | 5 +++ .../mybatis/mapper/basic/EntrustReceDao.xml | 13 +++++-- .../mybatis/mapper/inout/OrderDao.xml | 37 +++++++++++++------ .../mybatis/mapper/inout/StockOrderDao.xml | 33 ++++++++++++----- 20 files changed, 164 insertions(+), 45 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java index 9bbf6f4..69057f2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -274,6 +274,29 @@ public class AuthAdminController { return ResultVOUtils.success(); } + + @AuthRuleAnnotation("admin/auth/admin/updateInv") + @PostMapping("/admin/auth/admin/updateInv") + public BaseResponse updateInv(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + if (authAdminSaveRequest.getId() == null) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); + } + AuthAdmin authAdmin = new AuthAdmin(); + BeanUtils.copyProperties(authAdminSaveRequest, authAdmin); + authAdmin.setLastModifyTime(new Date()); + boolean b = authAdminService.updateAuthAdmin(authAdmin); + if (!b) { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + return ResultVOUtils.success(); + } + /** * 删除 * 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 d68fc9d..a7fedc1 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 @@ -8,6 +8,8 @@ import com.glxp.sale.admin.entity.auth.AuthLicense; import com.glxp.sale.admin.entity.auth.CustomerInfoEntity; import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.DeviceKeyEntity; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; +import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.auth.LoginRequest; import com.glxp.sale.admin.req.auth.PCLoginRequest; @@ -18,6 +20,8 @@ import com.glxp.sale.admin.service.auth.AuthLoginService; import com.glxp.sale.admin.service.auth.CustomerInfoService; import com.glxp.sale.admin.service.auth.DeviceKeyService; import com.glxp.sale.admin.service.info.CompanyService; +import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; +import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -219,19 +223,34 @@ public class LoginController { public BaseResponse userInfo(HttpServletRequest request) { String adminId = request.getHeader("ADMIN_ID"); Long id = Long.valueOf(adminId); - AuthAdmin authAdmin = authAdminService.findById(id); - List authRules = authLoginService.listRuleByAdminId(authAdmin.getId()); - LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); loginUserInfoResponse.setAuthRules(authRules); - CompanyEntity companyEntity = companyService.findCompany(loginUserInfoResponse.getCustomerId()); loginUserInfoResponse.setCompanyName(companyEntity.getCompanyName()); + return ResultVOUtils.success(loginUserInfoResponse); + } + @Resource + InvWarehouseService invWarehouseService; + @Resource + InvSubWarehouseService invSubWarehouseService; + + @AuthRuleAnnotation("") + @GetMapping("/admin/auth/login/getInv") + public BaseResponse getInv(HttpServletRequest request) { + String adminId = request.getHeader("ADMIN_ID"); + Long id = Long.valueOf(adminId); + AuthAdmin authAdmin = authAdminService.findById(id); + LoginUserInfoResponse loginUserInfoResponse = new LoginUserInfoResponse(); + BeanUtils.copyProperties(authAdmin, loginUserInfoResponse); + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(authAdmin.getLocInvCode()); + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(authAdmin.getLocSubInvCode()); + loginUserInfoResponse.setLocInvName(invWarehouseEntity.getName()); + loginUserInfoResponse.setLocSubInvName(invSubWarehouseEntity.getName()); return ResultVOUtils.success(loginUserInfoResponse); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 5d103b0..1f574f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -3,6 +3,7 @@ package com.glxp.sale.admin.controller.inventory; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; @@ -11,6 +12,7 @@ import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; +import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.common.enums.ResultEnum; @@ -36,7 +38,8 @@ public class InvSubWarehouseController { InvSubWarehouseService invSubWarehouseService; @Resource InvWarehouseService invWarehouseService; - + @Resource + CustomerService customerService; @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filter") @@ -53,6 +56,8 @@ public class InvSubWarehouseController { // if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } + AuthAdmin authAdmin = customerService.getUserBean(); + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); return ResultVOUtils.success(invSubWarehouseEntities); } 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 a3ccfe4..20e817a 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 @@ -113,7 +113,7 @@ public class InvWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); filterInvWarehouseRequest.setPid(0); filterInvWarehouseRequest.setStatus(1); - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); List mInvWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); return ResultVOUtils.success(mInvWarehouseEntities); } @@ -159,7 +159,7 @@ public class InvWarehouseController { filterInvWarehouseRequest.setPcode("0"); invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); } else { - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); filterInvWarehouseRequest.setPid(0); List mInvWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); Map invWarehouseEntityMap = new HashMap<>(); @@ -191,7 +191,7 @@ public class InvWarehouseController { filterInvWarehouseRequest.setStatus(1); invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); } else { - filterInvWarehouseRequest.setUserId(authAdmin.getId().intValue()); + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); filterInvWarehouseRequest.setPid(0); invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java index bab63ff..998ae41 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/EntrustReceDao.java @@ -16,7 +16,6 @@ public interface EntrustReceDao { List downloadEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); - List filterJoinEntrustRec(BasicEntrustRecRequest basicEntrustRecRequest); boolean insertEntrustRec(EntrustReceEntity ioOrderStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java index 60dffbd..1c0673a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java @@ -27,5 +27,7 @@ public class AuthAdmin { private String comments; private String employeeName; private long CustomerId; + private String locInvCode; + private String locSubInvCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java index 9f4ab04..deaab39 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java @@ -17,5 +17,6 @@ public class EntrustReceEntity { private Date updateTime; private String remark; private boolean finishRece; - + private String entrustSubInv; + private String invWarehouseCode; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java index 9b8001f..3c70ed7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthAdminSaveRequest.java @@ -19,7 +19,6 @@ public class AuthAdminSaveRequest { // 登录密码 private String passWord; // 状态 - @NotNull(message = "请选择状态") private Integer userFlag; private String employeeName; @@ -35,6 +34,7 @@ public class AuthAdminSaveRequest { private String comments; // 角色ids private List roles; - + private String locInvCode; + private String locSubInvCode; private long CustomerId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java index e95b0f0a..d09a39d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java @@ -19,5 +19,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private Integer userId; private String filterAction; private String locInvCode; + private String locSubInvCode; private String lastUpdateTime; } 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 0b8da27..70e196b 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 @@ -30,6 +30,7 @@ public class StockOrderFilterRequest extends ListPageRequest { private String orderIdFk; private BigDecimal totalPrice; private String locStorageCode; + private String invWarehouseCode; 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 9cacebd..cd53545 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 @@ -18,7 +18,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private Date updateTime; private Integer level; private String pcode; - private Integer userId; + private String userId; private String locInvCode; private Integer status; private String lastUpdateTime; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java index b44ba9b..814f512 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java @@ -18,4 +18,9 @@ public class LoginUserInfoResponse { private String companyName; // 权限列表 private List authRules; + private String locInvCode; + private String locSubInvCode; + + private String locInvName; + private String locSubInvName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java index ad88c1c..d84895b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java @@ -22,4 +22,8 @@ public class EntrustReceRespose { private String curInv; private String curInvName; + + private String entrustSubInv; + private String invWarehouseCode; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java index 6f013f6..be3792f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java @@ -15,11 +15,13 @@ public interface InvSubWarehouseService { InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); + + InvSubWarehouseEntity findByInvSubByCode(String code); + boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity); boolean updateInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity); - boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 4e406b3..4be4c05 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.sale.admin.service.inventory.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; @@ -51,6 +52,17 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); } + @Override + public InvSubWarehouseEntity findByInvSubByCode(String code) { + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setCode(code); + List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { + return invSubWarehouseEntities.get(0); + } + return null; + } + @Override public boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity) { return invSubWarehouseDao.insertInvSubWarehouse(invSubWarehouseEntity); diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index e8d8fef..ad84515 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -34,7 +34,7 @@ replace INTO auth_user(id, userName, passWord, lastLoginIp, - lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId) + lastLoginTime, createTime, userFlag, lastModifyTime, employeeName,CustomerId,locInvCode,locSubInvCode) values ( #{id}, #{userName}, @@ -44,7 +44,10 @@ #{createTime}, #{userFlag,jdbcType=INTEGER}, #{lastModifyTime}, - #{employeeName},#{CustomerId} + #{employeeName}, + #{CustomerId}, + #{locInvCode}, + #{locSubInvCode} ) @@ -102,7 +103,8 @@ replace - INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv) + INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, + updateTime, remark,entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode) values ( #{action}, #{entrustInv}, @@ -112,14 +114,15 @@ #{remark}, #{entrustAction}, #{finishRece}, - #{curInv} + #{curInv},#{entrustSubInv},#{invWarehouseCode} ) replace - INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv) + INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark, + entrustAction,finishRece,curInv,entrustSubInv,invWarehouseCode) values ( #{id}, #{action}, @@ -130,7 +133,7 @@ #{remark}, #{entrustAction}, #{finishRece}, - #{curInv} + #{curInv},#{entrustSubInv},#{invWarehouseCode} ) @@ -146,6 +149,8 @@ remark=#{remark}, finishRece=#{finishRece}, entrustAction=#{entrustAction}, + entrustSubInv=#{entrustSubInv}, + invWarehouseCode=#{invWarehouseCode}, WHERE id = #{id} 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 a5bfb34..a6ccef6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -247,17 +247,20 @@ and reviewUser =#{reviewUser} + + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or invWarehouseCode is null) + and ullageSupNo =#{ullageSupNo} - + and inv_warehouse_user.userId =#{userId} - + and locStorageCode =#{locStorageCode} - + and invWarehouseCode =#{invWarehouseCode} @@ -342,6 +345,10 @@ and invWarehouseCode =#{invWarehouseCode} + + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or invWarehouseCode is null) + + group by io_order.id ORDER BY actDate DESC @@ -400,22 +407,26 @@ and customerId =#{customerId} - + and createUser =#{createUser} - + and reviewUser =#{reviewUser} and ullageSupNo =#{ullageSupNo} - + and inv_warehouse_user.userId =#{userId} - + + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or invWarehouseCode is null) + + + and locStorageCode =#{locStorageCode} - + and invWarehouseCode =#{invWarehouseCode} @@ -478,13 +489,17 @@ and ullageSupNo =#{ullageSupNo} - + and inv_warehouse_user.userId =#{userId} - + + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or invWarehouseCode is null) + + + and locStorageCode =#{locStorageCode} - + and invWarehouseCode =#{invWarehouseCode} 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 4ae7228..8a3004b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -29,7 +29,8 @@ insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, thirdSysFk, status, statusInfo, type, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, - totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd,auditTime,updateTime,invWarehouseCode) + totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, + updateTime, invWarehouseCode) values (#{id}, #{billNo}, #{billdate}, @@ -43,7 +44,8 @@ #{type}, #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, - #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd},#{auditTime},#{updateTime},#{invWarehouseCode}) + #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime}, + #{updateTime}, #{invWarehouseCode}) UPDATE stock_order @@ -103,7 +105,7 @@ @@ -257,7 +265,7 @@ stock_order_detail on stock_order.id = stock_order_detail.orderIdFk - LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code` + LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`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` @@ -273,6 +281,13 @@ and stock_order.customerId =#{customerId} + + and invWarehouseCode = #{invWarehouseCode} + + + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or + invWarehouseCode is null) + group by stock_order_detail.id