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 c3a2e36d..dd5e6e27 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 @@ -14,6 +14,7 @@ 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.*; +import com.glxp.api.admin.service.inout.WarehouseUserService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.util.GennerOrderUtils; import com.glxp.api.admin.util.PasswordUtils; @@ -52,6 +53,11 @@ public class AuthAdminController { @Resource private CustomerService customerService; + @Resource + private WarehouseUserService warehouseUserService; + + + /** * 获取管理员列表 */ @@ -267,14 +273,16 @@ public class AuthAdminController { if (authAdminSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "参数错误！"); } - + // 先得到要删除角色的 getLocSubInvCode + AuthAdmin byId = authAdminService.findById(authAdminSaveRequest.getId()); boolean b = authAdminService.deleteById(authAdminSaveRequest.getId()); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } + // 先删除之前的角色 authRoleAdminService.deleteByAdminId(authAdminSaveRequest.getId()); - + warehouseUserService.deleteByCodeAndId(authAdminSaveRequest.getId(),byId.getLocSubInvCode()); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index b06e59cc..70e1ce78 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -237,17 +237,6 @@ public class OrderController { Integer userId = customerService.getUserId(); orderFilterRequest.setFromCorpId(null); orderFilterRequest.setUserId(userId); - if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - filterInvUserRequest.setIsDirector(true); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - } else { - return ResultVOUtils.error(500, "请先选择当前仓库"); - } - if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -441,8 +430,6 @@ public class OrderController { } else { supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 } - - supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 @@ -478,13 +465,10 @@ public class OrderController { } ); //更新数据 - try { - orderDao.insertOrder(supplementOrder); - orderEntity.setUllageSupNo(supplementOrder.getId()); - orderDao.updateOrder(orderEntity); - codesTempDao.insertCodesTemp(supplementCodes); - } catch (Exception e) { - } + orderDao.insertOrder(supplementOrder); + orderEntity.setUllageSupNo(supplementOrder.getId()); + orderDao.updateOrder(orderEntity); + codesTempDao.insertCodesTemp(supplementCodes); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 4a10a8ec..e65a8617 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -1287,7 +1287,7 @@ public class WareHouseController { continue; } } - if (!isExit) { + if (isExit) { filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java index 7a1f8c58..b68c323b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseBussinessTypeDao.java @@ -37,6 +37,8 @@ public interface WarehouseBussinessTypeDao { void deleteByCode(@Param("code") String code); + + /** * 根据单据类型编码查询单据类型列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java index 7720be50..f57841c7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java @@ -8,6 +8,7 @@ import java.util.List; public interface WarehouseUserDao { int deleteByPrimaryKey(Integer id); + int deleteByCodeAndId(@Param("id") Long id,@Param("code") String code); List filterList(FilterInvUserRequest filterInvUserRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 42242e83..81c79011 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -5,6 +5,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.inout.WarehouseUserEntity; import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.api.admin.req.inventory.FilterInvUserRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,6 +50,8 @@ public interface WarehouseUserService { */ void deleteWarehouseUser(Integer id); + void deleteByCodeAndId(Long id, String code); + /** * 查询分仓关联的用户列表 * diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index cc59b404..953bc848 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -308,20 +308,17 @@ public class OrderServiceImpl implements OrderService { } else { supplementOrder.setStatus(ConstantStatus.ORDER_STATUS_ADDITIONAL); //设置状态为补录单据 } - String name = invWarehouseDao.getNameByCode(supplementOrder.getInvStorageCode()); + supplementOrder.setExportStatus(0); //设置导出状态为未导出 supplementOrder.setContrastStatus(0);//设置erp校验状态为未校验 supplementOrder.setReceiveStatus(0); //设置验收状态为未验收 supplementOrder.setCorpOrderId(CustomUtil.getId() + "x"); //修改往来单位及当前库存号 - supplementOrder.setFromCorpId(order.getInvWarehouseCode()); - supplementOrder.setFromCorp(name); + supplementOrder.setFromCorpId(order.getLocStorageCode()); supplementOrder.setFromSubInvCode(order.getInvWarehouseCode()); - supplementOrder.setLocStorageCode(order.getSubInvCode()); - supplementOrder.setSubInvCode(order.getInvStorageCode()); + supplementOrder.setLocStorageCode(order.getFromCorpId()); supplementOrder.setInvWarehouseCode(null); - supplementOrder.setInvStorageCode(order.getSubInvCode()); - + String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { supplementOrder.setInvWarehouseCode(order.getFromSubInvCode()); } else { @@ -331,14 +328,14 @@ public class OrderServiceImpl implements OrderService { } } + + supplementOrder.setFromCorp(name); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); BussinessTypeEntity supplementType = bussinessTypeDao.selectByAction(bussinessTypeEntity.getSupplementOrderType()); supplementOrder.setMainAction(supplementType.getMainAction()); supplementOrder.setAction(supplementType.getAction()); supplementOrder.setErpFk(null); -// String time = DateUtil.getBeforeMinute(supplementOrder.getActDate(), 5); -// supplementOrder.setActDate(time); //复制码表 List codes = codesDao.findByReceiptId(order.getId()); @@ -374,6 +371,7 @@ public class OrderServiceImpl implements OrderService { return ResultVOUtils.success(); } + @Override public List checkSupplementOrder(List stockOrderEntityList) { if (CollUtil.isEmpty(stockOrderEntityList)) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 8cc8f8b6..b5670a16 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -105,6 +105,13 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } } + @Override + public void deleteByCodeAndId(Long id, String code) { + if(null !=id && null !=code){ + warehouseUserDao.deleteByCodeAndId(id,code); + } + } + @Override public List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest) { if (filterInvLinkDataRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java index c72d0934..07460303 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvProductsTrService.java @@ -210,7 +210,7 @@ public class InvProductsTrService { //单据流转 BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findOriginAction(bussinessLocalTypeEntity.getLocalAction()); - if (bussinessChangeTypeEntity != null && bussinessLocalTypeEntity.isChangeEnable()) { + if (bussinessChangeTypeEntity != null) { addUseOutOrder(orderEntity, mInvProductDetailEntities, bussinessChangeTypeEntity); @@ -263,9 +263,12 @@ public class InvProductsTrService { } } else { if (locWarehouseEntity.getLevel() > 1) { + + InvSubWarehouseEntity subWarehouseEntity = invSubWarehouseService.findByInvSubByCode(bussinessChangeTypeEntity.getDefaultSubInv()); for (WarehouseEntity tempEntity : warehouseEntities) { - tempEntity.setFromCorp(bussinessChangeTypeEntity.getDefaultInv()); - tempEntity.setFromCorpId(bussinessChangeTypeEntity.getDefaultSubInv()); + tempEntity.setFromCorp(subWarehouseEntity.getName()); + tempEntity.setFromCorpId(subWarehouseEntity.getParentId()); + tempEntity.setFromSubInvCode(subWarehouseEntity.getCode()); inList.add(tempEntity); } } else { @@ -320,7 +323,7 @@ public class InvProductsTrService { preiInList.add(warehouseEntity); } else if (warehouseEntity.getSerialNo() == null) { //无序列号（多级包装无序列号的已在上一步被排除），补齐数量 int lea = count - invCount; - warehouseEntity.setCount(lea / (actCount)); + warehouseEntity.setCount(lea / (actCount)); // preiInList.add(warehouseEntity); } } diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 8a813a25..49ca51d6 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,8 +1,8 @@ server.port=9992 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=Glxp@6066 +spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml index 3c361699..18559df6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseBussinessTypeDao.xml @@ -25,6 +25,7 @@ delete from inv_warehouse_bussiness_type where id = #{id,jdbcType=INTEGER} + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 90b22a52..28ef981b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -9,10 +9,11 @@ + - id, code, userId, userName, isDirector + id, code, userId, userName, isDirector,locSubInvCode