customerId从Long型改为String型,首营管理代码新增

zhairh
anthonyywj2 3 years ago
parent 10c4fd2839
commit 5214b9a136

@ -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; //产品品种
}

@ -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());

@ -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());

@ -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));

@ -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, "该用户已被禁用!");
}

@ -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());

@ -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");
}

@ -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);
}

@ -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()));

@ -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);
}

@ -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<StockOrderEntity> 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());
}

@ -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 + "");

@ -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());
}

@ -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);
}

@ -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);

@ -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);

@ -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);

@ -151,7 +151,7 @@ public class InvWarehouseController {
filterInvWarehouseRequest.setStatus(1);
List<InvWarehouseEntity> 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<InvWarehouseEntity> invWarehouseEntities;
AuthAdmin authAdmin = customerService.getUserBean();
if (authAdmin.getCustomerId() != 110) {
if (!authAdmin.getCustomerId().equals("110")) {
filterInvWarehouseRequest.setPcode("0");
filterInvWarehouseRequest.setStatus(1);
invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);

@ -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<SupCertEntity> supCertEntityList
= supCertService.filterCompanyCert(filterSupCertRequest);
PageInfo<SupCertEntity> pageInfo;
pageInfo = new PageInfo<>(supCertEntityList);
PageSimpleResponse<SupCertEntity> 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<SupCertEntity> companyCertEntities = supCertService.getCompanyCert(filterSupCertRequest);
PageInfo<SupCertEntity> pageInfo = new PageInfo<>(companyCertEntities);
PageSimpleResponse<SupCertEntity> 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() + "";
}
}

@ -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<SupCompanyEntity> companyEntities = companyService.filterCompany(companyRequest);
PageInfo<SupCompanyEntity> pageInfo = new PageInfo<>(companyEntities);
PageSimpleResponse<SupCompanyEntity> 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<SupCertEntity> 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;
}
}

@ -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;

@ -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<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest);
PageInfo<SupManufacturerEntity> pageInfo = new PageInfo<>(companyEntities);
PageSimpleResponse<SupManufacturerEntity> 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<SupCertEntity> 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() + "";
}
}

@ -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<SupProductResponse> companyEntities = supProductService.getRegistration(filterPoductRequest);
PageInfo<SupProductResponse> pageInfo = new PageInfo<>(companyEntities);
PageSimpleResponse<SupProductResponse> 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<SupCertEntity> 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() + "";
}
}

@ -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());

@ -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()));

@ -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);

@ -11,7 +11,7 @@ public interface CompanyCertDao {
List<CompanyCertEntity> filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest);
CompanyCertEntity findCompanyCert(Long CustomerId);
CompanyCertEntity findCompanyCert(String CustomerId);
CompanyCertEntity findCompanyCertByName(String name);

@ -10,7 +10,7 @@ import java.util.List;
@Mapper
public interface CompanyDao {
CompanyEntity findCompany(Long CustomerId);
CompanyEntity findCompany(String CustomerId);
CompanyEntity findCompanyByName(String companyName);

@ -16,7 +16,7 @@ public interface CompanyProductRelevanceDao {
List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId);

@ -11,7 +11,7 @@ public interface CompanySalesmanDao {
List<CompanySalesmanEntity> filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
CompanySalesmanEntity findCompanySalesman(Long CustomerId);
CompanySalesmanEntity findCompanySalesman(String CustomerId);
CompanySalesmanEntity findCompanySalesmanByName(String name);

@ -11,7 +11,7 @@ public interface CompanySalesmanUpdateLogDao {
List<CompanySalesmanUpdateLogEntity> filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit);

@ -11,7 +11,7 @@ public interface CompanyUpdateLogDao {
List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit);

@ -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<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
SupCertEntity findCompanyCertByName(String name);
List<SupCertEntity> 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);
}

@ -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<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest companyRequest);
List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest companyRequest);
List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest);
boolean modifyCompany(SupCompanyEntity companyEntity);
boolean insertCompany(SupCompanyEntity companyEntity);
boolean deleteCompany(Long customerId);
}

@ -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<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest);
boolean modifyCompany(SupManufacturerEntity supManufacturerEntity);
boolean insertCompany(SupManufacturerEntity supManufacturerEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest);
boolean modifyRegistration(SupProductEntity supProductEntity);
boolean insertRegistration(SupProductEntity supProductEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
}

@ -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;

@ -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;

@ -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;

@ -4,6 +4,6 @@ import lombok.Data;
@Data
public class UpdateUserflagBean {
private Long CustomerId;
private String CustomerId;
private Integer userFlag;
}

@ -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;

@ -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;
}

@ -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")

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -20,7 +20,7 @@ public class ThrProductsAddDiEntity {
/**
* ID
*/
private Long customerId;
private String customerId;
/**
*

@ -8,7 +8,7 @@ public class CustomerInfoFilterRequest extends ListPageRequest {
private String key;
private String customerName;
private long customerId;
private String customerId;
private String companyName;
}

@ -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;

@ -10,7 +10,7 @@ public class UdiInfoExportRequest extends ListPageRequest {
List<String> rlIds;
List<String> uuids;
private Long customerId;
private String customerId;
private String ylqxzcrbarmc;
private String cpmctymc;
private String nameCode;

@ -5,7 +5,7 @@ import lombok.Data;
@Data
public class CompanyRequest {
private Long customerId;
private String customerId;
private String companyName;
}

@ -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;
}

@ -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;
}

@ -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<String> auditStatusList;
}

@ -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;
}

@ -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<String> authRules;

@ -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;
}

@ -25,7 +25,7 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity {
private int status;
private Long customerId;
private String customerId;
private String remark;

@ -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);
}

@ -37,7 +37,7 @@ public class CustomerService {
return Integer.parseInt(userId);
}
public long getCustomerId() {
public String getCustomerId() {
AuthAdmin authAdmin = getUserBean();
return authAdmin.getCustomerId();
}

@ -53,7 +53,9 @@ public class AuthLoginServiceImpl implements AuthLoginService {
List<Long> 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()));

@ -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);
}
}

@ -15,7 +15,7 @@ public interface CompanyCertService {
List<CompanyCertEntity> filterCompanyCert(FilterCompanyCertRequest filterCompanyCertRequest);
CompanyCertEntity findCompanyCert(Long CustomerId);
CompanyCertEntity findCompanyCert(String CustomerId);
CompanyCertEntity findCompanyCertByName(String name);

@ -15,7 +15,7 @@ public interface CompanyProductRelevanceService {
List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);
CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId);
CompanyProductRelevanceEntity findCompanyProductRelevanceByProductId(String productId);

@ -12,7 +12,7 @@ public interface CompanySalesmanService {
List<CompanySalesmanEntity> filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
CompanySalesmanEntity findCompanySalesman(Long CustomerId);
CompanySalesmanEntity findCompanySalesman(String CustomerId);
CompanySalesmanEntity findCompanySalesmanByName(String name);

@ -12,7 +12,7 @@ public interface CompanySalesmanUpdateLogService {
List<CompanySalesmanUpdateLogEntity> filterCompanySalesmanUpdateLog(FilterCompanySalesmanUpdateLogRequest filterCompanySalesmanUpdateLogRequest);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId);
CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLogBySubmit(String submit);

@ -13,7 +13,7 @@ public interface CompanyService {
List<CompanyEntity> filterCompany(FilterCompanyRequest companyRequest);
CompanyEntity findCompany(Long CustomerId);
CompanyEntity findCompany(String CustomerId);
List<CompanyEntity> getSubCompany(FilterCompanyRequest commitRequest);

@ -12,7 +12,7 @@ public interface CompanyUpdateLogService {
List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit);

@ -35,7 +35,7 @@ public class CompanyCertServiceImpl implements CompanyCertService {
}
@Override
public CompanyCertEntity findCompanyCert(Long CustomerId) {
public CompanyCertEntity findCompanyCert(String CustomerId) {
return companyCertDao.findCompanyCert(CustomerId);
}

@ -46,7 +46,7 @@ public class CompanyProductRelevanceServiceImpl implements CompanyProductRelevan
}
@Override
public CompanyProductRelevanceEntity findCompanyProductRelevance(Long CustomerId) {
public CompanyProductRelevanceEntity findCompanyProductRelevance(String CustomerId) {
return companyProductRelevanceDao.findCompanyProductRelevance(CustomerId);
}

@ -30,7 +30,7 @@ public class CompanySalesmanServiceImpl implements CompanySalesmanService {
}
@Override
public CompanySalesmanEntity findCompanySalesman(Long CustomerId) {
public CompanySalesmanEntity findCompanySalesman(String CustomerId) {
return companySalesmanDao.findCompanySalesman(CustomerId);
}

@ -30,7 +30,7 @@ public class CompanySalesmanUpdateLogServiceImpl implements CompanySalesmanUpdat
}
@Override
public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(Long CustomerId) {
public CompanySalesmanUpdateLogEntity findCompanySalesmanUpdateLog(String CustomerId) {
return companySalesmanUpdateLogDao.findCompanySalesmanUpdateLog(CustomerId);
}

@ -35,7 +35,7 @@ public class CompanyServiceImpl implements CompanyService {
}
@Override
public CompanyEntity findCompany(Long CustomerId) {
public CompanyEntity findCompany(String CustomerId) {
return companyDao.findCompany(CustomerId);
}

@ -30,7 +30,7 @@ public class CompanyUpdateLogServiceImpl implements CompanyUpdateLogService {
}
@Override
public CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId) {
public CompanyUpdateLogEntity findCompanyUpdateLog(String CustomerId) {
return companyUpdateLogDao.findCompanyUpdateLog(CustomerId);
}

@ -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<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
SupCertEntity findCompanyCertByName(String name);
List<SupCertEntity> 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);
}

@ -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<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest);
SupCompanyEntity findCompany(String CustomerId);
List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest);
List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest);
SupCompanyEntity findCompanyByName(String companyName);
boolean modifyCompany(SupCompanyEntity companyEntity);
boolean insertCompany(SupCompanyEntity companyEntity);
boolean deleteCompany(Long customerId);
}

@ -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<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest);
boolean modifyCompany(SupManufacturerEntity supManufacturerEntity);
boolean insertCompany(SupManufacturerEntity supManufacturerEntity);
boolean deleteById(String id);
}

@ -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<SupProductResponse> getRegistration(FilterPoductRequest filterPoductRequest);
boolean modifyRegistration(SupProductEntity supProductEntity);
boolean insertRegistration(SupProductEntity supProductEntity);
boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
}

@ -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<SupCertEntity> 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<SupCertEntity> getCompanyCert(FilterSupCertRequest filterSupCertRequest) {
if (filterSupCertRequest == null) {
return Collections.emptyList();
}
int offset = (filterSupCertRequest.getPage() - 1) * filterSupCertRequest.getLimit();
PageHelper.offsetPage(offset, filterSupCertRequest.getLimit());
List<SupCertEntity> 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);
}
}

@ -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<SupCompanyEntity> companyEntities = supCompanyDao.filterCompany(filterSupCompanyRequest);
if (companyEntities != null && companyEntities.size() > 0) {
return companyEntities.get(0);
}
return null;
}
@Override
public List<SupCompanyEntity> filterCompany(FilterSupCompanyRequest companyRequest) {
return supCompanyDao.filterCompany(companyRequest);
}
@Override
public SupCompanyEntity findCompany(String CustomerId) {
return supCompanyDao.findCompany(CustomerId);
}
@Override
public List<SupCompanyEntity> getSubCompany(FilterSupCompanyRequest commitRequest) {
if (commitRequest == null) {
return Collections.emptyList();
}
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
List<SupCompanyEntity> companyEntities = supCompanyDao.getSubCompany(commitRequest);
return companyEntities;
}
@Override
public List<SupCompanyEntity> getSubCompany2(FilterSupCompanyRequest commitRequest) {
if (commitRequest == null) {
return Collections.emptyList();
}
int offset = (commitRequest.getPage() - 1) * commitRequest.getLimit();
PageHelper.offsetPage(offset, commitRequest.getLimit());
List<SupCompanyEntity> 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);
}
}

@ -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<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest) {
if (filterSupManufacturerRequest == null) {
return Collections.emptyList();
}
int offset = (filterSupManufacturerRequest.getPage() - 1) * filterSupManufacturerRequest.getLimit();
PageHelper.offsetPage(offset, filterSupManufacturerRequest.getLimit());
List<SupManufacturerEntity> 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);
}
}

@ -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<SupProductResponse> 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<SupProductResponse> 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<SupProductResponse> 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);
}
}

@ -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); //未审核

@ -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()));
}

@ -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<PostUdimsOrderRequest.OrderBean> orderBeans = postUdimsOrderRequest.getOrderBeans();
if (orderBeans != null) {
for (PostUdimsOrderRequest.OrderBean orderBean : orderBeans) {

@ -0,0 +1,132 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.purchase.SupCertDao">
<select id="filterCompanyCert" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCertRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
select * from sup_cert
<where>
<if test="customerId != '' and customerId!=null">
and customerId = #{customerId}
</if>
<if test="manufacturerIdFk != '' and manufacturerIdFk!=null">
and manufacturerIdFk = #{manufacturerIdFk}
</if>
<if test="productIdFk != '' and productIdFk!=null">
and productIdFk = #{productIdFk}
</if>
<if test="type != '' and type!=null">
and `type` = #{type}
</if>
<if test="auditStatus != null and auditStatus !=23 and auditStatus !=24">
and auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (auditStatus = 1 or auditStatus=4)
</if>
<if test="auditStatus ==24">
and (auditStatus = 2 or auditStatus=3 or auditStatus=5 or auditStatus=6)
</if>
</where>
ORDER BY id DESC
</select>
<select id="findCompanyCertByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
SELECT *
FROM sup_cert
where name = #{name}
</select>
<select id="getCompanyCert" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCertRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
SELECT * FROM sup_cert
<where>
<if test="customerId != null and customerId != ''">
and customerId = #{customerId}
</if>
<if test="name != null and name != ''">
and name like concat('%',#{name},'%')
</if>
<if test="manufacturerIdFk != null and manufacturerIdFk != ''">
and manufacturerIdFk = #{manufacturerIdFk}
</if>
</where>
</select>
<update id="updateCompanyCert" parameterType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
UPDATE sup_cert
<trim prefix="set" suffixOverrides=",">
<if test="name != null">name=#{name},</if>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="filePath != null">filePath=#{filePath},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="vailDate != null">vailDate=#{vailDate},</if>
<if test="expireDate != null">expireDate=#{expireDate},</if>
<if test="type != null">`type`=#{type},</if>
<if test="manufacturerIdFk != null">`manufacturerIdFk`=#{manufacturerIdFk},</if>
<if test="productIdFk != null">`productIdFk`=#{productIdFk},</if>
<if test="code != null">`code`=#{code},</if>
<if test="auditStatus != null">`auditStatus`=#{auditStatus},</if>
<if test="auditComment != null">`auditComment`=#{auditComment},</if>
</trim>
WHERE id = #{id}
</update>
<update id="updateCustomerId" parameterType="Map">
UPDATE sup_cert
set customerId = #{newId}
WHERE customerId = #{oldId}
</update>
<update id="updateManufacturerId" parameterType="Map">
UPDATE sup_cert
set customerId = #{newCustomerId}
, manufacturerIdFk = #{newManufacturerIdFk}
WHERE customerId = #{oldCustomerId}
and manufacturerIdFk = #{oldManufacturerIdFk}
</update>
<update id="updateProductId" parameterType="Map">
UPDATE sup_cert
set customerId = #{newCustomerId}
, manufacturerIdFk = #{newManufacturerIdFk}
, productIdFk = #{newProductIdFk}
WHERE customerId = #{oldCustomerId}
and manufacturerIdFk = #{oldManufacturerIdFk}
and productIdFk = #{oldProductIdFk}
</update>
<insert id="insertCompanyCert" parameterType="com.glxp.sale.admin.entity.purchase.SupCertEntity">
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})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM sup_cert
WHERE id = #{id}
</delete>
</mapper>

@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.purchase.SupCompanyDao">
<select id="findCompany" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
SELECT *
FROM sup_company
where customerId = #{CustomerId}
</select>
<select id="filterCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
SELECT * FROM sup_company
<where>
<if test="customerId != null and customerId != ''">
and parentIdFk = #{customerId}
</if>
<if test="companyName != null and companyName != ''">
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditNum != null and creditNum != ''">
and creditNum like ('%',#{creditNum},'%')
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
and auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (auditStatus = 0 or auditStatus=5 or auditStatus=2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ auditStatus <> 0 ]]>
</if>
<if test="auditStatus ==22">
and (auditStatus = 1 or auditStatus=4 )
</if>
<if test="unitIdFk != null and unitIdFk != ''">
and unitIdFk = #{unitIdFk}
</if>
</where>
</select>
<delete id="deleteCompany" parameterType="java.lang.Long">
delete
from sup_company
where customerId = #{customerId}
</delete>
<select id="findCompanyByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
SELECT *
FROM sup_company
where companyName = #{companyName}
</select>
<select id="getSubCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
SELECT * FROM sup_company
<where>
<if test="customerId != null and customerId != ''">
and parentIdFk = #{customerId}
</if>
<if test="companyName != null and companyName != ''">
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditNum != null and creditNum != ''">
and creditNum like concat('%',#{creditNum},'%')
</if>
<if test="auditStatus != null and auditStatus != ''">
and auditStatus = #{auditStatus}
</if>
<if test="unitIdFk != null and unitIdFk != ''">
and unitIdFk = #{unitIdFk}
</if>
<if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() >0">
<foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
auditStatus = #{auditStatus,jdbcType=VARCHAR}
</foreach>
</if>
</where>
</select>
<select id="getSubCompany2" parameterType="com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
SELECT *
FROM (company
inner JOIN company_product_relevance
ON company.customerId = company_product_relevance.customerId)
inner JOIN company_salesman
ON company.customerId = company_salesman.customerId
<where>
<if test="customerId != null and customerId != ''">
and parentIdFk = #{customerId}
</if>
<if test="companyName != null and companyName != ''">
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditNum != null and creditNum != ''">
and creditNum like concat('%',#{creditNum},'%')
</if>
<if test="auditStatus != null and auditStatus != ''">
and (company.auditStatus = #{auditStatus}
or company_product_relevance.auditStatus = #{auditStatus}
or company_salesman.auditStatus = #{auditStatus})
</if>
<if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() >0">
<foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
auditStatus = #{auditStatus,jdbcType=VARCHAR}
</foreach>
</if>
</where>
</select>
<update id="modifyCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
UPDATE sup_company
<trim prefix="set" suffixOverrides=",">
<if test="companyName != null">companyName=#{companyName},</if>
<if test="bussinessStatus != null">bussinessStatus=#{bussinessStatus},</if>
<if test="creditNum != null">creditNum=#{creditNum},</if>
<if test="classes != null">classes=#{classes},</if>
<if test="area != null">area=#{area},</if>
<if test="detailAddr != null">detailAddr=#{detailAddr},</if>
<if test="appId != null">appId=#{appId},</if>
<if test="appSecret != null">appSecret=#{appSecret},</if>
<if test="contacts != null">contacts=#{contacts},</if>
<if test="mobile != null">mobile=#{mobile},</if>
<if test="tel != null">tel=#{tel},</if>
<if test="email != null">email=#{email},</if>
<if test="areaCode != null">areaCode=#{areaCode},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="createTime != null">createTime=#{createTime},</if>
<if test="createBy != null">createBy=#{createBy},</if>
<if test="updateTime != null">updateTime=#{updateTime},</if>
<if test="auditTime != null">auditTime=#{auditTime},</if>
<if test="auditComment != null">auditComment=#{auditComment},</if>
<if test="editStatus != null">editStatus=#{editStatus},</if>
</trim>
WHERE customerId=#{customerId}
</update>
<insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupCompanyEntity">
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})
</insert>
</mapper>

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.purchase.SupManufacturerDao">
<select id="findCompany" parameterType="java.lang.Long"
resultType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
SELECT *
FROM sup_manufacturer
where id = #{id}
</select>
<select id="findCompanyByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
SELECT *
FROM sup_manufacturer
where companyName = #{companyName}
</select>
<select id="getCompany" parameterType="com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest"
resultType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
SELECT sup_manufacturer.* ,sup_company.companyName supName FROM sup_manufacturer
inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
<where>
<if test="id != null and id != ''">
and id = #{id}
</if>
<if test="manufacturerId != null and manufacturerId != ''">
and manufacturerId = #{manufacturerId}
</if>
<if test="companyName != null and companyName != ''">
and companyName like concat('%',#{companyName},'%')
</if>
<if test="creditCode != null and creditCode != ''">
and creditCode like concat('%',#{creditCode},'%')
</if>
<if test="placeArea != null and placeArea != ''">
and placeArea like concat('%',#{placeArea},'%')
</if>
<if test="customerId != null and customerId != ''">
and sup_manufacturer.customerId = #{customerId}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
and sup_manufacturer.auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus=5 or
sup_manufacturer.auditStatus=2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ sup_manufacturer.auditStatus <> 0 ]]>
</if>
<if test="auditStatus ==22">
and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
</if>
</where>
</select>
<update id="modifyCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
UPDATE sup_manufacturer
<set>
<if test="companyName != null">companyName=#{companyName},</if>
<if test="creditCode != null">creditCode=#{creditCode},</if>
<if test="companyType != null">companyType=#{companyType},</if>
<if test="placeArea != null">placeArea=#{placeArea},</if>
<if test="placeAreaCode != null">placeAreaCode=#{placeAreaCode},</if>
<if test="placeAddress != null">placeAddress=#{placeAddress},</if>
<if test="legalPersonName != null">legalPersonName=#{legalPersonName},</if>
<if test="legalPersonPapersType != null">legalPersonPapersType=#{legalPersonPapersType},</if>
<if test="legalPersonPapersCode != null">legalPersonPapersCode=#{legalPersonPapersCode},</if>
<if test="productionArea != null">productionArea=#{productionArea},</if>
<if test="productionAreaCode != null">productionAreaCode=#{productionAreaCode},</if>
<if test="productionAddress != null">productionAddress=#{productionAddress},</if>
<if test="registerStatus != null">registerStatus=#{registerStatus},</if>
<if test="productionLicenceNum != null">productionLicenceNum=#{productionLicenceNum},</if>
<if test="productionLicenceDate != null">productionLicenceDate=#{productionLicenceDate},</if>
<if test="productionRecordNum != null">productionRecordNum=#{productionRecordNum},</if>
<if test="productionRecordSection != null">productionRecordSection=#{productionRecordSection},</if>
<if test="productionRecordDate != null">productionRecordDate=#{productionRecordDate},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="createDate != null">create_date=#{createDate},</if>
<if test="updateDate != null">update_date=#{updateDate},</if>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="manufacturerId != null">manufacturerId=#{manufacturerId},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="auditComment != null">auditComment=#{auditComment},</if>
</set>
WHERE id=#{id}
</update>
<insert id="insertCompany" parameterType="com.glxp.sale.admin.entity.purchase.SupManufacturerEntity">
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})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM sup_manufacturer
WHERE id = #{id}
</delete>
</mapper>

@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.sale.admin.dao.purchase.SupProductDao">
<select id="findRegistration" parameterType="java.lang.Long"
resultType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
SELECT *
FROM sup_product
where id = #{id}
</select>
<select id="findRegistrationByName" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
SELECT *
FROM sup_product
where recordProductName = #{recordProductName}
</select>
<select id="getRegistration" parameterType="com.glxp.sale.admin.req.purchase.FilterPoductRequest"
resultType="com.glxp.sale.admin.res.purchase.SupProductResponse">
SELECT sup_product.* ,sup_company.companyName
supName,sup_manufacturer.companyName manufacturerName FROM sup_product
inner join sup_company
on sup_product.customerId = sup_company.customerId
INNER JOIN sup_manufacturer
on sup_manufacturer.manufacturerId =
sup_product.manufacturerIdFk
<where>
<if test="id != null and id != ''">
and sup_product.id = #{id}
</if>
<if test="productId != null and productId != ''">
and sup_product.productId = #{productId}
</if>
<if test="enterpriseId != null and enterpriseId != ''">
and sup_product.enterpriseId = #{enterpriseId}
</if>
<if test="recordCode != null and recordCode != ''">
and sup_product.recordCode like concat('%',#{recordCode},'%')
</if>
<if test="recordProductName != null and recordProductName != ''">
and sup_product.recordProductName like concat('%',#{recordProductName},'%')
</if>
<if test="recordPeopleName != null and recordPeopleName != ''">
and sup_product.recordPeopleName like concat('%',#{recordPeopleName},'%')
</if>
<if test="manufacturerIdFk != null and manufacturerIdFk != ''">
and sup_product.manufacturerIdFk = #{manufacturerIdFk}
</if>
<if test="customerId != null and customerId != ''">
and sup_product.customerId = #{customerId}
</if>
<if test="auditStatus != null and auditStatus !=20 and auditStatus !=22 and auditStatus !=21">
and sup_product.auditStatus = #{auditStatus}
</if>
<if test="auditStatus ==20">
and (sup_product.auditStatus = 0 or sup_product.auditStatus=5 or
sup_product.auditStatus=2)
</if>
<if test="auditStatus ==21">
and <![CDATA[ sup_product.auditStatus <> 0 ]]>
</if>
<if test="auditStatus ==22">
and (sup_product.auditStatus = 1 or sup_product.auditStatus=4 )
</if>
</where>
</select>
<update id="modifyRegistration" parameterType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
UPDATE sup_product
<set>
<if test="enterpriseId != null">enterpriseId=#{enterpriseId},</if>
<if test="recordCode != null">recordCode=#{recordCode},</if>
<if test="recordProductName != null">recordProductName=#{recordProductName},</if>
<if test="productManageType != null">productManageType=#{productManageType},</if>
<if test="recordPeopleName != null">recordPeopleName=#{recordPeopleName},</if>
<if test="recordPeopleArea != null">recordPeopleArea=#{recordPeopleArea},</if>
<if test="recordPeopleAreaCode != null">recordPeopleAreaCode=#{recordPeopleAreaCode},</if>
<if test="recordPeopleAddress != null">recordPeopleAddress=#{recordPeopleAddress},</if>
<if test="productType != null">productType=#{productType},</if>
<if test="productDirectoryCode != null">productDirectoryCode=#{productDirectoryCode},</if>
<if test="agentName != null">agentName=#{agentName},</if>
<if test="agentArea != null">agentArea=#{agentArea},</if>
<if test="agentAreaCode != null">agentAreaCode=#{agentAreaCode},</if>
<if test="agentAddress != null">agentAddress=#{agentAddress},</if>
<if test="instructions != null">instructions=#{instructions},</if>
<if test="productAddress != null">productAddress=#{productAddress},</if>
<if test="recordText != null">recordText=#{recordText},</if>
<if test="placeOrigin != null">placeOrigin=#{placeOrigin},</if>
<if test="productionRegion != null">productionRegion=#{productionRegion},</if>
<if test="productionCompanyName != null">productionCompanyName=#{productionCompanyName},</if>
<if test="afterSale != null">afterSale=#{afterSale},</if>
<if test="specification != null">specification=#{specification},</if>
<if test="structure != null">structure=#{structure},</if>
<if test="scope != null">scope=#{scope},</if>
<if test="other != null">other=#{other},</if>
<if test="filePath != null">filePath=#{filePath},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="create_date != null">create_date=#{create_date},</if>
<if test="update_date != null">update_date=#{update_date},</if>
<if test="manufacturerIdFk != null">manufacturerIdFk=#{manufacturerIdFk},</if>
<if test="customerId != null">customerId=#{customerId},</if>
<if test="productId != null">productId=#{productId},</if>
<if test="auditStatus != null">auditStatus=#{auditStatus},</if>
<if test="auditComment != null">auditComment=#{auditComment},</if>
<if test="sptm != null">sptm=#{sptm},</if>
<if test="ybbm != null">ybbm=#{ybbm},</if>
<if test="measname != null">measname=#{measname},</if>
<if test="cpms != null">cpms=#{cpms},</if>
</set>
WHERE id=#{id}
</update>
<insert id="insertRegistration" parameterType="com.glxp.sale.admin.entity.purchase.SupProductEntity">
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})
</insert>
<delete id="deleteById" parameterType="Map">
DELETE
FROM sup_product
WHERE id = #{id}
</delete>
<delete id="deleteByEnterpriseId" parameterType="Map">
DELETE
FROM sup_product
WHERE enterpriseId = #{enterpriseId}
</delete>
</mapper>
Loading…
Cancel
Save