diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java index 52fc8c5..9852d26 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthRoleController.java @@ -1,11 +1,13 @@ package com.glxp.sale.admin.controller.auth; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.auth.AuthPermission; import com.glxp.sale.admin.entity.auth.AuthPermissionRule; import com.glxp.sale.admin.entity.auth.AuthRole; +import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; import com.glxp.sale.admin.entity.basic.BasicBussinessTypeRoleEntity; import com.glxp.sale.admin.req.auth.AuthRoleAuthRequest; import com.glxp.sale.admin.req.auth.AuthRoleQueryRequest; @@ -13,9 +15,7 @@ import com.glxp.sale.admin.req.auth.AuthRoleSaveRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.auth.AuthPermissionRuleMergeResponse; import com.glxp.sale.admin.res.auth.AuthRoleResponse; -import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; -import com.glxp.sale.admin.service.auth.AuthPermissionService; -import com.glxp.sale.admin.service.auth.AuthRoleService; +import com.glxp.sale.admin.service.auth.*; import com.glxp.sale.admin.util.PermissionRuleTreeUtils; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; @@ -46,6 +46,8 @@ public class AuthRoleController { @Resource private AuthPermissionService authPermissionService; + @Resource + private AuthRoleAdminService authRoleAdminService; /** * 角色列表 @@ -196,6 +198,10 @@ public class AuthRoleController { return ResultVOUtils.success(); } + + @Resource + CustomerInfoService customerInfoService; + /** * 删除 * @@ -209,6 +215,13 @@ public class AuthRoleController { if (authRoleSaveRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + List authRoleAdmins = authRoleAdminService.listByRoleId(authRoleSaveRequest.getId()); + if (CollUtil.isNotEmpty(authRoleAdmins)) { + return ResultVOUtils.error(500, "该角色已经绑定用户，请先移除后删除！"); + } + if (customerInfoService.isExitRoleId(authRoleSaveRequest.getId() + "")) { + return ResultVOUtils.error(500, "该角色已经绑定用户，请先移除后删除！"); + } boolean b = authRoleService.deleteById(authRoleSaveRequest.getId()); if (!b) { @@ -216,7 +229,6 @@ public class AuthRoleController { } //TODO 删除角色后先前授权的缓存不会消失 - // 再删除之前的授权 authPermissionService.deleteByRoleId(authRoleSaveRequest.getId()); @@ -226,11 +238,11 @@ public class AuthRoleController { @AuthRuleAnnotation("") @GetMapping("/admin/auth/role/getBussinessTypeRole") - public BaseResponse getBussinessTypeRole(Long roleId){ + public BaseResponse getBussinessTypeRole(Long roleId) { if (null == roleId) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - List data = authRoleService.getBussinessTypeRole(roleId); + List data = authRoleService.getBussinessTypeRole(roleId); return ResultVOUtils.success(data); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java index 391abf3..b4264c8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java @@ -118,17 +118,6 @@ public class CustomerController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } -// if (StringUtils.isNotBlank(customerDetailEntity.getPdfTemplateId())) { -// SystemPDFTemplateEntity systemPDFTemplateEntity = -// systemPDFTemplateService.selectById(customerDetailEntity.getPdfTemplateId()); -// if (systemPDFTemplateEntity != null) { -// systemPDFTemplateRelevanceService.deleteByCustomerId(customerDetailEntity.getCustomerId()); -// SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntity = new SystemPDFTemplateRelevanceEntity(); -// systemPDFTemplateRelevanceEntity.setTemplate_id(systemPDFTemplateEntity.getId()); -// systemPDFTemplateRelevanceEntity.setCustomerId(customerDetailEntity.getCustomerId()); -// systemPDFTemplateRelevanceService.insert(systemPDFTemplateRelevanceEntity); -// } -// } return ResultVOUtils.success("更新成功"); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java index ea79561..bbd0382 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java @@ -164,6 +164,17 @@ public class RegisterController { } else { rMap.put("companyCheckStatus", true); } + + SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("register_udplat_check"); + if (systemParamConfigEntity1 == null + || StringUtils.isBlank(systemParamConfigEntity1.getParamValue()) + || systemParamConfigEntity1.getParamValue().equals("0")) { + rMap.put("udplatCheckStatus", false); + } else { + rMap.put("udplatCheckStatus", true); + } + + return ResultVOUtils.success(rMap); } @@ -323,6 +334,15 @@ public class RegisterController { userId = Long.parseLong(basicUnitMaintainEntity.getErpId()); } else { userId = Long.parseLong(userRegisterEntity.getCompanyId()); + + //注册时新增到往来单位字典 + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity.setName(userRegisterEntity.getCompanyName()); + basicUnitMaintainEntity.setErpId(userRegisterEntity.getCompanyId()); + basicUnitMaintainEntity.setCorpType(2); + basicUnitMaintainEntity.setOutType(0); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + } userRegisterEntity.setCheckType(registerCheckRequest.getCheckType()); userRegisterEntity.setCheckTime(DateUtil.getDateTime()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java index e46d755..b1274c6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessChangeTypeController.java @@ -61,17 +61,20 @@ public class BussinessChangeTypeController { bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN); bussinessChangeTypeEntity1.setIndex(1); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); + bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity(); bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\""); bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN); bussinessChangeTypeEntity2.setIndex(1); + bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2); BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity(); bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\""); bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN); bussinessChangeTypeEntity3.setIndex(2); + bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); @@ -80,6 +83,7 @@ public class BussinessChangeTypeController { bussinessChangeTypeEntity1.setIntro("出库自动补\"寄售入库单\""); bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN); bussinessChangeTypeEntity1.setIndex(1); + bussinessChangeTypeEntity1.setBeforeTime(1); bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction()); bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1); bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction()); 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 92d5efe..422a2b0 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 @@ -1,5 +1,6 @@ package com.glxp.sale.admin.controller.basic; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; @@ -10,8 +11,10 @@ import com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity; import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.basic.CndidateRequest; import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest; +import com.glxp.sale.admin.req.basic.FilterInvBusTypeRequest; import com.glxp.sale.admin.req.basic.UdimsFilterRequest; import com.glxp.sale.admin.req.info.DeleteRequest; import com.glxp.sale.admin.req.inout.OrderFilterRequest; @@ -22,6 +25,7 @@ import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BussinessLocalTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.FileUtils; @@ -105,7 +109,6 @@ public class BussinessTypeController { bussinessTypeFilterRequest.setAdvanceType(bussinessLocalTypeEntity.isAdvanceType()); } - List bussinessTypeEntities; bussinessTypeEntities = bussinessTypeService.filterJoinList(bussinessTypeFilterRequest); PageInfo pageInfo; @@ -186,6 +189,8 @@ public class BussinessTypeController { return ResultVOUtils.success(pageSimpleResponse); } + @Resource + WarehouseBussinessTypeService warehouseBussinessTypeService; @AuthRuleAnnotation("") @PostMapping("/udiwms/bussinessType/delete") @@ -202,6 +207,14 @@ public class BussinessTypeController { if (orderEntity != null) { return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！"); } + + FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); + filterInvBusTypeRequest.setAction(bussinessTypeEntity.getAction()); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); + if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) { + return ResultVOUtils.error(500, "单据类型已被仓库分库绑定，无法删除"); + } + // if (bussinessTypeEntity.getLocalAction() != null && !bussinessTypeEntity.getLocalAction().equals("")) { // BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction()); // if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/ProductInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/ProductInfoController.java index c702a33..17c0f21 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/ProductInfoController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/ProductInfoController.java @@ -129,7 +129,7 @@ public class ProductInfoController { (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) && (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals("")) ) { - return ResultVOUtils.error(500, "参数不能为空！"); + return ResultVOUtils.error(500, "查询条件不能为空！"); } if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) { @@ -194,7 +194,7 @@ public class ProductInfoController { (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) && (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals("")) ) { - return ResultVOUtils.error(500, "参数不能为空！"); + return ResultVOUtils.error(500, "查询条件不能为空！"); } if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index 3afac47..abdb9d0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -179,6 +179,8 @@ public class UdiContrastController { udiRelevanceEntity.setMeasname(combineRequest.getMeasname()); udiRelevanceEntity.setSupName(combineRequest.getSupName()); udiRelevanceEntity.setPrice(combineRequest.getPrice()); + udiRelevanceEntity.setSptm(combineRequest.getSptm()); + udiRelevanceEntity.setYbbm(combineRequest.getYbbm()); UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId()); if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), combineRequest.getThirdSys())) { return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!"); 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 f03b7df..31e8d10 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 @@ -364,7 +364,7 @@ public class OrderDetailController { } BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); - if (bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) { + if ((bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) || filterErpOrderRequest.getShowType() == 1) { erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderId()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java index 6eb77e3..4d48c4c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockQRCodeTextController.java @@ -13,6 +13,7 @@ import com.glxp.sale.admin.entity.inout.*; import com.glxp.sale.admin.entity.inventory.StockPrintTempEntity; import com.glxp.sale.admin.entity.param.SystemPDFModuleEntity; import com.glxp.sale.admin.entity.param.SystemPDFTemplateEntity; +import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.basic.FilterStockprintRequest; import com.glxp.sale.admin.req.inout.DeleteRequest; import com.glxp.sale.admin.req.inout.StockOrderDetailFilterRequest; @@ -39,6 +40,7 @@ import com.glxp.sale.admin.service.inventory.StockPrintTempService; import com.glxp.sale.admin.service.param.SystemPDFModuleService; import com.glxp.sale.admin.service.param.SystemPDFTemplateRelevanceService; import com.glxp.sale.admin.service.param.SystemPDFTemplateService; +import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.thread.JaspaperService; import com.glxp.sale.admin.util.Constant; import com.glxp.sale.admin.util.CustomUtil; @@ -92,7 +94,8 @@ public class StockQRCodeTextController { @Resource private BussinessLocalTypeService bussinessLocalTypeService; @Resource - private BussinessTypeService bussinessTypeService; + SystemParamConfigService systemParamConfigService; + @AuthRuleAnnotation("") @GetMapping("/udiwms/stock/qrcode/text/filter") @@ -379,12 +382,13 @@ public class StockQRCodeTextController { systemPDFTemplateRelevanceRequest.setModuleId(stockQRCodeTextPDFTemplateRequest.getModuleId()); systemPDFTemplateRelevanceRequest.setLocalAction(stockOrderEntity.getBillType()); BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(stockOrderEntity.getBillType()); - OrderEntity orderEntity = orderService.findById(stockOrderEntity.getOrderIdFk()); - List systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest); if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return; SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0); + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("order_print_by_thrproduct"); + if (bussinessLocalTypeEntity.getOrderVisibleType() == 0) { /*打印订单*/ List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); @@ -409,7 +413,11 @@ public class StockQRCodeTextController { stockOrderPrintEntity.setRemark1(systemPDFModuleEntity.getRemark1()); stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2()); stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3()); - stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); + if (orderEntity != null) + stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark()); + if (systemParamConfigEntity.getParamValue().equals("1")) { + tranfByThr(stockOrderPrintEntity); + } index++; } @@ -457,6 +465,9 @@ public class StockQRCodeTextController { index++; stockOrderPrintEntity.setCount(Integer.parseInt(stockOrderPrintEntity.getCount()) * getActCount(stockOrderPrintEntity) + ""); + if (systemParamConfigEntity.getParamValue().equals("1")) { + tranfByThr(stockOrderPrintEntity); + } } Map data = new HashMap(); @@ -470,6 +481,23 @@ public class StockQRCodeTextController { } } + public void tranfByThr(StockOrderPrintEntity stockOrderPrintEntity) { + + + if (stockOrderPrintEntity != null) { + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrName())) + stockOrderPrintEntity.setProductName(stockOrderPrintEntity.getThrName()); + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrSpec())) + stockOrderPrintEntity.setSpec(stockOrderPrintEntity.getThrSpec()); + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrMeasname())) + stockOrderPrintEntity.setMeasname(stockOrderPrintEntity.getThrMeasname()); + if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrRegisterNo())) + stockOrderPrintEntity.setZczbhhzbapzbh(stockOrderPrintEntity.getThrRegisterNo()); + } + + } + + @Resource UdiRelevanceService udiRelevanceService; 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 49e3a90..36e21d3 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 @@ -23,6 +23,7 @@ import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.*; +import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvLinkDataRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse; @@ -30,6 +31,7 @@ import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.WarehouseResponse; import com.glxp.sale.admin.res.inout.WarehouseUserResponse; +import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; @@ -1264,6 +1266,29 @@ public class WareHouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } List userList = JSONUtil.toList(userListJson, AuthAdmin.class); + + //获取用户关联单据类型信息 + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); + filterInvBusUserRequest.setSubInvCode(code); + List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest); + Map filteBusTypes = new HashMap<>(); + for (InvBusUserResponse invBusUserEntity : invBusUserEntities) { + boolean isExit = false; + for (AuthAdmin authAdmin : userList) { + if (authAdmin.getId() == Long.parseLong(invBusUserEntity.getUserId())) { + isExit = true; + continue; + } + } + if (!isExit) { + filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity); + } + } + if (filteBusTypes.size() > 0) { + return ResultVOUtils.error(500, "请先移除用户已关联单据类型！"); + } + + // if (CollUtil.isEmpty(userList)) { // return ResultVOUtils.error(500, "用户列表不能为空"); // } @@ -1281,6 +1306,32 @@ public class WareHouseController { String bussinessTypeJson = String.valueOf(params.get("bussinessTypes")); if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + + List bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class); + FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest(); + filterInvBusUserRequest.setSubInvCode(code); + List invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest); + Map filteBusTypes = new HashMap<>(); + for (InvBusUserResponse invBusUserEntity : invBusUserEntities) { + boolean isExit = false; + for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) { + if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) { + isExit = true; + continue; + } + } + if (!isExit) { + filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity); + } + } + if (filteBusTypes.size() > 0) { + String data = ""; + for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) { + data = data + invBusUserResponse.getBillTypeName() + ","; + } + return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！"); + } + warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class)); InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findByInvSubByCode(code); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java index 5dec685..d6f9a0b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvProductsController.java @@ -305,7 +305,6 @@ public class InvProductsController { if (udiInfoEntities != null && udiInfoEntities.size() > 1) { //多级包装根据产品ID，批次号查询 - //1.判断是否di关联多个产品ID List udiRelevanceResponses = udiRelevanceService.selectAllByNameCode(udiEntity.getUdi()); if (CollUtil.isNotEmpty(udiRelevanceResponses)) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSickTraceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSickTraceController.java new file mode 100644 index 0000000..d1cc2bd --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSickTraceController.java @@ -0,0 +1,43 @@ +package com.glxp.sale.admin.controller.inventory; + +import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.inout.OrderEntity; +import com.glxp.sale.admin.req.inout.OrderFilterRequest; +import com.glxp.sale.admin.req.inventory.FilterSickTraceRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class InvSickTraceController { + + @Resource + OrderService orderService; + + + @AuthRuleAnnotation("") + @GetMapping("spms/inv/sick/order/trace") + public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) { + + if (StrUtil.isEmpty(filterSickTraceRequest.getSickAd())) { + return ResultVOUtils.error(500, "病人住院号不能为空！"); + } + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setFromCorp(filterSickTraceRequest.getSickAd()); + List orderEntityList = orderService.filterListOr(orderFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } +} 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 59cbfe7..a40a88c 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 @@ -218,6 +218,23 @@ public class InvWarehouseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + + if (invWarehouseEntity.getLevel() == 1) { + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setStatus(invWarehouseEntity.getStatus()); + filterInvWarehouseRequest.setLevel(1); + List invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest); + if (CollUtil.isNotEmpty(invWarehouseEntities)) { + return ResultVOUtils.error(500, "已存在相同类型的一级仓库，无法继续添加！"); + } + } + InvWarehouseEntity invWarehouseEntity1 = invWarehouseService.selectByName(invWarehouseEntity.getName()); + if (invWarehouseEntity1 != null) { + return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！"); + } + + if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库 invWarehouseEntity.setPid(0); // 默认设置 FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); @@ -247,7 +264,7 @@ public class InvWarehouseController { InvSubWarehouseEntity invSubWarehouseEntity = new InvSubWarehouseEntity(); invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); invSubWarehouseEntity.setParentId(invWarehouseEntity.getCode()); - invSubWarehouseEntity.setName(invWarehouseEntity.getName()); + invSubWarehouseEntity.setName("第一分库"); invSubWarehouseEntity.setCode(Integer.parseInt(invWarehouseEntity.getCode()) * 1000 + ""); invSubWarehouseEntity.setDefaultInv(true); invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java index 0da8089..2657430 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddController.java @@ -75,10 +75,6 @@ public class ThrProductsAddController { } - @Resource - UdiContrastService udiContrastService; - @Resource - BasicThirdSysService basicThirdSysService; @AuthRuleAnnotation("") @PostMapping("/udiwms/thrsys/updateThrAddProducts") @@ -87,6 +83,12 @@ public class ThrProductsAddController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + ""); + if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { + return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); + } + thrProductsAddService.updateThrProducts(thrProductsAddEntity); if (thrProductsAddEntity.getCheckStatus() == 2) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); @@ -94,12 +96,12 @@ public class ThrProductsAddController { BeanUtils.copyProperties(thrProductsAddEntity, thrProductsEntity); thrProductsEntity.setUpdateTime(new Date()); thrProductsService.insertThrProducts(thrProductsEntity); - //审核通过后直接加到耗材字典里 - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk())) - if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) { - udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); - } + //审核通过后直接加到耗材字典里---todo 暂时不加到耗材字典里 +// BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); +// if (basicThirdSysEntity.getThirdId().equals(thrProductsAddEntity.getThirdSysFk())) +// if (!udiContrastService.isExit(null, thrProductsAddEntity.getCode(), null)) { +// udiContrastService.createOnlyMainId(thrProductsAddEntity.getCode()); +// } } else if (thrProductsAddEntity.getCheckStatus().equals(3)) { //不通过，删除第三方产品信息表中此产品数据 thrProductsService.delete(thrProductsAddEntity); @@ -119,6 +121,11 @@ public class ThrProductsAddController { if (null == thrProductsAddEntity) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + if (thrProductsService.isExit(thrProductsAddEntity.getCode(), thrProductsAddEntity.getThirdSysFk())) { + return ResultVOUtils.error(500, "已存在相同产品编码，无法添加！"); + } + + String customerId = customerService.getCustomerId() + ""; if (customerId.equals("110")) { ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index 37ef215..8a890d8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; +import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; @@ -15,6 +16,8 @@ import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse; import com.glxp.sale.admin.service.basic.UdiContrastService; +import com.glxp.sale.admin.service.basic.UdiInfoService; +import com.glxp.sale.admin.service.basic.UdiRelevanceService; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService; import com.glxp.sale.common.enums.ResultEnum; @@ -44,6 +47,10 @@ public class ThrProductsAddDiController { private UdiContrastService udiContrastService; @Resource private CompanyProductRelevanceService companyProductRelevanceService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; /** * 查询DI产品信息列表 @@ -65,7 +72,6 @@ public class ThrProductsAddDiController { /** * 添加DI产品信息 * - * @param thrProductsAddDiEntity * @return */ @AuthRuleAnnotation("") @@ -74,7 +80,7 @@ public class ThrProductsAddDiController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - thrProductsAddDiService.addThrAddDiProducts(addThrDiProductsRequest.getUuids(), addThrDiProductsRequest.getCustomerId()); + thrProductsAddDiService.addThrAddDiProducts(addThrDiProductsRequest); return ResultVOUtils.success(); } @@ -90,28 +96,43 @@ public class ThrProductsAddDiController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - thrProductsAddDiEntity.setAuditTime(new Date()); thrProductsAddDiService.updateDiProduct(thrProductsAddDiEntity); + ThrProductsAddDiResponse thrProductsAddDiResponse = thrProductsAddDiService.selecById(thrProductsAddDiEntity.getId()); + if (thrProductsAddDiEntity.getStatus() == 2) { //审核通过 - ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); UdiInfoEntity udiInfoEntity = thrProductsAddDiService.getDiProductDetail(thrProductsAddDiEntity.getUuid()); - BeanUtil.copyProperties(udiInfoEntity, thrProductsEntity); //审核通过后追加到耗材字典中 CombineRequest combineRequest = new CombineRequest(); combineRequest.setCustomerId(thrProductsAddDiEntity.getCustomerId()); //插入数据，并获取关联主键 - Long udiRelIdFk = udiContrastService.createOnlyUuid(combineRequest, thrProductsAddDiEntity.getUuid()); - //回填关联关系到关联表 - CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); - companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId()); - companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk.intValue()); - companyProductRelevanceEntity.setCreate_time(new Date()); - companyProductRelevanceEntity.setUpdate_time(new Date()); - companyProductRelevanceEntity.setUnitFk(thrProductsAddDiEntity.getCustomerId().toString()); - companyProductRelevanceEntity.setAuditStatus("1"); - - companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); + if (udiContrastService.isExit(thrProductsAddDiEntity.getUuid(), null, null)) { + return ResultVOUtils.error(500, "已存在该DI，且未对照，请联系供应商自行选入产品！"); + } else { + Long udiRelIdFk = udiContrastService.createOnlyUuid(combineRequest, thrProductsAddDiEntity.getUuid()); + + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(udiRelIdFk + ""); + udiRelevanceEntity.setYbbm(thrProductsAddDiResponse.getYbbm()); + udiRelevanceEntity.setSptm(thrProductsAddDiResponse.getYbbm()); + udiRelevanceEntity.setMeasname(thrProductsAddDiResponse.getYbbm()); + udiRelevanceEntity.setYbbm(thrProductsAddDiResponse.getYbbm()); + udiInfoEntity.setSpmc(thrProductsAddDiResponse.getSpmc()); + udiInfoEntity.setCpms(thrProductsAddDiResponse.getCpms()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + udiInfoService.updateUdiInfo(udiInfoEntity); + //回填关联关系到关联表 + CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); + companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId()); + companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk.intValue()); + companyProductRelevanceEntity.setCreate_time(new Date()); + companyProductRelevanceEntity.setUpdate_time(new Date()); + companyProductRelevanceEntity.setUnitFk(thrProductsAddDiEntity.getCustomerId().toString()); + companyProductRelevanceEntity.setAuditStatus("1"); + + companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); + } + + } return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java index b4a3257..4db8433 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/AuthRoleDao.java @@ -22,7 +22,7 @@ public interface AuthRoleDao { */ List listAuthAdminRolePage(@Param("status") Integer status); - List listCustomerRoles(Integer isCustomer); + List listCustomerRoles(@Param("isCustomer") Integer isCustomer); List listAuthRoles2(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java index 461f1a2..bd3f90a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/auth/CustomerInfoDao.java @@ -12,6 +12,7 @@ public interface CustomerInfoDao { List filterCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); + List filterDetailCustomerInfo(CustomerInfoFilterRequest customerInfoFilterRequest); @@ -26,4 +27,7 @@ public interface CustomerInfoDao { CustomerInfoEntity selectById(Long customerId); CustomerDetailEntity selectDetail(Long customerId); + + + CustomerInfoEntity isExitRoleId(String roleId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvBusUserDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvBusUserDao.java index c2b20cc..7a5bc11 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvBusUserDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvBusUserDao.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.inventory; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; +import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -13,6 +14,9 @@ public interface InvBusUserDao { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + + boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity); boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessChangeTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessChangeTypeEntity.java index 6c34360..2055cc3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessChangeTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessChangeTypeEntity.java @@ -15,8 +15,10 @@ public class BussinessChangeTypeEntity { private String remark; private String name; private Integer changeType; - - + private String defaultInv; + private String defaultSubInv; + private String defautInvName; + private String defautSubInvName; public Integer getBeforeTime() { if (beforeTime == null) return 0; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java index 7ad5cdb..d6348ba 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java @@ -12,6 +12,7 @@ public class BussinessLocalTypeEntity { private String name; private String localAction; private String originAction; + private String originName; //第三方单据类型名称 private String mainAction; private String localName; private String remark; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/FilterErpOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/FilterErpOrderRequest.java index f36e160..11f2fbc 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/FilterErpOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/FilterErpOrderRequest.java @@ -23,5 +23,6 @@ public class FilterErpOrderRequest extends ListPageRequest { private String nameCode; //最小包装前7位 private String goodsid; //货品ID private String batchNo; //批号 + private int showType; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java index 39b4139..e463d29 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java @@ -65,4 +65,12 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity { private String basicPrductRemak7; private String basicPrductRemak8; + private String thrCode; + private String thrName; + private String thrMeasname; + private String thrSpec; + private String thrRegisterNo; + private String thrManufactory; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java index ce39c21..d8dd67d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddDiEntity.java @@ -47,4 +47,15 @@ public class ThrProductsAddDiEntity { */ private String remark; + + + private String thirdSysFk; + private String code; + private String sptm; + private String ybbm; + private String measname; + private String manufactory; + private String spmc; + private String cpms; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java index 8d98fb6..def8981 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrProductsAddEntity.java @@ -42,4 +42,5 @@ public class ThrProductsAddEntity { private String price; private Integer checkStatus; private String customerId; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java index 6cd88d8..0954ab8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/AuthRoleQueryRequest.java @@ -12,5 +12,6 @@ import lombok.EqualsAndHashCode; public class AuthRoleQueryRequest extends ListPageRequest { private String name; private Integer status; + private Integer isCustomer; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java index 5ee63b4..002324f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/CustomerInfoFilterRequest.java @@ -6,6 +6,7 @@ import lombok.Data; @Data public class CustomerInfoFilterRequest extends ListPageRequest { + private String key; private String customerName; private long customerId; private String companyName; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java index 8235383..a05b023 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CombineRequest.java @@ -26,4 +26,7 @@ public class CombineRequest { private String price; private boolean idSpliUdi; private String uuid; + + private String ybbm; + private String sptm; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java index a3c198c..dbe16d9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterInvBusTypeRequest.java @@ -10,4 +10,5 @@ public class FilterInvBusTypeRequest extends ListPageRequest { private String lastUpdateTime; private Integer id; private String code; + private String action; } 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 9cda723..cd305f7 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 @@ -25,6 +25,7 @@ public class OrderFilterRequest extends ListPageRequest { private Integer statusOrOne; private String customerId; private String fromCorpId; + private String fromCorp; private String orderId;//业务单据ID，手持终端上传上来的 private String ullageSupNo; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterSickTraceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterSickTraceRequest.java new file mode 100644 index 0000000..c872238 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterSickTraceRequest.java @@ -0,0 +1,9 @@ +package com.glxp.sale.admin.req.inventory; + +import lombok.Data; + +@Data +public class FilterSickTraceRequest { + + private String sickAd; //病人住院号 +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java index d9c810c..07eb13a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/AddThrDiProductsRequest.java @@ -24,4 +24,15 @@ public class AddThrDiProductsRequest { @NotNull(message = "参数错误") private Long customerId; + + private String thirdSysFk; + private String code; + private String sptm; + private String ybbm; + private String measname; + private String manufactory; + private String spmc; + private String cpms; + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java index 79165f4..c2be4be 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java @@ -25,4 +25,5 @@ public class FilterThrProductsRequest extends ListPageRequest { private String sptm; private String lastUpdateTime; private String ybbm; + private Long id; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java index ff8782b..5e1ef82 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java @@ -74,5 +74,12 @@ public class CompanyProductRelevanceResponse { //产品代理商 private String cpdls; - + private String basicPrductRemak1; + private String basicPrductRemak2; + private String basicPrductRemak3; + private String basicPrductRemak4; + private String basicPrductRemak5; + private String basicPrductRemak6; + private String basicPrductRemak7; + private String basicPrductRemak8; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvBusUserResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvBusUserResponse.java new file mode 100644 index 0000000..0cf48dc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvBusUserResponse.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.res.inventory; + +import lombok.Data; + +@Data +public class InvBusUserResponse { + private Integer id; + private String userId; + private String subInvCode; + private String scAction; + private String billTypeName; + private String remark; + + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductThirdResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductThirdResponse.java new file mode 100644 index 0000000..2d983ff --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductThirdResponse.java @@ -0,0 +1,44 @@ +package com.glxp.sale.admin.res.inventory; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@Data +public class InvProductThirdResponse { + + + @JsonProperty("id") + private Integer id; + @JsonProperty("productName") + private String productName; + @JsonProperty("diCode") + private String diCode; + @JsonProperty("spec") + private String spec; + @JsonProperty("batchNo") + private String batchNo; + @JsonProperty("productionDate") + private String productionDate; + @JsonProperty("expireDate") + private String expireDate; + @JsonProperty("registerCompany ") + private String registerCompany; + @JsonProperty("registerCert") + private String registerCert; + @JsonProperty("inCount") + private Integer inCount; + @JsonProperty("outCount") + private Integer outCount; + @JsonProperty("supName") + private String supName; + @JsonProperty("invStorageCode") + private String invStorageCode; + @JsonProperty("invStorageName") + private String invStorageName; + @JsonProperty("invSubStorageName") + private String invSubStorageName; + @JsonProperty("invWarehouseCode") + private String invWarehouseCode; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java index a721db3..e60afed 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerInfoService.java @@ -15,9 +15,14 @@ public interface CustomerInfoService { boolean insertCustomerInfo(CustomerInfoEntity customerInfoEntity); boolean updateCustomerInfo(CustomerInfoEntity customerInfoEntity); + boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity); + boolean deleteById(Long id); CustomerInfoEntity selectById(Long customerId); + + boolean isExitRoleId(String roleId); + CustomerDetailEntity selectDetail(Long customerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java index 669c4e9..fc08420 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/AuthLoginServiceImpl.java @@ -1,12 +1,7 @@ package com.glxp.sale.admin.service.auth.impl; -import com.glxp.sale.admin.entity.auth.AuthPermission; -import com.glxp.sale.admin.entity.auth.AuthPermissionRule; -import com.glxp.sale.admin.entity.auth.AuthRoleAdmin; -import com.glxp.sale.admin.service.auth.AuthLoginService; -import com.glxp.sale.admin.service.auth.AuthPermissionRuleService; -import com.glxp.sale.admin.service.auth.AuthPermissionService; -import com.glxp.sale.admin.service.auth.AuthRoleAdminService; +import com.glxp.sale.admin.entity.auth.*; +import com.glxp.sale.admin.service.auth.*; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,10 +22,15 @@ public class AuthLoginServiceImpl implements AuthLoginService { @Resource private AuthPermissionRuleService authPermissionRuleService; + @Resource + private AuthAdminService authAdminService; + @Resource + private CustomerInfoService customerInfoService; /** * 根据 管理员id 获取权限 + * * @param adminId * @return */ @@ -50,15 +50,24 @@ public class AuthLoginServiceImpl implements AuthLoginService { // return new ArrayList<>(CacheUtils.sGetMembers(aarKey)); // } // log.info("开始获取数据库中的用户的权限规则列表"); + List roleIds; + + AuthAdmin authAdmin = authAdminService.findById(adminId); + if (authAdmin.getCustomerId() != 110) { + CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId()); + roleIds = new ArrayList<>(); + roleIds.add(Long.parseLong(customerInfoEntity.getRoleId())); + } else { + List authRoleAdmins = authRoleAdminService.listByAdminId(adminId); + roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList()); + } // 获取角色ids - List authRoleAdmins = authRoleAdminService.listByAdminId(adminId); - List roleIds = authRoleAdmins.stream().map(AuthRoleAdmin::getRole_id).collect(Collectors.toList()); // 角色授权列表 List authPermissions = authPermissionService.listByRoleIdIn(roleIds); - List permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList()); + List permissionRuleIds = authPermissions.stream().map(AuthPermission::getPermissionRuleId).collect(Collectors.toList()); // 获取授权的规则 List authPermissionRules = authPermissionRuleService.listByIdIn(permissionRuleIds); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java index d7ee7cc..afbab85 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/impl/CustomerInfoServiceImpl.java @@ -38,7 +38,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { return Collections.emptyList(); } - if(customerInfoFilterRequest.getPage()!=null){ + if (customerInfoFilterRequest.getPage() != null) { int offset = (customerInfoFilterRequest.getPage() - 1) * customerInfoFilterRequest.getLimit(); PageHelper.offsetPage(offset, customerInfoFilterRequest.getLimit()); } @@ -55,7 +55,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { List customerDetailEntities = customerInfoDao.filterDetailCustomerInfo(customerInfoFilterRequest); for (int i = 0; i < customerDetailEntities.size(); i++) { CustomerDetailEntity customerDetailEntity = customerDetailEntities.get(i); - if(!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId()!=null ){ + if (!customerDetailEntity.getRoleId().equals("null") && !customerDetailEntity.getRoleId().equals("") && customerDetailEntity.getRoleId() != null) { } @@ -88,6 +88,14 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { return customerInfoDao.selectById(customerId); } + @Override + public boolean isExitRoleId(String roleId) { + CustomerInfoEntity customerInfoEntity = customerInfoDao.isExitRoleId(roleId); + if (customerInfoEntity == null) + return false; + else return true; + } + @Override public CustomerDetailEntity selectDetail(Long customerId) { return customerInfoDao.selectDetail(customerId); 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 772d9ed..043baf2 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 @@ -86,7 +86,7 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService bussinessLocalTypeFilterRequest.setAction(action); List data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest); if (CollUtil.isNotEmpty(data)) { - data.get(0); + return data.get(0); } return null; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java index 0dcc7f4..f548376 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/StockOrderServiceImpl.java @@ -17,6 +17,7 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity; import com.glxp.sale.admin.entity.inout.OrderEntity; import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.StockOrderPrintEntity; +import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; import com.glxp.sale.admin.req.inout.StockOrderFilterRequest; @@ -24,6 +25,7 @@ import com.glxp.sale.admin.req.inout.StockOrderQueryRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductDetailRequest; import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; import com.glxp.sale.admin.service.basic.BussinessTypeService; +import com.glxp.sale.admin.service.inout.CodesTempService; import com.glxp.sale.admin.service.inout.StockOrderService; import com.glxp.sale.admin.util.BusTypeCheckUtils; import org.springframework.stereotype.Service; @@ -57,6 +59,8 @@ public class StockOrderServiceImpl implements StockOrderService { @Resource private CodesDao codesDao; @Resource + private CodesTempService codesTempService; + @Resource BussinessTypeService bussinessTypeService; @@ -196,6 +200,11 @@ public class StockOrderServiceImpl implements StockOrderService { stockOrderDao.deleteById(stockOrderEntity.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderDao.updateOrder(orderEntity); + List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); + if (CollUtil.isNotEmpty(warehouseEntityList)) { + codesTempService.insertCodesTemp(warehouseEntityList); + codesDao.deleteByOrderId(orderEntity.getId()); + } } @@ -213,38 +222,29 @@ public class StockOrderServiceImpl implements StockOrderService { FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setOrderIdFk(orderEntity.getId()); List invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); - - Map> invPreInProductDetailMap = invProductDetailEntities - .stream() - .collect(Collectors.groupingBy(InvProductDetailEntity::getProductIdFk)); - - List invPreInProductList = new ArrayList<>(invPreInProductDetailMap.keySet().size()); - - for (String productId : invPreInProductDetailMap.keySet()) { - List detailList = invPreInProductDetailMap.get(productId); + List invPreInProductList = new ArrayList<>(); + for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) { FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); - filterInvProductRequest.setRelIdFk(productId); - filterInvProductRequest.setSupId(detailList.get(0).getSupId()); - filterInvProductRequest.setInvWarehouseCode(detailList.get(0).getInvWarehouseCode()); - filterInvProductRequest.setInvStorageCode(detailList.get(0).getInvStorageCode()); - if (StrUtil.isBlank(detailList.get(0).getBatchNo())) { + filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk()); + filterInvProductRequest.setSupId(invProductDetailEntity.getSupId()); + filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode()); + filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode()); + if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) { filterInvProductRequest.setBatchNo("empty"); } else { - filterInvProductRequest.setBatchNo(detailList.get(0).getBatchNo()); + filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo()); } List invProductEntities = invPreInProductDao.filterInvProduct(filterInvProductRequest); - InvProductEntity invProductEntity = invProductEntities.get(0); - detailList.forEach(invProductDetailEntity -> { + if (CollUtil.isNotEmpty(invProductEntities) && invProductEntities.size() > 0) { + InvProductEntity invProductEntity = invProductEntities.get(0); calculateInvCount(invProductEntity, invProductDetailEntity); - }); - - invPreInProductList.add(invProductEntity); + invPreInProductList.add(invProductEntity); + } else { + return false; + } } - //删除库存详情 invPreInProductDetailDao.deleteByOrderId(orderEntity.getId()); - //删除码详情 - codesDao.deleteByOrderId(orderEntity.getId()); //更新库存 for (InvProductEntity invProductEntity : invPreInProductList) { //查询库存码详情，如果库存码详情为空，则删除此库存 @@ -329,6 +329,11 @@ public class StockOrderServiceImpl implements StockOrderService { stockOrderDao.deleteById(stockOrderEntity.getId()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderDao.updateOrder(orderEntity); + List warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId()); + if (CollUtil.isNotEmpty(warehouseEntityList)) { + codesTempService.insertCodesTemp(warehouseEntityList); + codesDao.deleteByOrderId(orderEntity.getId()); + } } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java index 7b296c0..e5fff56 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseBussinessTypeServiceImpl.java @@ -52,6 +52,8 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType @Override public void saveWarehouseBussinessType(String code, List bussinessTypResponseList) { + //删除旧数据 + warehouseBussinessTypeDao.deleteByCode(code); if (CollUtil.isNotEmpty(bussinessTypResponseList)) { List warehouseBussinessTypeEntities = new ArrayList<>(bussinessTypResponseList.size()); bussinessTypResponseList.forEach(bussinessTypeEntity -> { @@ -61,8 +63,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType entity.setName(bussinessTypeEntity.getName()); warehouseBussinessTypeEntities.add(entity); }); - //删除旧数据 - warehouseBussinessTypeDao.deleteByCode(code); + //加入新数据 warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java index 3c6d640..807badf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvBusUserService.java @@ -4,6 +4,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest; +import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import java.util.List; @@ -11,6 +12,9 @@ public interface InvBusUserService { List filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + + List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest); + List selectByUnion(String userId, String subInvCode); 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 4bd6ad6..057a046 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 @@ -28,6 +28,8 @@ public interface InvWarehouseService { InvWarehouseEntity selectByCode(String code); + InvWarehouseEntity selectByName(String name); + boolean deleteById(String id); /** @@ -43,7 +45,7 @@ public interface InvWarehouseService { * @param id * @param thridWarehouseId */ - boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId); + boolean bindThrWarehouse(String id, String thridWarehouseId, String sysId); /** * 解绑第三方仓库 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java index 25ea6c9..6380b50 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvBusUserServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.inventory.InvBusUserDao; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.req.inventory.FilterInvBusUserRequest; +import com.glxp.sale.admin.res.inventory.InvBusUserResponse; import com.glxp.sale.admin.service.inventory.InvBusUserService; import org.springframework.stereotype.Service; @@ -30,6 +31,18 @@ public class InvBusUserServiceImpl implements InvBusUserService { return invBusUserDao.filterInvBusUser(filterInvBusUserRequest); } + @Override + public List filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) { + if (filterInvBusUserRequest == null) { + return Collections.emptyList(); + } + if (filterInvBusUserRequest.getPage() != null) { + int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit(); + PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit()); + } + return invBusUserDao.filterJoinInvBusUser(filterInvBusUserRequest); + } + @Override public List selectByUnion(String userId, String subInvCode) { 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 a060d4c..cf288e3 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 @@ -113,6 +113,16 @@ public class InvWarehouseServiceImpl implements InvWarehouseService { return null; } + @Override + public InvWarehouseEntity selectByName(String name) { + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setName(name); + List invWarehouseEntities = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest); + if (invWarehouseEntities != null && invWarehouseEntities.size() > 0) + return invWarehouseEntities.get(0); + return null; + } + @Override public boolean deleteById(String id) { return invWarehouseDao.deleteById(id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java index f5552f8..9131367 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java @@ -42,7 +42,7 @@ public class SyncUdiService { (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) && (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals("")) ) { - return ResultVOUtils.error(500, "参数不能为空！"); + return ResultVOUtils.error(500, "查询条件不能为空！"); } if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java index 4be5f4b..2b83e17 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java @@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.thrsys; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; +import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse; @@ -11,6 +12,8 @@ public interface ThrProductsAddDiService { List filterThrProductsList(FilterThrProductsRequest filterThrProductsRequest); + ThrProductsAddDiResponse selecById(Long id); + /** * 删除DI产品信息 * @@ -20,7 +23,7 @@ public interface ThrProductsAddDiService { boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity); - boolean addThrAddDiProducts(List uuids, Long customerId); + boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest); UdiInfoEntity getDiProductDetail(String uuid); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java index 2b450ca..9a22702 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsService.java @@ -14,6 +14,9 @@ public interface ThrProductsService { List selectThrProducts(FilterThrProductsRequest filterThrProductsRequest); + + Boolean isExit(String code, String thirdIdFk); + ThrProductsEntity selectById(String id); boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 51d3588..4646ba4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -1,12 +1,16 @@ package com.glxp.sale.admin.service.thrsys.impl; +import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageHelper; import com.glxp.sale.admin.dao.thrsys.ThrProductsAddDiDao; import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; +import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse; import com.glxp.sale.admin.service.thrsys.ThrProductsAddDiService; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,6 +36,17 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { return thrProductsAddDiResponses; } + @Override + public ThrProductsAddDiResponse selecById(Long id) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setId(id); + List thrProductsAddDiResponses = thrProductsAddDiDao.filterThrProductsList(filterThrProductsRequest); + if (CollUtil.isNotEmpty(thrProductsAddDiResponses)) { + return thrProductsAddDiResponses.get(0); + } + return null; + } + @Override public boolean delThrDiProducts(Long id) { return thrProductsAddDiDao.deleteById(id); @@ -39,15 +54,19 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { @Override public boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity) { - return thrProductsAddDiDao.updateDiProduct(thrProductsAddDiEntity); + return thrProductsAddDiDao.updateDiProduct(thrProductsAddDiEntity); } @Override - public boolean addThrAddDiProducts(List uuids, Long customerId) { + public boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest) { + + List uuids = thrDiProductsRequest.getUuids(); + Long customerId = thrDiProductsRequest.getCustomerId(); List list = new ArrayList<>(uuids.size()); Date date = new Date(); for (String uuid : uuids) { ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); + BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); thrProductsAddDiEntity.setCustomerId(customerId); thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setCreateTime(date); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java index abd78fb..005a235 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -49,6 +49,18 @@ public class ThrProductsServiceImpl implements ThrProductsService { return data; } + @Override + public Boolean isExit(String code, String thirdIdFk) { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setThirdSysFk(thirdIdFk); + filterThrProductsRequest.setCode(code); + List data = thrProductsDao.selectThrProducts(filterThrProductsRequest); + if (CollUtil.isNotEmpty(data)) { + return true; + } + return false; + } + @Override public ThrProductsEntity selectById(String id) { return thrProductsDao.selectById(id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index b3366a2..f333170 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -711,14 +711,10 @@ public class InvProductsTrService { outOrder.setId(orderNo); outOrder.setFromCorpId(corpName); outOrder.setFromCorp(temps.get(0).getFromCorp()); - - - BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); - if (StrUtil.isNotEmpty(originBT.getDefaultSubInv())) { - outOrder.setFromSubInvCode(originBT.getDefaultSubInv()); +// BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); + if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) { + outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv()); } - - outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); outOrder.setInvStorageCode(orderEntity.getLocStorageCode()); 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 6eb8c8f..ce0692b 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 @@ -327,7 +327,6 @@ public class IoTransInoutService { public void transInout(OrderEntity orderEntity) { orderEntity.setRemark("正在处理！"); -// orderEntity.setStatus(ConstantStatus.ORDER_STATUS_DOING); orderEntity.setUpdateTime(new Date()); orderService.updateOrder(orderEntity); diff --git a/api-admin/src/main/resources/application-test1.properties b/api-admin/src/main/resources/application-test1.properties index 905dbd6..2cb3f40 100644 --- a/api-admin/src/main/resources/application-test1.properties +++ b/api-admin/src/main/resources/application-test1.properties @@ -56,7 +56,7 @@ spring.redis.database=4 # Redis \u670D\u52A1\u5668IP spring.redis.host=192.168.0.66 # Redis \u7AEF\u53E3\u53F7 -spring.redis.port=6400 +spring.redis.port=6400 # Redis \u5BC6\u7801 spring.redis.password= #\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570 diff --git a/api-admin/src/main/resources/application-test2.properties b/api-admin/src/main/resources/application-test2.properties index d0d41ca..9174c7d 100644 --- a/api-admin/src/main/resources/application-test2.properties +++ b/api-admin/src/main/resources/application-test2.properties @@ -1,9 +1,9 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9996 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3361/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3362/spms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=root +spring.datasource.password=Glxp@6066 spring.datasource.hikari.connection-timeout=60000 spring.datasource.hikari.maximum-pool-size=60 spring.datasource.hikari.minimum-idle=10 @@ -56,7 +56,7 @@ spring.redis.database=4 # Redis \u670D\u52A1\u5668IP spring.redis.host=192.168.0.66 # Redis \u7AEF\u53E3\u53F7 -spring.redis.port=6401 +spring.redis.port=6402 # Redis \u5BC6\u7801 spring.redis.password= #\u6700\u5927\u6D3B\u8DC3\u8FDE\u63A5\u6570 diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml index 3474f5b..f9e9b2a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml @@ -11,6 +11,9 @@ AND status = #{status} + + AND isCustomer = #{isCustomer} + AND `name` LIKE CONCAT('%',#{name},'%') @@ -34,15 +37,16 @@ - + SELECT id, name FROM auth_role where `isCustomer` = #{isCustomer} - + SELECT id, name FROM auth_role @@ -98,7 +102,9 @@ - delete from auth_role where id = #{id} + delete + from auth_role + where id = #{id} \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml index 93227b3..595ca54 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/CustomerInfoDao.xml @@ -14,6 +14,12 @@ AND companyName LIKE concat('%',#{companyName},'%') + + AND ( + companyName LIKE concat('%',#{key},'%') + or customerName LIKE concat('%',#{key},'%') + ) + @@ -23,9 +29,10 @@ customer_info.creditNum,customer_info.area,customer_info.detailAddr, customer_info.bussinessStatus,customer_info.isInfoLink,customer_info.infoLink,customer_info.roleId,customer_info.userFlag, customer_contact.contacts,customer_contact.mobile,customer_info.userMax,customer_contact.email,customer_contact.tel,customer_info.companyName - + ,auth_role.`name` role FROM customer_info INNER JOIN customer_contact on customer_info.customerId=customer_contact.customerId + INNER JOIN auth_role on customer_info.roleId = auth_role.id AND customer_info.customerName LIKE concat('%',#{customerName},'%') @@ -109,4 +116,14 @@ + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml index 5758475..79ac93b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessChangeTypeDao.xml @@ -5,10 +5,13 @@ @@ -17,12 +20,12 @@ parameterType="com.glxp.sale.admin.entity.basic.BussinessChangeTypeEntity"> insert INTO basic_bustype_pre - (action, scAction, `index`, remark, beforeTime, intro, changeType) + (`action`, scAction, `index`, remark, beforeTime, intro, changeType, defaultInv, defaultSubInv) values (#{action}, #{scAction}, #{index}, #{remark}, - #{beforeTime}, #{intro}, #{changeType}) + #{beforeTime}, #{intro}, #{changeType},#{defaultInv},#{defaultSubInv}) @@ -35,6 +38,8 @@ remark = #{remark}, intro = #{intro}, changeType = #{changeType}, + defaultInv = #{defaultInv}, + defaultSubInv = #{defaultSubInv}, WHERE id = #{id} 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 841f7b2..adefa17 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -5,8 +5,10 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml index deab472..dd75f8f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvBusUserDao.xml @@ -22,6 +22,26 @@ + + diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 67ade57..3b49a31 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -4,7 +4,9 @@ - insert into thr_products_add_di (uuid, customerId, createTime, auditTime, remark, auditUser, `status`) + insert into thr_products_add_di (uuid, customerId, createTime, auditTime, remark, auditUser, `status` + , thirdSysFk, code, sptm, ybbm, measname,manufactory,spmc,cpms + ) values ( #{item.uuid}, @@ -13,7 +15,15 @@ #{item.auditTime}, #{item.remark}, #{item.auditUser}, - #{item.status} ) + #{item.status}, + #{item.thirdSysFk}, + #{item.code}, + #{item.sptm}, + #{item.ybbm}, + #{item.measname}, + #{item.manufactory}, + #{item.spmc}, + #{item.cpms}) @@ -26,7 +36,16 @@ auditTime=#{auditTime}, remark=#{remark}, auditUser=#{auditUser}, + `thirdSysFk`=#{thirdSysFk}, + `code`=#{code}, + `sptm`=#{sptm}, + `ybbm`=#{ybbm}, + `measname`=#{measname}, + `manufactory`=#{manufactory}, + `spmc`=#{spmc}, + `cpms`=#{cpms}, `status`=#{status}, + WHERE id = #{id} @@ -55,6 +74,9 @@ AND tdi.status = #{checkStatus} + + AND tdi.id = #{id} + AND p.cpmctymc like concat('%', #{name}, '%') @@ -64,14 +86,16 @@ AND p.ggxh LIKE concat('%',#{spec},'%') + + AND p.nameCode = #{code} + \ No newline at end of file diff --git a/scripts/部署配置.txt b/scripts/部署配置.txt new file mode 100644 index 0000000..362f538 --- /dev/null +++ b/scripts/部署配置.txt @@ -0,0 +1,24 @@ + + + +192.168.0.66 +李自强： +redis:6400 +tomcat:8500 +mysql:3360 root root + +文明东： +redis:6401 +tomcat:8501 +mysql:3361 root root + +都教授： +redis:6402 +tomcat:8502 +mysql:3362 root Glxp@6066 + + +彭怀毅： +redis:6403 +tomcat:8503 +mysql:3363 root Glxp@6066 \ No newline at end of file