diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java index b3db4d7..dc14716 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java @@ -123,4 +123,18 @@ public class ConstantStatus { public static final String REDIS_BILLNO_CODES = "ACCEPT_CODES"; + //首营审核状态 //20:新增页面,21:审核页面,22:查询页面,23:审核通过，24：未审核或审核不通过的 + public static final int AUDIT_DRAFT = 0; //草稿 + public static final int AUDIT_PASS = 1; //审核通过 + public static final int AUDIT_REJECT = 2; //审核不通过 + public static final int AUDIT_CHANGE = 3; //申请变更 + public static final int AUDIT_CHANGE_PASS = 4; //申请变更通过 + public static final int AUDIT_CHANGE_REJECT = 5;//申请变更不通过 + public static final int AUDIT_UN = 6; //已提交未审核 + + public static final int CERT_COMPANY = 1; //配送企业 + public static final int CERT_MANUFACTURER = 2; //生产企业 + public static final int CERT_PRODUCT = 3; //产品品种 + + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java index d15dad9..c56d246 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java @@ -180,7 +180,7 @@ public class AuthAdminController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } AuthAdmin curUser = getCustomerId(); - if (curUser.getCustomerId() != 110) { + if (!curUser.getCustomerId().equals("110")) { CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(curUser.getCustomerId()); int max = customerInfoEntity.getUserMax(); int count = authAdminService.findCountByCustomerId(authAdminSaveRequest.getCustomerId()); @@ -278,7 +278,7 @@ public class AuthAdminController { @AuthRuleAnnotation("admin/auth/admin/updateInv") @PostMapping("/admin/auth/admin/updateInv") public BaseResponse updateInv(@RequestBody @Valid AuthAdminSaveRequest authAdminSaveRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java index 8488e16..dc1be00 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/ConnectTestController.java @@ -20,7 +20,7 @@ public class ConnectTestController { @GetMapping("/udiwms/auth/device/connect") public BaseResponse index(ConnectRequest connectRequest) { - CompanyEntity companyEntity = companyService.findCompany(110L); + CompanyEntity companyEntity = companyService.findCompany("110"); AuthConnectEntity authConnectEntity = new AuthConnectEntity(); authConnectEntity.setCompanyName(companyEntity.getCompanyName()); 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 b4264c8..909e3de 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 @@ -152,7 +152,7 @@ public class CustomerController { } String id = deleteRequest.getId(); - customerInfoService.deleteById(Long.parseLong(id)); + customerInfoService.deleteById(id); customerContactService.deleteById(Long.parseLong(id)); userRegisterService.deleteByCustomerId(Long.parseLong(id)); authAdminService.deleteByCustomerId(Long.parseLong(id)); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java index f06131c..782ac0f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/LoginController.java @@ -84,7 +84,7 @@ public class LoginController { if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - if (authAdmin.getCustomerId() != 110) { + if (!authAdmin.getCustomerId().equals("110")) { if (authAdmin.getUserFlag() == 0) { throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！"); } @@ -168,7 +168,7 @@ public class LoginController { if (authAdmin == null) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - if (authAdmin.getCustomerId() != 110) { + if (!authAdmin.getCustomerId().equals("110")) { if (authAdmin.getUserFlag() == 0) { throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！"); } 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 bbd0382..3b8e9ee 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 @@ -247,7 +247,7 @@ public class RegisterController { String company_check = systemParamConfigService.selectValueByParamKey("register_company_check"); if (StrUtil.isNotBlank(company_check) && company_check.equals("1")) { //新用户注册时根据往来单位字典进行企业名称校验 - CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(Long.parseLong(userRegisterEntity.getCompanyId())); + CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(userRegisterEntity.getCompanyId()); if (customerInfoEntity != null) { return ResultVOUtils.error(500, "该企业已被注册！"); } @@ -354,7 +354,7 @@ public class RegisterController { //创建新用户 AuthAdmin authAdmin = new AuthAdmin(); // authAdmin.setCustomerId(Integer.valueOf(String.valueOf(userId))); - authAdmin.setCustomerId(userId); + authAdmin.setCustomerId(userId + ""); authAdmin.setPassWord(userRegisterEntity.getPassword()); authAdmin.setCreateTime(DateUtil.parseDate(userRegisterEntity.getCheckTime())); authAdmin.setUserName(userRegisterEntity.getUserName()); //用手机号当用户名，通过手机号登录 @@ -393,7 +393,7 @@ public class RegisterController { //生产客户信息联系人表 CustomerContactEntity customerContactEntity = new CustomerContactEntity(); customerContactEntity.setContacts(userRegisterEntity.getRealName()); - customerContactEntity.setCustomerId(userId); + customerContactEntity.setCustomerId(userId + ""); customerContactEntity.setEmail(userRegisterEntity.getEmail()); customerContactEntity.setMobile(userRegisterEntity.getMobile()); customerContactEntity.setTel(userRegisterEntity.getTel()); @@ -401,7 +401,7 @@ public class RegisterController { //生产本企业信息 CompanyEntity companyEntity = new CompanyEntity(); - companyEntity.setCustomerId(userId); + companyEntity.setCustomerId(userId + ""); companyEntity.setArea(userRegisterEntity.getArea()); companyEntity.setAreaCode(userRegisterEntity.getAreaCode()); companyEntity.setDetailAddr(userRegisterEntity.getDetailAddr()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 9cc4ad5..40ad8c1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -362,7 +362,7 @@ public class SpsSyncUploadController { if (CollUtil.isNotEmpty(syncDataResponse.getAuthAdminList())) { for (AuthAdmin authAdmin : syncDataResponse.getAuthAdminList()) { authAdmin.setLastModifyTime(null); - authAdmin.setCustomerId(110); + authAdmin.setCustomerId("110"); authAdminService.replaceAuthAdmin(authAdmin); remark.append("用户信息：").append(syncDataResponse.getAuthAdminList().size()).append("条\n"); } 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 ef8f71f..a54e500 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 @@ -96,7 +96,7 @@ public class UdiContrastController { companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setAuditStatus("3"); companyProductRelevanceEntity.setUnitFk(companyEntity.getUnitIdFk()); - companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(temp.getId())); + companyProductRelevanceEntity.setUdiRlIdFk(temp.getId()); companyProductRelevanceEntity.setCustomerId(companyEntity.getCustomerId()); boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 6dab35c..be6a838 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java @@ -270,9 +270,9 @@ public class UdiRelevanceController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - long customerId = customerService.getCustomerId(); + String customerId = customerService.getCustomerId(); - if (customerId != 110) { + if (!customerId.equals("110")) { SupplementRequest supplementRequest = new SupplementRequest(); BeanUtils.copyProperties(udiRelevanceResponse, supplementRequest); String vailResult = supplementVailUtil.vail(supplementRequest, SupplementVailUtil.LOCAL_EIDT); @@ -292,7 +292,7 @@ public class UdiRelevanceController { } else udiRelevanceEntity.setIsUseDy(false); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); - if (customerId != 110) { + if (!customerId.equals("110")) { if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) { CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceService.findCompanyProductRelevanceByUdiRlIdFk(udiRelevanceEntity.getId(), customerId + ""); companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice())); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 3be4668..7e8d6ee 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -122,7 +122,7 @@ public class OrderController { @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/error") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(orderFilterRequest.getCustomerId()); if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); if (companyEntity.getUnitIdFk().equals("110")) { @@ -226,7 +226,7 @@ public class OrderController { if (StringUtils.isBlank(orderFilterRequest.getCustomerId())) return ResultVOUtils.success(); - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(orderFilterRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(orderFilterRequest.getCustomerId()); if (companyEntity.getUnitIdFk().equals("110")) { Integer userId = customerService.getUserId(); orderFilterRequest.setFromCorpId(null); @@ -527,7 +527,6 @@ public class OrderController { updateExportStatusRequest.setOrderId(temp.getOrderIdFk()); AuthAdmin authAdmin = customerService.getUserBean(); - long customerId = customerService.getCustomerId(); return updateReview(authAdmin, updateExportStatusRequest, null); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 216015e..10b15b8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -185,7 +185,7 @@ public class StockOrderController { stockOrderEntity.setBillNo(orderNo); } if (!getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderPostRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(stockOrderPostRequest.getCustomerId()); stockOrderEntity.setCorpId(companyEntity.getUnitIdFk()); stockOrderEntity.setCorpName(companyEntity.getCompanyName()); stockOrderEntity.setCreateUser(null); @@ -281,7 +281,7 @@ public class StockOrderController { List stockOrderEntityList; if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId())); + CompanyEntity companyEntity = companyService.findCompany(stockOrderFilterRequest.getCorpId()); if (companyEntity.getUnitIdFk().equals("110")) { stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(customerService.getUserId() + ""); @@ -327,7 +327,7 @@ public class StockOrderController { stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(userId + ""); } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); + CompanyEntity companyEntity = companyService.findCompany(customerId); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); } 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 4d48c4c..df4b6b9 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 @@ -150,7 +150,7 @@ public class StockQRCodeTextController { public BaseResponse stockQRCodeTextPDFFromTemplateFile( @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID)); + CompanyEntity companyEntity = companyService.findCompany(Constant.SYSTEM_CUSTOMER_ID); SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + ""); if (systemPDFModuleEntity == null) return null; SystemPDFTemplateEntity systemPDFTemplateEntity = @@ -404,7 +404,7 @@ public class StockQRCodeTextController { if (systemPDFTemplateEntity == null) return; int index = 1; - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID));//Long.parseLong(list.get(0).getCustomerId()) + CompanyEntity companyEntity = companyService.findCompany(Constant.SYSTEM_CUSTOMER_ID);//Long.parseLong(list.get(0).getCustomerId()) for (StockOrderPrintEntity stockOrderPrintEntity : list) { stockOrderPrintEntity.setIndex(index + ""); stockOrderPrintEntity.setTitle(companyEntity.getCompanyName()); @@ -447,7 +447,7 @@ public class StockQRCodeTextController { if (systemPDFTemplateEntity == null) return; int index = 1; - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(Constant.SYSTEM_CUSTOMER_ID));//Long.parseLong(list.get(0).getCustomerId()) + CompanyEntity companyEntity = companyService.findCompany(Constant.SYSTEM_CUSTOMER_ID);//Long.parseLong(list.get(0).getCustomerId()) for (StockOrderPrintEntity stockOrderPrintEntity : list) { BeanUtils.copyProperties(stockOrderEntity, stockOrderPrintEntity); stockOrderPrintEntity.setIndex(index + ""); 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 4643389..a860e50 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 @@ -750,7 +750,7 @@ public class WareHouseController { if (addOrderRequest.getCustomerId() != null && (addOrderRequest.getFromCorpId() == null || "".equals(addOrderRequest.getFromCorpId()))) { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany((addOrderRequest.getCustomerId())); addOrderRequest.setFromCorp(companyEntity.getCompanyName()); addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk())); } else { @@ -869,8 +869,8 @@ public class WareHouseController { } Integer userId = customerService.getUserId(); - long customerId = customerService.getCustomerId(); - if (customerId == 110) { + String customerId = customerService.getCustomerId(); + if (customerId.equals("110")) { orderSaveRequest.setCreateUser(userId); } orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction()); @@ -1158,7 +1158,8 @@ public class WareHouseController { @AuthRuleAnnotation("") @PostMapping("warehouse/inout/postOrdersUdims") - public BaseResponse postOrdersUdims(@RequestBody PostUdimsOrderRequest postOrderRequest, BindingResult bindingResult) { + public BaseResponse postOrdersUdims(@RequestBody PostUdimsOrderRequest postOrderRequest, BindingResult + bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -1223,7 +1224,8 @@ public class WareHouseController { */ @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/warehouseUserList") - public BaseResponse getWarehouseUserList(@RequestBody FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) { + public BaseResponse getWarehouseUserList(@RequestBody FilterInvLinkDataRequest + filterInvLinkDataRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -1247,7 +1249,8 @@ public class WareHouseController { @AuthRuleAnnotation("") @PostMapping("/warehouse/inout/warehouseBussniessTypeList") - public BaseResponse getWarehouseBussniessTypeList(@RequestBody FilterInvLinkDataRequest filterInvLinkDataRequest, BindingResult bindingResult) { + public BaseResponse getWarehouseBussniessTypeList(@RequestBody FilterInvLinkDataRequest + filterInvLinkDataRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java index a1164ae..8300cac 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreInProductsController.java @@ -54,7 +54,7 @@ public class InvPreInProductsController { filterInvProductRequest.setCustomerId(null); showSup = true; } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany((filterInvProductRequest.getCustomerId())); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); filterInvProductRequest.setCustomerId(null); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java index 4782140..acfdd5d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvPreProductsController.java @@ -54,7 +54,7 @@ public class InvPreProductsController { filterInvProductRequest.setCustomerId(null); showSup = true; } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany((filterInvProductRequest.getCustomerId())); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); // InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(true, true); filterInvProductRequest.setCustomerId(null); 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 8386608..c827954 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 @@ -96,7 +96,7 @@ public class InvProductsController { } } } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); + CompanyEntity companyEntity = companyService.findCompany(customerId); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); filterInvWarehouseRequest.setSpUse(true); @@ -204,7 +204,7 @@ public class InvProductsController { } } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); + CompanyEntity companyEntity = companyService.findCompany(customerId); filterInvProductDetailRequest.setSupId(companyEntity.getUnitIdFk()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); filterInvProductDetailRequest.setInvStorageCode(invWarehouseEntity.getCode()); @@ -408,7 +408,7 @@ public class InvProductsController { } else { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(filterInvProductRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(filterInvProductRequest.getCustomerId()); filterInvProductRequest.setCustomerId(null); filterInvProductRequest.setSupId(companyEntity.getUnitIdFk()); // InvWarehouseEntity invWarehouseEntity = invWarehouseService.findDefault(false, true); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index f907484..8074633 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -70,7 +70,7 @@ public class InvSubWarehouseController { AuthAdmin authAdmin = customerService.getUserBean(); if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { - if (authAdmin.getCustomerId() == 110) + if (!authAdmin.getCustomerId().equals("110")) filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); } @@ -131,8 +131,8 @@ public class InvSubWarehouseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - if(StrUtil.isEmpty(StrUtil.trimToEmpty(invSubWarehouseEntity.getName()))){ - return ResultVOUtils.error(487,"分库名字不能为空"); + if (StrUtil.isEmpty(StrUtil.trimToEmpty(invSubWarehouseEntity.getName()))) { + return ResultVOUtils.error(487, "分库名字不能为空"); } boolean b = invSubWarehouseService.updateInvSubWarehouse(invSubWarehouseEntity); 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 a40a88c..f97df54 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 @@ -151,7 +151,7 @@ public class InvWarehouseController { filterInvWarehouseRequest.setStatus(1); List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); - if (authAdmin.getCustomerId() != 110) { + if (!authAdmin.getCustomerId().equals("110")) { filterInvWarehouseRequest.setPcode("0"); invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); } else { @@ -182,7 +182,7 @@ public class InvWarehouseController { public BaseResponse filterAllByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { List invWarehouseEntities; AuthAdmin authAdmin = customerService.getUserBean(); - if (authAdmin.getCustomerId() != 110) { + if (!authAdmin.getCustomerId().equals("110")) { filterInvWarehouseRequest.setPcode("0"); filterInvWarehouseRequest.setStatus(1); invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java new file mode 100644 index 0000000..a529801 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertController.java @@ -0,0 +1,120 @@ +package com.glxp.sale.admin.controller.purechase; + +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.util.Date; +import java.util.List; + +@RestController +public class SupCertController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SupCertService supCertService; + + @Value("${file_path}") + private String filePath; + + @AuthRuleAnnotation("") + @GetMapping("/sup/company/cert/filter") + public BaseResponse filterCompanyCert(FilterSupCertRequest filterSupCertRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List supCertEntityList + = supCertService.filterCompanyCert(filterSupCertRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(supCertEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(supCertEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @GetMapping("/sup/info/getCompanyCert") + public BaseResponse getCompanyCert(FilterSupCertRequest filterSupCertRequest) { + filterSupCertRequest.setCustomerId(getCustomerId()); + List companyCertEntities = supCertService.getCompanyCert(filterSupCertRequest); + PageInfo pageInfo = new PageInfo<>(companyCertEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyCertEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/insertCompanyCert") + public BaseResponse insertCompanyCert(@RequestBody SupCertEntity supCertEntity) { + supCertEntity.setCreateTime(new Date()); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + return ResultVOUtils.success("成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/sale/sup/cert/audit") + public BaseResponse auditSupCert(@RequestBody SupCertEntity supCertEntity) { + supCertEntity.setCreateTime(new Date()); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.updateCompanyCert(supCertEntity); + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/updateCompanyCert") + public BaseResponse updateCompanyCert(@RequestBody SupCertEntity supCertEntity) { + + boolean b = supCertService.updateCompanyCert(supCertEntity); + return ResultVOUtils.success("修改成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/info/deleteCompanyCert") + public BaseResponse deleteCompanyCert(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) { + boolean b = supCertService.deleteById(deleteCompanyFileRequest.getId()); + String URL = filePath + "/register/file/image2/" + deleteCompanyFileRequest.getFilePath(); + File file = new File(URL); + if (file.exists() && file.isFile()) { + file.delete(); + } + return ResultVOUtils.success("成功"); + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java new file mode 100644 index 0000000..27b53fc --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java @@ -0,0 +1,193 @@ +package com.glxp.sale.admin.controller.purechase; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.extra.pinyin.PinyinUtil; +import com.github.pagehelper.PageInfo; +import com.glxp.sale.admin.annotation.AuthRuleAnnotation; +import com.glxp.sale.admin.constant.ConstantStatus; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.auth.CustomerContactEntity; +import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.auth.impl.CustomerContactService; +import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; +import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupCompanyService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.common.enums.ResultEnum; +import com.glxp.sale.common.res.BaseResponse; +import com.glxp.sale.common.util.ResultVOUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +@RestController +public class SupCompanyController { + + @Value("${file_path}") + private String filePath; + + @Resource + private AuthAdminService authAdminService; + @Resource + private SupCompanyService companyService; + @Resource + private CustomerContactService customerContactService; + @Resource + private SupCertService supCertService; + @Resource + BasicUnitMaintainService basicUnitMaintainService; + + + @AuthRuleAnnotation("") + @GetMapping("/api/pur/getSupComapnys") + public BaseResponse getSupComapnys(FilterSupCompanyRequest companyRequest) { + List companyEntities = companyService.filterCompany(companyRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/addCompany") + public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { + + String customerId = CustomUtil.getId(); //重新生成customerId + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(customerId); + customerContactService.insertCustomerContact(customerContactEntity); + //更新相关证书对应的customerId + supCertService.updateCustomerId(companyEntity.getCustomerId(), customerId); + companyEntity.setCustomerId(customerId); + + companyEntity.setCreateTime(new Date()); + companyEntity.setUpdateTime(new Date()); + AuthAdmin authAdmin = getUser(); + companyEntity.setCreateBy(authAdmin.getId() + ""); + boolean b = companyService.insertCompany(companyEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/modifyCompany") + public BaseResponse modifyCompany(@RequestBody SupCompanyEntity companyEntity) { + companyEntity.setUpdateTime(new Date()); + boolean b = companyService.modifyCompany(companyEntity); + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(companyEntity.getCustomerId()); + customerContactService.updateCustomerContact(customerContactEntity); + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("/api/pur/auditCompany") + public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { + + + //查询是否包含审核未通过的证书 + if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS + || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + + } + + + AuthAdmin authAdmin = getUser(); + companyEntity.setAuditor(authAdmin.getId() + ""); + companyEntity.setAuditTime(new Date()); + companyEntity.setUpdateTime(new Date()); + boolean b = companyService.modifyCompany(companyEntity); + CustomerContactEntity customerContactEntity = new CustomerContactEntity(); + customerContactEntity.setTel(companyEntity.getTel()); + customerContactEntity.setMobile(companyEntity.getMobile()); + customerContactEntity.setEmail(companyEntity.getEmail()); + customerContactEntity.setContacts(companyEntity.getContacts()); + customerContactEntity.setCustomerId(companyEntity.getCustomerId()); + customerContactService.updateCustomerContact(customerContactEntity); + + BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); + basicUnitMaintainEntity.setErpId(companyEntity.getCustomerId()); + basicUnitMaintainEntity.setName(companyEntity.getCompanyName()); + basicUnitMaintainEntity.setSpell(PinyinUtil.getFirstLetter(companyEntity.getCompanyName(), "")); + basicUnitMaintainEntity.setAddr(companyEntity.getArea() + companyEntity.getDetailAddr()); + basicUnitMaintainEntity.setCreditNo(companyEntity.getCreditNum()); + basicUnitMaintainEntity.setContact(companyEntity.getContacts()); + basicUnitMaintainEntity.setMobile(companyEntity.getMobile()); + basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); + basicUnitMaintainEntity.setUpdateTime(new Date()); + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + + return ResultVOUtils.success("修改成功"); + } + + + @AuthRuleAnnotation("") + @PostMapping("api/pur/supCompany/delete") + public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { + boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } + + public AuthAdmin getUser() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java similarity index 96% rename from api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java rename to api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java index a56cbe1..21f13bf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerContactController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupContactController.java @@ -1,4 +1,4 @@ -package com.glxp.sale.admin.controller.auth; +package com.glxp.sale.admin.controller.purechase; import com.github.pagehelper.PageInfo; @@ -19,7 +19,7 @@ import java.util.List; @RestController @Slf4j -public class CustomerContactController { +public class SupContactController { @Resource private CustomerContactService customerContactService; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java new file mode 100644 index 0000000..33b8b7b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java @@ -0,0 +1,170 @@ +package com.glxp.sale.admin.controller.purechase; + +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.constant.ConstantStatus; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.DeleteRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupCompanyService; +import com.glxp.sale.admin.service.purchase.SupManufacturerService; +import com.glxp.sale.common.enums.ResultEnum; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +@RestController +public class SupManufacturerController { + + + @Resource + private AuthAdminService authAdminService; + @Resource + private SupManufacturerService supManufacturerService; + @Resource + private SupCertService supCertService; + @Resource + private SupCompanyService supCompanyService; + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyInfo") + public BaseResponse getCompanyInfo(FilterSupManufacturerRequest filterSupManufacturerRequest) { + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findCompany(filterSupManufacturerRequest.getId()); + if (supManufacturerEntity != null) { + return ResultVOUtils.success(supManufacturerEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/getCompanyList") + public BaseResponse getCompanyList(FilterSupManufacturerRequest filterSupManufacturerRequest) { + List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/manufacturer/addCompany") + public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { + supManufacturerEntity.setCreateDate(new Date()); + supManufacturerEntity.setUpdateDate(new Date()); + boolean b = supManufacturerService.insertCompany(supManufacturerEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/manufacturer/modifyCompany") + public BaseResponse modifyCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) { + + if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + //提交审核 + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId()); + if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！"); + } + } + + supManufacturerEntity.setUpdateDate(new Date()); + SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId()); + boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); + //修改证书对应的供应商ID，生产企业ID + supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId()); + + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/sup/manufacturer/audit") + public BaseResponse auditMmanufacturer(@RequestBody SupManufacturerEntity supManufacturerEntity) { + + if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + // 查询是否包含审核未通过的证书 + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || + supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(supManufacturerEntity.getCustomerId()); + filterSupCertRequest.setManufacturerIdFk(supManufacturerEntity.getManufacturerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + } + + supManufacturerEntity.setUpdateDate(new Date()); + SupManufacturerEntity originEntity = supManufacturerService.findCompany(supManufacturerEntity.getId()); + boolean b = supManufacturerService.modifyCompany(supManufacturerEntity); + //修改证书对应的供应商ID，生产企业ID + supCertService.updateManufacturerId(originEntity.getCustomerId(), supManufacturerEntity.getCustomerId(), originEntity.getManufacturerId(), supManufacturerEntity.getManufacturerId()); + + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @GetMapping("/sup/manufacturer/basic/delete") + public BaseResponse deleteContact(DeleteRequest deleteRequest) { + boolean b = supManufacturerService.deleteById(deleteRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java new file mode 100644 index 0000000..946496c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java @@ -0,0 +1,249 @@ +package com.glxp.sale.admin.controller.purechase; + +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.constant.ConstantStatus; +import com.glxp.sale.admin.entity.auth.AuthAdmin; +import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; +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.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.sale.admin.exception.JsonException; +import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; +import com.glxp.sale.admin.req.purchase.FilterPoductRequest; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.res.PageSimpleResponse; +import com.glxp.sale.admin.res.purchase.SupProductResponse; +import com.glxp.sale.admin.service.auth.AuthAdminService; +import com.glxp.sale.admin.service.basic.BasicThirdSysService; +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.purchase.SupCertService; +import com.glxp.sale.admin.service.purchase.SupProductService; +import com.glxp.sale.admin.service.thrsys.ThrProductsService; +import com.glxp.sale.admin.util.CustomUtil; +import com.glxp.sale.admin.util.DateUtil; +import com.glxp.sale.admin.util.GennerOrderUtils; +import com.glxp.sale.admin.util.UdiInfoUtil; +import com.glxp.sale.common.enums.ResultEnum; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; +import java.util.List; + +@RestController +public class SupProductController { + @Resource + private AuthAdminService authAdminService; + @Resource + private SupProductService supProductService; + @Resource + BasicThirdSysService basicThirdSysService; + @Resource + GennerOrderUtils gennerOrderUtils; + @Resource + ThrProductsService thrProductsService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UdiInfoService udiInfoService; + @Resource + private SupCertService supCertService; + @Resource + CompanyProductRelevanceService companyProductRelevanceService; + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/getRegistrationInfo") + public BaseResponse getRegistrationInfo(FilterPoductRequest filterPoductRequest) { + SupProductEntity supProductEntity = supProductService.findRegistration(filterPoductRequest.getId()); + if (supProductEntity != null) { + return ResultVOUtils.success(supProductEntity); + } + return ResultVOUtils.error(500, "企业信息为空"); + } + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/getRegistrationList") + public BaseResponse getRegistrationList(FilterPoductRequest filterPoductRequest) { + List companyEntities = supProductService.getRegistration(filterPoductRequest); + PageInfo pageInfo = new PageInfo<>(companyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(companyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/addRegistration") + public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) { + supProductEntity.setCreate_date(new Date()); + supProductEntity.setUpdate_date(new Date()); + boolean b = supProductService.insertRegistration(supProductEntity); + if (b) { + return ResultVOUtils.success("添加成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + @AuthRuleAnnotation("") + @PostMapping("/sup/product/modifyRegistration") + public BaseResponse modifyRegistration(@RequestBody SupProductEntity supProductEntity) { + + if (StrUtil.isEmpty(supProductEntity.getProductId()) || StrUtil.isEmpty(supProductEntity.getManufacturerIdFk()) || StrUtil.isEmpty(supProductEntity.getCustomerId())) { + return ResultVOUtils.error(500, "参数错误！"); + } + supProductEntity.setUpdate_date(new Date()); + SupProductEntity originEntity = supProductService.findRegistration(supProductEntity.getId()); + supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(), + supProductEntity.getManufacturerIdFk(), originEntity.getProductId(), supProductEntity.getProductId()); + boolean b = supProductService.modifyRegistration(supProductEntity); + if (b) { + return ResultVOUtils.success("修改成功"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @PostMapping("/udiwms/pur/suppliers/product/audit") + public BaseResponse auditProduct(@RequestBody SupProductEntity supProductEntity) { + + if (supProductEntity.getAuditStatus() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + + + // 查询是否包含审核未通过的证书 + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || + supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setAuditStatus(24); + filterSupCertRequest.setCustomerId(supProductEntity.getCustomerId()); + filterSupCertRequest.setManufacturerIdFk(supProductEntity.getManufacturerIdFk()); + filterSupCertRequest.setProductIdFk(supProductEntity.getProductId()); + filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + if (CollUtil.isNotEmpty(supCertEntityList)) { + return ResultVOUtils.error(500, "审核失败，剩余" + supCertEntityList.size() + "个证书还未审核或审核未通过！"); + } + } + + + supProductEntity.setUpdate_date(new Date()); + boolean b = supProductService.modifyRegistration(supProductEntity); + + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS) { + SupProductResponse supProductResponse = supProductService.findJoinRegistration(supProductEntity.getId()); + + //步骤1：先添加到主系统第三方产品信息； + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + thrProductsEntity.setCode(gennerOrderUtils.getRelId() + ""); + thrProductsEntity.setThirdSysFk(basicThirdSysEntity.getThirdId()); + thrProductsEntity.setName(supProductEntity.getRecordProductName()); + thrProductsEntity.setSpec(supProductEntity.getSpecification()); + thrProductsEntity.setStandard(supProductEntity.getSpecification()); + thrProductsEntity.setManufactory(supProductResponse.getManufacturerName()); + thrProductsService.insertThrProducts(thrProductsEntity); + + + //步骤2：添加到关联表 + String uuid = CustomUtil.getUUId(); + UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); + udiRelevanceEntity.setThirdId(thrProductsEntity.getCode()); + udiRelevanceEntity.setThirdName(thrProductsEntity.getName()); + udiRelevanceEntity.setMainId(thrProductsEntity.getCode()); + udiRelevanceEntity.setMainName(thrProductsEntity.getName()); + udiRelevanceEntity.setMeasname(thrProductsEntity.getMeasname()); + String time = DateUtil.getDateTime(); + udiRelevanceEntity.setUpdateTime(time); + udiRelevanceEntity.setModifyTime(time); + udiRelevanceEntity.setUuid(uuid); + udiRelevanceEntity.setManufactory(supProductResponse.getManufacturerName()); + udiRelevanceEntity.setSupName(supProductResponse.getSupName()); + udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + ""); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + + + //步骤3：添加基础信息表 + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + udiInfoEntity.setNameCode(thrProductsEntity.getCode()); + udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); + udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); + udiInfoEntity.setYlqxzcrbarmc(supProductEntity.getRecordPeopleName()); + udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); + udiInfoEntity.setZczbhhzbapzbh(supProductEntity.getRecordCode()); + udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(1); + udiInfoEntity.setScbssfbhph("是"); + udiInfoEntity.setScbssfbhscrq("是"); + udiInfoEntity.setScbssfbhsxrq("是"); + udiInfoEntity.setScbssfbhxlh("否"); + udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); + udiInfoService.insertUdiInfo(udiInfoEntity); + + + //步骤4：添加供应商关联表 + CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); + companyProductRelevanceEntity.setCreate_time(new Date()); + companyProductRelevanceEntity.setUpdate_time(new Date()); + companyProductRelevanceEntity.setAuditStatus("3"); + companyProductRelevanceEntity.setUnitFk(supProductResponse.getCustomerId()); + companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceEntity.getId()); + companyProductRelevanceEntity.setCustomerId(supProductResponse.getCustomerId()); + companyProductRelevanceEntity.setProductId(supProductEntity.getProductId()); + companyProductRelevanceEntity.setRegistrationId(supProductEntity.getProductId()); + companyProductRelevanceEntity.setEnterpriseId(supProductEntity.getManufacturerIdFk()); + companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity); + + + } + + if (b) { + return ResultVOUtils.success("审核通过！"); + } else { + return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + } + } + + + @AuthRuleAnnotation("") + @GetMapping("/sup/product/delete") + public BaseResponse delete(DeleteCompanyFileRequest deleteCompanyFileRequest) { + boolean b = supProductService.deleteById(deleteCompanyFileRequest.getId()); + if (b) + return ResultVOUtils.success("删除成功"); + else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + public String getCustomerId() { + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + if (attributes == null) { + throw new JsonException(ResultEnum.NOT_NETWORK); + } + HttpServletRequest request = attributes.getRequest(); + String userId = request.getHeader("ADMIN_ID"); + AuthAdmin authAdmin = authAdminService.findById(Long.parseLong(userId)); + return authAdmin.getCustomerId() + ""; + } +} 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 e5b18b4..f294914 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 @@ -50,8 +50,8 @@ public class ThrProductsAddController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - Long customerId = customerService.getCustomerId(); - if (customerId != 110) { + String customerId = customerService.getCustomerId(); + if (!customerId.equals("110")) { filterThrProductsRequest.setCustomerId(customerId + ""); } else { filterThrProductsRequest.setCustomerId(filterThrProductsRequest.getSupId()); 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 6e933ac..5e1b4b1 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 @@ -195,7 +195,7 @@ public class ThrProductsAddDiController { //回填关联关系到关联表 CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); companyProductRelevanceEntity.setCustomerId(thrProductsAddDiEntity.getCustomerId()); - companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk.intValue()); + companyProductRelevanceEntity.setUdiRlIdFk(udiRelIdFk + ""); companyProductRelevanceEntity.setCreate_time(new Date()); companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setUnitFk(thrProductsAddDiEntity.getCustomerId().toString()); @@ -237,10 +237,10 @@ public class ThrProductsAddDiController { if (null != deleteRequest && deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiService.filterThrProductsGetId(Integer.valueOf(deleteRequest.getId())); - if(thrProductsAddDiEntity!=null){ - if(thrProductsAddDiEntity.getStatus()!=1){ - return ResultVOUtils.error(877,"审批状态发生改变请刷新页面重新操作！"); + ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiService.filterThrProductsGetId(Integer.valueOf(deleteRequest.getId())); + if (thrProductsAddDiEntity != null) { + if (thrProductsAddDiEntity.getStatus() != 1) { + return ResultVOUtils.error(877, "审批状态发生改变请刷新页面重新操作！"); } } thrProductsAddDiService.delThrDiProducts(Long.valueOf(deleteRequest.getId())); 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 bd3f90a..d8b2d75 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 @@ -22,11 +22,11 @@ public interface CustomerInfoDao { boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity); - boolean deleteById(Long customerId); + boolean deleteById(String customerId); - CustomerInfoEntity selectById(Long customerId); + CustomerInfoEntity selectById(String customerId); - CustomerDetailEntity selectDetail(Long customerId); + CustomerDetailEntity selectDetail(String customerId); CustomerInfoEntity isExitRoleId(String roleId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java index a28716d..61f2725 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyCertDao.java @@ -11,7 +11,7 @@ public interface CompanyCertDao { List filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); - CompanyCertEntity findCompanyCert(Long CustomerId); + CompanyCertEntity findCompanyCert(String CustomerId); CompanyCertEntity findCompanyCertByName(String name); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java index e8e05dc..a7b1245 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyDao.java @@ -10,7 +10,7 @@ import java.util.List; @Mapper public interface CompanyDao { - CompanyEntity findCompany(Long CustomerId); + CompanyEntity findCompany(String CustomerId); CompanyEntity findCompanyByName(String companyName); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyProductRelevanceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyProductRelevanceDao.java index 6f5586e..e8cbca2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyProductRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyProductRelevanceDao.java @@ -16,7 +16,7 @@ public interface CompanyProductRelevanceDao { List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId); CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java index 33b445b..738aed7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanDao.java @@ -11,7 +11,7 @@ public interface CompanySalesmanDao { List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); - CompanySalesmanEntity findCompanySalesman(Long CustomerId); + CompanySalesmanEntity findCompanySalesman(String CustomerId); CompanySalesmanEntity findCompanySalesmanByName(String name); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java index 9d022ef..b0f8bf6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanySalesmanUpdateLogDao.java @@ -11,7 +11,7 @@ public interface CompanySalesmanUpdateLogDao { List filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); - CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId); + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId); CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java index 5bc23d4..e8d1e22 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/info/CompanyUpdateLogDao.java @@ -11,7 +11,7 @@ public interface CompanyUpdateLogDao { List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); - CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId); CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java new file mode 100644 index 0000000..4704cb9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java @@ -0,0 +1,35 @@ +package com.glxp.sale.admin.dao.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupCertDao { + + List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); + + + SupCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterSupCertRequest filterSupCertRequest); + + boolean updateCompanyCert(SupCertEntity supCertEntity); + + boolean insertCompanyCert(SupCertEntity supCertEntity); + + boolean deleteById(String id); + + boolean updateCustomerId(@Param("oldId") String oldId, @Param("newId") String newId); + + boolean updateManufacturerId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, + @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk); + + boolean updateProductId(@Param("oldCustomerId") String oldCustomerId, @Param("newCustomerId") String newCustomerId, + @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk, + @Param("oldProductIdFk") String oldProductIdFk, @Param("newProductIdFk") String newProductIdFk); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCompanyDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCompanyDao.java new file mode 100644 index 0000000..76dbea9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCompanyDao.java @@ -0,0 +1,28 @@ +package com.glxp.sale.admin.dao.purchase; + +import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface SupCompanyDao { + + SupCompanyEntity findCompany(String CustomerId); + + SupCompanyEntity findCompanyByName(String companyName); + + List getSubCompany(FilterSupCompanyRequest companyRequest); + + List getSubCompany2(FilterSupCompanyRequest companyRequest); + + List filterCompany(FilterSupCompanyRequest companyRequest); + + boolean modifyCompany(SupCompanyEntity companyEntity); + + boolean insertCompany(SupCompanyEntity companyEntity); + + boolean deleteCompany(Long customerId); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java new file mode 100644 index 0000000..c611b23 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.dao.purchase; + +import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupManufacturerDao { + + SupManufacturerEntity findCompany(Long id); + + SupManufacturerEntity findCompanyByName(String companyName); + + List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); + + boolean modifyCompany(SupManufacturerEntity supManufacturerEntity); + + boolean insertCompany(SupManufacturerEntity supManufacturerEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java new file mode 100644 index 0000000..a465c8e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupProductDao.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.dao.purchase; + +import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.req.purchase.FilterPoductRequest; +import com.glxp.sale.admin.res.purchase.SupProductResponse; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface SupProductDao { + + SupProductEntity findRegistration(Long id); + + SupProductEntity findRegistrationByName(String recordProductName); + + List getRegistration(FilterPoductRequest filterPoductRequest); + + boolean modifyRegistration(SupProductEntity supProductEntity); + + boolean insertRegistration(SupProductEntity supProductEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java index edc3a36..ec4efa5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/AuthAdmin.java @@ -26,7 +26,7 @@ public class AuthAdmin { private Date lastModifyTime; private String comments; private String employeeName; - private long CustomerId; + private String CustomerId; private String locInvCode; private String locSubInvCode; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java index f8bcfa9..e1943aa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerContactEntity.java @@ -6,7 +6,7 @@ import lombok.Data; public class CustomerContactEntity { private Long id; - private Long customerId; + private String customerId; private String contacts; private String mobile; private String tel; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java index df733da..af19048 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/CustomerDetailEntity.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CustomerDetailEntity { - private Long customerId; + private String customerId; private String customerName; private String creditNum; private String area; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java index 38e5af4..8f2c0e4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/auth/UpdateUserflagBean.java @@ -4,6 +4,6 @@ import lombok.Data; @Data public class UpdateUserflagBean { - private Long CustomerId; + private String CustomerId; private Integer userFlag; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java index 6f90a44..0fa543a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java @@ -18,7 +18,7 @@ public class CompanyEntity { private String detailAddr; private String appId; private String appSecret; - private Long customerId; + private String customerId; private String contacts; private String mobile; private String tel; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java index 0b895dd..2de80d0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyProductRelevanceEntity.java @@ -11,16 +11,16 @@ import java.util.Date; public class CompanyProductRelevanceEntity { private Integer id; - private Long customerId; - private Long productId; - private Long enterpriseId; - private Long registrationId; + private String customerId; + private String productId; + private String enterpriseId; + private String registrationId; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date create_time; private Date update_time; private String auditStatus; private String productUuid; - private Integer udiRlIdFk; + private String udiRlIdFk; private String unitFk; private BigDecimal price; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java index 6b81227..948a389 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyUpdateLogEntity.java @@ -9,7 +9,7 @@ import java.util.Date; public class CompanyUpdateLogEntity { private Integer id; - private Long customerId; + private String customerId; private String updateCause; private String status; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/CustomerContactEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/CustomerContactEntity.java new file mode 100644 index 0000000..aab655a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/CustomerContactEntity.java @@ -0,0 +1,15 @@ +package com.glxp.sale.admin.entity.purchase; + +import lombok.Data; + +@Data +public class CustomerContactEntity { + + private Long id; + private String customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + private String comments; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java new file mode 100644 index 0000000..09bd6e6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCertEntity.java @@ -0,0 +1,32 @@ +package com.glxp.sale.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +//供应商企业资质表 + +@Data +public class SupCertEntity { + + private Integer id; + private String customerId; + private String name; + private String code; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date vailDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date expireDate; + private Integer type; //证书类型：1:供应商；2.生产企业；3.产品品种 + private String manufacturerIdFk; + private String productIdFk; + private Integer auditStatus; //审核状态 0：草稿，4：申请变更，3：允许变更，5：拒绝变更，6：未审核，1：通过，2：不通过 + private String auditComment; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java new file mode 100644 index 0000000..a217d72 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupCompanyEntity.java @@ -0,0 +1,78 @@ +package com.glxp.sale.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SupCompanyEntity { + + private String companyName; //企业名称 + private Integer bussinessStatus; //企业类型 + private String creditNum; //统一社会信用代码 + private String classes; //企业类别 //企业类别：1.生产企业，2.流通企业，3。医疗机构 + + private String area; + private String areaCode; + private String detailAddr; + private String appId; + private String appSecret; + private String customerId; + private String contacts; + private String mobile; + private String tel; + private String email; + + private String refEntId; + private String entId; + private int networkType; + private int certIdFk; + + private String parentCompany; + private String parentIdFk; + + private String contactsPapersType; + private String contactsPapersCode; + private String registerStatus; + private String jyxkzh; + private String jyxkzfzjg; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date jyxkzyxq; + private String jybapzh; + private String jybabm; + + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd") + private Date fzrq; + private String suihao; + private String kaihuhang; + private String kaihuzhanghao; + + private Integer auditStatus; + private String unitIdFk; + + private String filePath; + private String newFilePath; + private String filePath2; + private String newFilePath2; + private String filePath3; + private String newFilePath3; + private String filePath4; + private String newFilePath4; + + private String updateCause; + private String newAuditStatus; + private String noPassCause; + private String auditor; + + private String auditStatusList; + + private Date createTime; + private String createBy; + private Date updateTime; + private Date auditTime; + private String auditComment; + private Integer editStatus; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java new file mode 100644 index 0000000..24aa8d4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupManufacturerEntity.java @@ -0,0 +1,40 @@ +package com.glxp.sale.admin.entity.purchase; + +import lombok.Data; + +import java.util.Date; + +@Data +public class SupManufacturerEntity { + + private Long id; + private String companyName; + private String creditCode; + private String companyType; + private String placeArea; + private String placeAreaCode; + private String placeAddress; + private String detailAddr; + private String legalPersonName; + private String legalPersonPapersType; + private String legalPersonPapersCode; + private String productionArea; + private String productionAreaCode; + private String productionAddress; + private String registerStatus; + private String productionLicenceNum; + private Date productionLicenceDate; + private String productionRecordNum; + private String productionRecordSection; + private Date productionRecordDate; + private String remark; + private Date createDate; + private Date updateDate; + private String customerId; + private String manufacturerId; + + private Integer auditStatus; + private String supName; + private String auditComment; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java new file mode 100644 index 0000000..39cdc02 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/SupProductEntity.java @@ -0,0 +1,58 @@ +package com.glxp.sale.admin.entity.purchase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +@Data +public class SupProductEntity { + + private Long id; + private String productId; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String productManageType; + private String recordPeopleName; + private String recordPeopleArea; + private String recordPeopleAreaCode; + private String recordPeopleAddress; + private String productType; + private String productDirectoryCode; + private String agentName; + private String agentArea; + private String agentAreaCode; + private String agentAddress; + private String instructions; + private String productAddress; + private String recordText; + private String placeOrigin; + private String productionRegion; + private String productionCompanyName; + private String afterSale; + private String specification; + private String structure; + private String scope; + private String other; + private String filePath; + private String remark; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date create_date; + private Date update_date; + + private String newFilePath; + private String newInstructions; + + private String manufacturerIdFk; + private String customerId; + + + private Integer auditStatus; + private String auditComment; + private String sptm; + private String ybbm; + private String measname; + private String cpms; + +} 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 349b582..49e2b22 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 @@ -20,7 +20,7 @@ public class ThrProductsAddDiEntity { /** * 添加此产品的客户ID */ - private Long customerId; + private String customerId; /** * 添加时间 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 002324f..790867d 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 @@ -8,7 +8,7 @@ public class CustomerInfoFilterRequest extends ListPageRequest { private String key; private String customerName; - private long customerId; + private String 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 a05b023..828162b 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 @@ -18,7 +18,7 @@ public class CombineRequest { private Boolean isRlInv; private FilterErpGoodsRequest query; private String erpId; - private Long customerId; + private String customerId; private Boolean supEnable; private String manufactory; private String measname; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java index 601be80..d52fd77 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoExportRequest.java @@ -10,7 +10,7 @@ public class UdiInfoExportRequest extends ListPageRequest { List rlIds; List uuids; - private Long customerId; + private String customerId; private String ylqxzcrbarmc; private String cpmctymc; private String nameCode; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java index 16d1df4..4bb1b3d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/info/CompanyRequest.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class CompanyRequest { - private Long customerId; + private String customerId; private String companyName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java new file mode 100644 index 0000000..3c8432e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterPoductRequest.java @@ -0,0 +1,20 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterPoductRequest extends ListPageRequest { + + private Long id; + private Long enterpriseId; + private String recordCode; + private String recordProductName; + private String recordPeopleName; + + + private String productId; + private String manufacturerIdFk; + private String customerId; + private Integer auditStatus; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java new file mode 100644 index 0000000..2c48591 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCertRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSupCertRequest extends ListPageRequest { + + private String code; + private String customerId; + private String name; + private String manufacturerIdFk; + private String productIdFk; + private Integer auditStatus; + private Integer type; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java new file mode 100644 index 0000000..15bca9b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupCompanyRequest.java @@ -0,0 +1,18 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class FilterSupCompanyRequest extends ListPageRequest { + + private String customerId; + private String companyName; + private String creditNum; + private String auditStatus; + private String unitIdFk; + + private List auditStatusList; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java new file mode 100644 index 0000000..1c10762 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterSupManufacturerRequest.java @@ -0,0 +1,16 @@ +package com.glxp.sale.admin.req.purchase; + +import com.glxp.sale.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterSupManufacturerRequest extends ListPageRequest { + + private Long id; + private String companyName; + private String creditCode; + private String placeArea; + private String customerId; + private Integer auditStatus; + private String manufacturerId; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java index 814f512..a9f1daa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/auth/LoginUserInfoResponse.java @@ -14,7 +14,7 @@ public class LoginUserInfoResponse { private String userName; private String employeeName; private String avatar; - private Long CustomerId; + private String CustomerId; private String companyName; // 权限列表 private List authRules; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/SupProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/SupProductResponse.java new file mode 100644 index 0000000..d944536 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/purchase/SupProductResponse.java @@ -0,0 +1,12 @@ +package com.glxp.sale.admin.res.purchase; + +import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import lombok.Data; + +@Data +public class SupProductResponse extends SupProductEntity { + + + private String supName; + private String manufacturerName; +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java index 73c7f2d..06dcbae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/thrsys/ThrProductsAddDiResponse.java @@ -25,7 +25,7 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity { private int status; - private Long customerId; + private String customerId; private String remark; 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 e60afed..bc1ece2 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 @@ -18,11 +18,11 @@ public interface CustomerInfoService { boolean modifyCustomerInfo(CustomerDetailEntity customerDetailEntity); - boolean deleteById(Long id); + boolean deleteById(String id); - CustomerInfoEntity selectById(Long customerId); + CustomerInfoEntity selectById(String customerId); boolean isExitRoleId(String roleId); - CustomerDetailEntity selectDetail(Long customerId); + CustomerDetailEntity selectDetail(String customerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java index c64d8b1..76f5ce9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/auth/CustomerService.java @@ -37,7 +37,7 @@ public class CustomerService { return Integer.parseInt(userId); } - public long getCustomerId() { + public String getCustomerId() { AuthAdmin authAdmin = getUserBean(); return authAdmin.getCustomerId(); } 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 fc08420..6b02edd 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 @@ -53,7 +53,9 @@ public class AuthLoginServiceImpl implements AuthLoginService { List roleIds; AuthAdmin authAdmin = authAdminService.findById(adminId); - if (authAdmin.getCustomerId() != 110) { + + + if (!authAdmin.getCustomerId().equals("110")) { CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(authAdmin.getCustomerId()); roleIds = new ArrayList<>(); roleIds.add(Long.parseLong(customerInfoEntity.getRoleId())); 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 afbab85..4cada54 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 @@ -79,12 +79,12 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { } @Override - public boolean deleteById(Long id) { + public boolean deleteById(String id) { return customerInfoDao.deleteById(id); } @Override - public CustomerInfoEntity selectById(Long customerId) { + public CustomerInfoEntity selectById(String customerId) { return customerInfoDao.selectById(customerId); } @@ -97,7 +97,7 @@ public class CustomerInfoServiceImpl implements CustomerInfoService { } @Override - public CustomerDetailEntity selectDetail(Long customerId) { + public CustomerDetailEntity selectDetail(String customerId) { return customerInfoDao.selectDetail(customerId); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java index 3dfae8d..0728a0f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyCertService.java @@ -15,7 +15,7 @@ public interface CompanyCertService { List filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest); - CompanyCertEntity findCompanyCert(Long CustomerId); + CompanyCertEntity findCompanyCert(String CustomerId); CompanyCertEntity findCompanyCertByName(String name); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyProductRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyProductRelevanceService.java index 65cdcb3..ff9c8f3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyProductRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyProductRelevanceService.java @@ -15,7 +15,7 @@ public interface CompanyProductRelevanceService { List filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); - CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId); + CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId); CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java index e1f167c..a4fad08 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanService.java @@ -12,7 +12,7 @@ public interface CompanySalesmanService { List filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest); - CompanySalesmanEntity findCompanySalesman(Long CustomerId); + CompanySalesmanEntity findCompanySalesman(String CustomerId); CompanySalesmanEntity findCompanySalesmanByName(String name); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java index 2154d20..cb0f82e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanySalesmanUpdateLogService.java @@ -12,7 +12,7 @@ public interface CompanySalesmanUpdateLogService { List filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest); - CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId); + CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId); CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java index d7e99b6..680085b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyService.java @@ -13,7 +13,7 @@ public interface CompanyService { List filterCompany(FilterCompanyRequest companyRequest); - CompanyEntity findCompany(Long CustomerId); + CompanyEntity findCompany(String CustomerId); List getSubCompany(FilterCompanyRequest commitRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java index bdb4850..080aeb7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/CompanyUpdateLogService.java @@ -12,7 +12,7 @@ public interface CompanyUpdateLogService { List filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest); - CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId); + CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId); CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java index b823abd..17eb58c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyCertServiceImpl.java @@ -35,7 +35,7 @@ public class CompanyCertServiceImpl implements CompanyCertService { } @Override - public CompanyCertEntity findCompanyCert(Long CustomerId) { + public CompanyCertEntity findCompanyCert(String CustomerId) { return companyCertDao.findCompanyCert(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java index 0e92d2c..619945c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyProductRelevanceServiceImpl.java @@ -46,7 +46,7 @@ public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevan } @Override - public CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId) { + public CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId) { return companyProductRelevanceDao.findCompanyProductRelevance(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java index 54461bd..00f7a37 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanServiceImpl.java @@ -30,7 +30,7 @@ public class CompanySalesmanServiceImpl implements CompanySalesmanService { } @Override - public CompanySalesmanEntity findCompanySalesman(Long CustomerId) { + public CompanySalesmanEntity findCompanySalesman(String CustomerId) { return companySalesmanDao.findCompanySalesman(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java index 6aa36ad..e8661e1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanySalesmanUpdateLogServiceImpl.java @@ -30,7 +30,7 @@ public class CompanySalesmanUpdateLogServiceImpl implements CompanySalesmanUpdat } @Override - public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId) { + public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId) { return companySalesmanUpdateLogDao.findCompanySalesmanUpdateLog(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java index 6bb0369..245fccf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyServiceImpl.java @@ -35,7 +35,7 @@ public class CompanyServiceImpl implements CompanyService { } @Override - public CompanyEntity findCompany(Long CustomerId) { + public CompanyEntity findCompany(String CustomerId) { return companyDao.findCompany(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java index 1d887e3..52856c7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/info/impl/CompanyUpdateLogServiceImpl.java @@ -30,7 +30,7 @@ public class CompanyUpdateLogServiceImpl implements CompanyUpdateLogService { } @Override - public CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId) { + public CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId) { return companyUpdateLogDao.findCompanyUpdateLog(CustomerId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java new file mode 100644 index 0000000..b61f6cb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java @@ -0,0 +1,28 @@ +package com.glxp.sale.admin.service.purchase; + + +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; + +import java.util.List; + +public interface SupCertService { + + List filterCompanyCert(FilterSupCertRequest filterSupCertRequest); + + SupCertEntity findCompanyCertByName(String name); + + List getCompanyCert(FilterSupCertRequest filterSupCertRequest); + + boolean updateCompanyCert(SupCertEntity supCertEntity); + + boolean updateCustomerId(String oldId, String newId); + + boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk); + + boolean updateProductId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk, String oldProductIdFk, String newProductIdFk); + + boolean insertCompanyCert(SupCertEntity supCertEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCompanyService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCompanyService.java new file mode 100644 index 0000000..9b86dcb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCompanyService.java @@ -0,0 +1,30 @@ +package com.glxp.sale.admin.service.purchase; + + + +import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; + +import java.util.List; + +public interface SupCompanyService { + + SupCompanyEntity findCompanyByUnitFk(String unitFk); + + List filterCompany(FilterSupCompanyRequest companyRequest); + + SupCompanyEntity findCompany(String CustomerId); + + List getSubCompany(FilterSupCompanyRequest commitRequest); + + List getSubCompany2(FilterSupCompanyRequest commitRequest); + + SupCompanyEntity findCompanyByName(String companyName); + + boolean modifyCompany(SupCompanyEntity companyEntity); + + boolean insertCompany(SupCompanyEntity companyEntity); + + + boolean deleteCompany(Long customerId); +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java new file mode 100644 index 0000000..9a6b7ea --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java @@ -0,0 +1,24 @@ +package com.glxp.sale.admin.service.purchase; + + + +import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; + +import java.util.List; + +public interface SupManufacturerService { + + SupManufacturerEntity findCompany(Long id); + + SupManufacturerEntity findCompanyByName(String companyName); + + List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest); + + boolean modifyCompany(SupManufacturerEntity supManufacturerEntity); + + boolean insertCompany(SupManufacturerEntity supManufacturerEntity); + + boolean deleteById(String id); + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java new file mode 100644 index 0000000..065fa71 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupProductService.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.service.purchase; + +import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.req.purchase.FilterPoductRequest; +import com.glxp.sale.admin.res.purchase.SupProductResponse; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface SupProductService { + + SupProductEntity findRegistration(Long id); + + SupProductResponse findJoinRegistration(Long id); + + SupProductEntity findRegistrationByName(String recordProductName); + + List getRegistration(FilterPoductRequest filterPoductRequest); + + boolean modifyRegistration(SupProductEntity supProductEntity); + + boolean insertRegistration(SupProductEntity supProductEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java new file mode 100644 index 0000000..99b3079 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java @@ -0,0 +1,78 @@ +package com.glxp.sale.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.purchase.SupCertDao; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCertRequest; +import com.glxp.sale.admin.service.purchase.SupCertService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCertServiceImpl implements SupCertService { + + @Resource + SupCertDao supCertDao; + + @Override + public List filterCompanyCert(FilterSupCertRequest filterSupCertRequest) { + if (filterSupCertRequest == null) { + return Collections.emptyList(); + } + if (filterSupCertRequest.getPage() != null) { + int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + } + return supCertDao.filterCompanyCert(filterSupCertRequest); + } + + + @Override + public List getCompanyCert(FilterSupCertRequest filterSupCertRequest) { + if (filterSupCertRequest == null) { + return Collections.emptyList(); + } + int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupCertRequest.getLimit()); + List companyEntities = supCertDao.getCompanyCert(filterSupCertRequest); + return companyEntities; + } + + @Override + public SupCertEntity findCompanyCertByName(String companyName) { + return supCertDao.findCompanyCertByName(companyName); + } + + @Override + public boolean updateCompanyCert(SupCertEntity supCertEntity) { + return supCertDao.updateCompanyCert(supCertEntity); + } + + @Override + public boolean updateCustomerId(String oldId, String newId) { + return supCertDao.updateCustomerId(oldId, newId); + } + + @Override + public boolean updateManufacturerId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk) { + return supCertDao.updateManufacturerId(oldCustomerId, newCustomerId, oldManufacturerIdFk, newManufacturerIdFk); + } + + @Override + public boolean updateProductId(String oldCustomerId, String newCustomerId, String oldManufacturerIdFk, String newManufacturerIdFk, String oldProductIdFk, String newProductIdFk) { + return supCertDao.updateProductId(oldCustomerId, newCustomerId, oldManufacturerIdFk, newManufacturerIdFk, oldProductIdFk, newProductIdFk); + } + + @Override + public boolean insertCompanyCert(SupCertEntity supCertEntity) { + return supCertDao.insertCompanyCert(supCertEntity); + } + + @Override + public boolean deleteById(String id) { + return supCertDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java new file mode 100644 index 0000000..93aecc6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCompanyServiceImpl.java @@ -0,0 +1,83 @@ +package com.glxp.sale.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.purchase.SupCompanyDao; +import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; +import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; +import com.glxp.sale.admin.service.purchase.SupCompanyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupCompanyServiceImpl implements SupCompanyService { + + @Resource + SupCompanyDao supCompanyDao; + + @Override + public SupCompanyEntity findCompanyByUnitFk(String unitFk) { + FilterSupCompanyRequest filterSupCompanyRequest = new FilterSupCompanyRequest(); + filterSupCompanyRequest.setUnitIdFk(unitFk); + List companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest); + if (companyEntities != null && companyEntities.size() > 0) { + return companyEntities.get(0); + } + return null; + } + + @Override + public List filterCompany(FilterSupCompanyRequest companyRequest) { + return supCompanyDao.filterCompany(companyRequest); + } + + @Override + public SupCompanyEntity findCompany(String CustomerId) { + return supCompanyDao.findCompany(CustomerId); + } + + @Override + public List getSubCompany(FilterSupCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = supCompanyDao.getSubCompany(commitRequest); + return companyEntities; + } + + @Override + public List getSubCompany2(FilterSupCompanyRequest commitRequest) { + if (commitRequest == null) { + return Collections.emptyList(); + } + int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit(); + PageHelper.offsetPage(offset, commitRequest.getLimit()); + List companyEntities = supCompanyDao.getSubCompany2(commitRequest); + return companyEntities; + } + + @Override + public SupCompanyEntity findCompanyByName(String companyName) { + return supCompanyDao.findCompanyByName(companyName); + } + + @Override + public boolean modifyCompany(SupCompanyEntity companyEntity) { + return supCompanyDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(SupCompanyEntity companyEntity) { + return supCompanyDao.insertCompany(companyEntity); + } + + + @Override + public boolean deleteCompany(Long customerId) { + return supCompanyDao.deleteCompany(customerId); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java new file mode 100644 index 0000000..75365c1 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java @@ -0,0 +1,55 @@ +package com.glxp.sale.admin.service.purchase.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.purchase.SupManufacturerDao; +import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; +import com.glxp.sale.admin.service.purchase.SupManufacturerService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupManufacturerServiceImpl implements SupManufacturerService { + + @Resource + SupManufacturerDao supManufacturerDao; + + @Override + public SupManufacturerEntity findCompany(Long id) { + return supManufacturerDao.findCompany(id); + } + + @Override + public SupManufacturerEntity findCompanyByName(String companyName) { + return supManufacturerDao.findCompanyByName(companyName); + } + + @Override + public List getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest) { + if (filterSupManufacturerRequest == null) { + return Collections.emptyList(); + } + int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit(); + PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit()); + List companyEntities = supManufacturerDao.getCompany(filterSupManufacturerRequest); + return companyEntities; + } + + @Override + public boolean modifyCompany(SupManufacturerEntity companyEntity) { + return supManufacturerDao.modifyCompany(companyEntity); + } + + @Override + public boolean insertCompany(SupManufacturerEntity companyEntity) { + return supManufacturerDao.insertCompany(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return supManufacturerDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java new file mode 100644 index 0000000..6ced7cb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupProductServiceImpl.java @@ -0,0 +1,77 @@ +package com.glxp.sale.admin.service.purchase.impl; + +import cn.hutool.core.collection.CollUtil; +import com.github.pagehelper.PageHelper; +import com.glxp.sale.admin.dao.purchase.SupProductDao; +import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.req.purchase.FilterPoductRequest; +import com.glxp.sale.admin.res.purchase.SupProductResponse; +import com.glxp.sale.admin.service.purchase.SupProductService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SupProductServiceImpl implements SupProductService { + + @Resource + SupProductDao supProductDao; + + @Override + public SupProductEntity findRegistration(Long id) { + return supProductDao.findRegistration(id); + } + + @Override + public SupProductResponse findJoinRegistration(Long id) { + if (id == null) + return null; + FilterPoductRequest filterPoductRequest = new FilterPoductRequest(); + filterPoductRequest.setId(id); + List companyEntities = supProductDao.getRegistration(filterPoductRequest); + if (CollUtil.isNotEmpty(companyEntities)) + return companyEntities.get(0); + + return null; + } + + @Override + public SupProductEntity findRegistrationByName(String recordProductName) { + return supProductDao.findRegistrationByName(recordProductName); + } + + @Override + public List getRegistration(FilterPoductRequest filterPoductRequest) { + if (filterPoductRequest == null) { + return Collections.emptyList(); + } + if (filterPoductRequest.getPage() != null) { + int offset = (filterPoductRequest.getPage() - 1) * filterPoductRequest.getLimit(); + PageHelper.offsetPage(offset, filterPoductRequest.getLimit()); + } + List companyEntities = supProductDao.getRegistration(filterPoductRequest); + return companyEntities; + } + + @Override + public boolean modifyRegistration(SupProductEntity companyEntity) { + return supProductDao.modifyRegistration(companyEntity); + } + + @Override + public boolean insertRegistration(SupProductEntity companyEntity) { + return supProductDao.insertRegistration(companyEntity); + } + + @Override + public boolean deleteById(String id) { + return supProductDao.deleteById(id); + } + + @Override + public boolean deleteByEnterpriseId(String enterpriseId) { + return supProductDao.deleteByEnterpriseId(enterpriseId); + } +} 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 e6c02f0..2ab25da 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 @@ -83,7 +83,7 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { for (String uuid : uuids) { ThrProductsAddDiEntity thrProductsAddDiEntity = new ThrProductsAddDiEntity(); BeanUtils.copyProperties(thrDiProductsRequest, thrProductsAddDiEntity); - thrProductsAddDiEntity.setCustomerId(customerId); + thrProductsAddDiEntity.setCustomerId(customerId+""); thrProductsAddDiEntity.setUuid(uuid); thrProductsAddDiEntity.setCreateTime(date); thrProductsAddDiEntity.setStatus(1); //未审核 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java index 8802afb..3b2f2a7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java @@ -50,7 +50,7 @@ public class CompanyProductsRelService { companyProductRelevanceEntity.setUpdate_time(new Date()); companyProductRelevanceEntity.setAuditStatus("3"); companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk()); - companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(uuid)); + companyProductRelevanceEntity.setUdiRlIdFk(uuid); if (StrUtil.isNotEmpty(udiInfoExportRequest.getSupplementRequest().getPrice())) { companyProductRelevanceEntity.setPrice(new BigDecimal(udiInfoExportRequest.getSupplementRequest().getPrice())); } 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 863aacf..26bdc9f 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 @@ -234,7 +234,7 @@ public class IoTransInoutService { @Async public void createOrderUdims(PostUdimsOrderRequest postUdimsOrderRequest) { - CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(postUdimsOrderRequest.getCustomerId())); + CompanyEntity companyEntity = companyService.findCompany(postUdimsOrderRequest.getCustomerId()); List orderBeans = postUdimsOrderRequest.getOrderBeans(); if (orderBeans != null) { for (PostUdimsOrderRequest.OrderBean orderBean : orderBeans) { diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml new file mode 100644 index 0000000..058ce8d --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + UPDATE sup_cert + + name=#{name}, + customerId=#{customerId}, + filePath=#{filePath}, + remark=#{remark}, + createTime=#{createTime}, + updateTime=#{updateTime}, + vailDate=#{vailDate}, + expireDate=#{expireDate}, + `type`=#{type}, + `manufacturerIdFk`=#{manufacturerIdFk}, + `productIdFk`=#{productIdFk}, + `code`=#{code}, + `auditStatus`=#{auditStatus}, + `auditComment`=#{auditComment}, + + + WHERE id = #{id} + + + + UPDATE sup_cert + set customerId = #{newId} + WHERE customerId = #{oldId} + + + + + UPDATE sup_cert + set customerId = #{newCustomerId} + , manufacturerIdFk = #{newManufacturerIdFk} + WHERE customerId = #{oldCustomerId} + and manufacturerIdFk = #{oldManufacturerIdFk} + + + + + UPDATE sup_cert + set customerId = #{newCustomerId} + , manufacturerIdFk = #{newManufacturerIdFk} + , productIdFk = #{newProductIdFk} + WHERE customerId = #{oldCustomerId} + and manufacturerIdFk = #{oldManufacturerIdFk} + and productIdFk = #{oldProductIdFk} + + + + + INSERT INTO sup_cert( `name`, customerId, filePath, remark, createTime, updateTime + , vailDate, expireDate, `type`, manufacturerIdFk, productIdFk, code, auditStatus + , auditComment) + values (#{name}, + #{customerId}, + #{filePath}, + #{remark}, + #{createTime}, + #{updateTime}, + #{vailDate}, + #{expireDate}, + #{type}, #{manufacturerIdFk}, #{productIdFk}, #{code}, #{auditStatus}, #{auditComment}) + + + + DELETE + FROM sup_cert + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml new file mode 100644 index 0000000..ff7f70f --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -0,0 +1,180 @@ + + + + + + + + + + + + delete + from sup_company + where customerId = #{customerId} + + + + + + + + + + + UPDATE sup_company + + companyName=#{companyName}, + bussinessStatus=#{bussinessStatus}, + creditNum=#{creditNum}, + classes=#{classes}, + area=#{area}, + detailAddr=#{detailAddr}, + appId=#{appId}, + appSecret=#{appSecret}, + contacts=#{contacts}, + mobile=#{mobile}, + tel=#{tel}, + email=#{email}, + areaCode=#{areaCode}, + auditStatus=#{auditStatus}, + createTime=#{createTime}, + createBy=#{createBy}, + updateTime=#{updateTime}, + auditTime=#{auditTime}, + auditComment=#{auditComment}, + editStatus=#{editStatus}, + + + WHERE customerId=#{customerId} + + + + + + INSERT INTO sup_company(companyName, bussinessStatus, creditNum, classes, area, + detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, + auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, + editStatus) + values (#{companyName}, + #{bussinessStatus}, + #{creditNum}, + #{classes}, + #{area}, + #{detailAddr}, + #{appId}, + #{appSecret}, + #{contacts}, + #{mobile}, + #{tel}, + #{email}, + #{customerId}, + #{areaCode}, + #{auditStatus}, + #{unitIdFk}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{auditTime}, #{auditComment}, #{editStatus}) + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml new file mode 100644 index 0000000..441a2d1 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + UPDATE sup_manufacturer + + companyName=#{companyName}, + creditCode=#{creditCode}, + companyType=#{companyType}, + placeArea=#{placeArea}, + placeAreaCode=#{placeAreaCode}, + placeAddress=#{placeAddress}, + legalPersonName=#{legalPersonName}, + legalPersonPapersType=#{legalPersonPapersType}, + legalPersonPapersCode=#{legalPersonPapersCode}, + productionArea=#{productionArea}, + productionAreaCode=#{productionAreaCode}, + productionAddress=#{productionAddress}, + registerStatus=#{registerStatus}, + productionLicenceNum=#{productionLicenceNum}, + productionLicenceDate=#{productionLicenceDate}, + productionRecordNum=#{productionRecordNum}, + productionRecordSection=#{productionRecordSection}, + productionRecordDate=#{productionRecordDate}, + remark=#{remark}, + create_date=#{createDate}, + update_date=#{updateDate}, + customerId=#{customerId}, + manufacturerId=#{manufacturerId}, + auditStatus=#{auditStatus}, + auditComment=#{auditComment}, + + + + WHERE id=#{id} + + + + + INSERT INTO sup_manufacturer(companyName, creditCode, companyType, + placeArea, placeAreaCode, placeAddress, + legalPersonName, legalPersonPapersType, legalPersonPapersCode, + productionArea, productionAreaCode, productionAddress, + registerStatus, productionLicenceNum, productionLicenceDate, + productionRecordNum, productionRecordSection, productionRecordDate, + remark, create_date, update_date, customerId, manufacturerId, + auditStatus, auditComment) + values (#{companyName}, #{creditCode}, #{companyType}, + #{placeArea}, #{placeAreaCode}, #{placeAddress}, + #{legalPersonName}, #{legalPersonPapersType}, #{legalPersonPapersCode}, + #{productionArea}, #{productionAreaCode}, #{productionAddress}, + #{registerStatus}, #{productionLicenceNum}, #{productionLicenceDate}, + #{productionRecordNum}, #{productionRecordSection}, #{productionRecordDate}, + #{remark}, #{createDate}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus}, + #{auditComment}) + + + + DELETE + FROM sup_manufacturer + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml new file mode 100644 index 0000000..2cace2c --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + UPDATE sup_product + + enterpriseId=#{enterpriseId}, + recordCode=#{recordCode}, + recordProductName=#{recordProductName}, + productManageType=#{productManageType}, + recordPeopleName=#{recordPeopleName}, + recordPeopleArea=#{recordPeopleArea}, + recordPeopleAreaCode=#{recordPeopleAreaCode}, + recordPeopleAddress=#{recordPeopleAddress}, + productType=#{productType}, + productDirectoryCode=#{productDirectoryCode}, + agentName=#{agentName}, + agentArea=#{agentArea}, + agentAreaCode=#{agentAreaCode}, + agentAddress=#{agentAddress}, + instructions=#{instructions}, + productAddress=#{productAddress}, + recordText=#{recordText}, + placeOrigin=#{placeOrigin}, + productionRegion=#{productionRegion}, + productionCompanyName=#{productionCompanyName}, + afterSale=#{afterSale}, + specification=#{specification}, + structure=#{structure}, + scope=#{scope}, + other=#{other}, + filePath=#{filePath}, + remark=#{remark}, + create_date=#{create_date}, + update_date=#{update_date}, + manufacturerIdFk=#{manufacturerIdFk}, + customerId=#{customerId}, + productId=#{productId}, + auditStatus=#{auditStatus}, + auditComment=#{auditComment}, + sptm=#{sptm}, + ybbm=#{ybbm}, + measname=#{measname}, + cpms=#{cpms}, + + WHERE id=#{id} + + + + + INSERT INTO sup_product(enterpriseId, recordCode, recordProductName, + productManageType, recordPeopleName, recordPeopleArea, + recordPeopleAreaCode, recordPeopleAddress, productType, + productDirectoryCode, agentName, agentArea, + agentAreaCode, agentAddress, instructions, + productAddress, recordText, placeOrigin, + productionRegion, productionCompanyName, afterSale, + specification, structure, `scope`, + other, filePath, remark, + create_date, update_date, manufacturerIdFk, customerId, productId + , auditStatus, auditComment, sptm, ybbm, measname, cpms) + values (#{enterpriseId}, #{recordCode}, #{recordProductName}, + #{productManageType}, #{recordPeopleName}, #{recordPeopleArea}, + #{recordPeopleAreaCode}, #{recordPeopleAddress}, #{productType}, + #{productDirectoryCode}, #{agentName}, #{agentArea}, + #{agentAreaCode}, #{agentAddress}, #{instructions}, + #{productAddress}, #{recordText}, #{placeOrigin}, + #{productionRegion}, #{productionCompanyName}, #{afterSale}, + #{specification}, #{structure}, #{scope}, + #{other}, #{filePath}, #{remark}, + #{create_date}, #{update_date}, #{manufacturerIdFk}, #{customerId}, #{productId} + , #{auditStatus}, #{auditComment}, #{sptm}, #{ybbm}, #{measname}, #{cpms}) + + + + DELETE + FROM sup_product + WHERE id = #{id} + + + + DELETE + FROM sup_product + WHERE enterpriseId = #{enterpriseId} + + + \ No newline at end of file