首营功能完善

purchase
anthonyywj2 3 years ago
parent 3192373932
commit d5a6e01714

@ -14,6 +14,8 @@ public class Constant {
public static final String LIN_YONG = "ML";
public static final String SG_ORDER = "SG";
public static final String JH_ORDER = "JH";
public static final String NBM_ORDER = "NBM";
public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS";
public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS";

@ -155,4 +155,19 @@ public class ConstantStatus {
public static final int APPLY_UN_AUDIT = 2;//未审核
public static final int APPLY_AUDIT_ED = 3;//已审核
//首营审核状态 //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; //产品品种
}

@ -102,6 +102,7 @@ public class BussinessOriginTypeController {
if (exists) {
return ResultVOUtils.error(500, "单据类型已存在!");
}
bussinessTypeEntity.setUpdateTime(new Date());
bussinessOriginTypeService.updateBusOriginType(bussinessTypeEntity);
} else {
ResultVOUtils.error(999, "参数错误");

@ -64,8 +64,6 @@ public class BussinessTypeController {
@Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private AuthAdminService authAdminService;
@Resource
private OrderService orderService;
@Resource
CustomerService customerService;

@ -1,6 +1,7 @@
package com.glxp.api.admin.controller.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.basic.*;
@ -53,7 +54,7 @@ public class UdiInfoController {
@GetMapping("udiwms/udiinfo/filterUdi")
public BaseResponse filterUdi(FilterUdiInfoRequest filterUdiInfoRequest) {
String nameCode;
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().equals("")) {
if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
@ -65,7 +66,11 @@ public class UdiInfoController {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
BeanUtils.copyProperties(filterUdiInfoRequest, productInfoFilterRequest);
productInfoFilterRequest.setNameCode(nameCode);
if (StrUtil.isNotEmpty(nameCode)) {
productInfoFilterRequest.setNameCode(nameCode);
} else {
productInfoFilterRequest.setDiType("1");
}
try {
BaseResponse<PageSimpleResponse<ProductInfoEntity>> udiDlDeviceResponse = syncUdiService.filterUdi(productInfoFilterRequest);
if (udiDlDeviceResponse.getCode() == 20000) {
@ -243,7 +248,7 @@ public class UdiInfoController {
public BaseResponse saveProduct(@RequestBody ThrProductsEntity thrProductsEntity) {
if (null == thrProductsEntity)
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys());
// thrProductsEntity.setThirdSysFk(thrProductsEntity.getThirdSys());
thrProductsEntity.setUpdateTime(new Date());
thrProductsService.insertThrProducts(thrProductsEntity);

@ -135,18 +135,21 @@ public class UdiRelevanceController {
}
List<UdiRelevanceResponse> udiRelevanceResponses = null;
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode()) || StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUdiCode())) {
UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
filterUdiInfoRequest.setNameCode(udiEntity.getUdi());
} else if (StrUtil.isNotEmpty(filterUdiInfoRequest.getUnionCode())) {
filterUdiInfoRequest.setNameCode(filterUdiInfoRequest.getUnionCode());
}
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterUdiInfoRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
}
//filterUdiInfoRequest.setDiType(1);
} else
filterUdiInfoRequest.setDiType(1);
udiRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
PageInfo<UdiRelevanceResponse> pageInfo;

@ -21,6 +21,7 @@ import com.glxp.api.admin.entity.inout.AcceptOrderEntity;
import com.glxp.api.admin.entity.inout.OrderEntity;
import com.glxp.api.admin.entity.inout.WarehouseEntity;
import com.glxp.api.admin.entity.inout.WarehouseUserEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.entity.inventory.InvWarehouseEntity;
import com.glxp.api.admin.entity.inventory.StockPrintEntity;
import com.glxp.api.admin.entity.inventory.StockPrinttREntity;
@ -31,8 +32,7 @@ import com.glxp.api.admin.req.business.StockOrderIdsRequest;
import com.glxp.api.admin.req.business.StockOrderPostRequest;
import com.glxp.api.admin.req.inout.AddStockOrderChangeRequest;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.inventory.FilterInvUserRequest;
import com.glxp.api.admin.req.inventory.PostStockPrintRequest;
import com.glxp.api.admin.req.inventory.*;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.business.StockOrderExportResponse;
@ -54,6 +54,8 @@ import com.glxp.api.admin.service.inout.CodesService;
import com.glxp.api.admin.service.inout.CodesTempService;
import com.glxp.api.admin.service.inout.OrderService;
import com.glxp.api.admin.service.inout.WarehouseUserService;
import com.glxp.api.admin.service.inventory.InnerOrderDetailService;
import com.glxp.api.admin.service.inventory.InnerOrderService;
import com.glxp.api.admin.service.inventory.InvStockPrintService;
import com.glxp.api.admin.service.inventory.InvWarehouseService;
import com.glxp.api.admin.util.*;
@ -532,7 +534,6 @@ public class StockOrderController {
stockOrderIdsRequest.setIds(ids);
} else
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
for (String id : stockOrderIdsRequest.getIds()) {
@ -550,8 +551,6 @@ public class StockOrderController {
List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
if (stockOrderIdsRequest.isFilterUDIType()) {
// UdiInfoEntity udiInfoEntity =
// udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId());
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
if (udiRelevanceResponse != null && udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测
StockPrintEntity stockPrintEntity = new StockPrintEntity();
@ -592,24 +591,68 @@ public class StockOrderController {
return ResultVOUtils.success("操作成功,生成中。");
}
@Resource
InnerOrderService innerOrderService;
@Resource
InnerOrderDetailService innerOrderDetailService;
@AuthRuleAnnotation("")
@PostMapping("/udiwms/inner/order/generate/text")
public BaseResponse generateInnerOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) {
if (stockOrderIdsRequest.getIds() == null || stockOrderIdsRequest.getIds().size() < 1) {
if (stockOrderIdsRequest.getId() != null) {
List<String> ids = new ArrayList<>();
ids.add(stockOrderIdsRequest.getId());
stockOrderIdsRequest.setIds(ids);
} else
return ResultVOUtils.error(ResultEnum.DATA_ERROR);
}
for (String id : stockOrderIdsRequest.getIds()) {
InnerOrderEntity innerOrderEntity = innerOrderService.findByRecordKey(id);
if (innerOrderEntity == null)
continue;
stockPrintService.deleteByOrderId(innerOrderEntity.getRecordKey());
InnerOrderDetailRequest innerOrderDetailRequest = new InnerOrderDetailRequest();
innerOrderDetailRequest.setLimit(1000);
innerOrderDetailRequest.setPage(1);
innerOrderDetailRequest.setOrderIdFk(innerOrderEntity.getId() + "");
List<StockOrderDetailEntity> stockOrderDetailEntityList =
innerOrderDetailService.joinQueryList(innerOrderDetailRequest);
List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId());
StockPrintEntity stockPrintEntity = new StockPrintEntity();
stockPrintEntity.setNameCode(udiRelevanceResponse.getNameCode());
stockPrintEntity.setSOrderId(innerOrderEntity.getRecordKey());
stockPrintEntity.setUpdateTime(new Date());
stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + "");
stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
stockPrintEntity.setCount(stockOrderDetailEntity.getReCount());
stockPrintEntities.add(stockPrintEntity);
}
PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest();
postStockPrintRequest.setDatas(stockPrintEntities);
if (stockPrintEntities.size() > 0) {
generateQRCodeText(postStockPrintRequest);
}
}
return ResultVOUtils.success("操作成功,生成中。");
}
private String generateQRCodeText(PostStockPrintRequest postStockPrintRequest) {
String genKey = null;
if (postStockPrintRequest != null) {
// InCodeLogEntity inCodeLogEntity = new InCodeLogEntity();
// inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS);
// inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
// if (postStockPrintRequest.getGenKey() == null) {
// genKey = CustomUtil.getId();
// inCodeLogEntity.setGenKey(genKey);
// } else {
// genKey = postStockPrintRequest.getGenKey();
// inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey());
// }
// inCodeLogEntity.setStatus(IncodeStatus.PROCESS);
// inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys());
// inCodeLogService.insertInCodeLog(inCodeLogEntity);
List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas();
if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
for (StockPrintEntity stockPrintEntity : stockPrintEntities) {
@ -621,8 +664,6 @@ public class StockOrderController {
"#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode();
stockPrintEntity.setUdiCode(udiCode);
stockPrintService.insertStockPrint(stockPrintEntity);
//--------------------------
StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
stockQRCodeTextEntity.setOrderId(stockPrintEntity.getSOrderId());
stockQRCodeTextEntity.setDetailId(stockPrintEntity.getSDetailId());
@ -634,8 +675,6 @@ public class StockOrderController {
stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
}
}
// inCodeLogEntity.setStatus(IncodeStatus.FINISH);
// inCodeLogService.updateInCodeLog(inCodeLogEntity);
}
return genKey;
}

@ -324,6 +324,7 @@ public class StockOrderDetailController {
stockOrderDetailEntity.setProductDate(stockSelectDataEntity.getProductDate());
stockOrderDetailEntity.setExpireDate(stockSelectDataEntity.getExpireDate());
stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
stockOrderDetailEntity.setMeasname(udiInfoEntity.getMeasname());
stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
if (StrUtil.isNotEmpty(udiInfoEntity.getPrice())) {
@ -507,6 +508,41 @@ public class StockOrderDetailController {
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/inner/order/filterProduct")
public BaseResponse filterBasicProduct(FilterUdiInfoRequest filterUdiInfoRequest) {
String nameCode;
UdiEntity udiEntity;
if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) {
udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
if (udiEntity != null) {
nameCode = udiEntity.getUdi();
} else {
nameCode = filterUdiInfoRequest.getNameCode();
}
filterUdiInfoRequest.setNameCode(nameCode);
}
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (CollUtil.isNotEmpty(temps)) {
for (UdiRelevanceResponse udiRelevanceResponse : temps) {
udiRelevanceResponse.setRlId(udiRelevanceResponse.getId());
}
}
PageInfo<UdiRelevanceResponse> pageInfo = new PageInfo<>(temps);
PageSimpleResponse<UdiRelevanceResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(temps);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/udiwms/stock/order/detail/copy")
public BaseResponse uploadCount(@RequestParam("id") String id) {

@ -279,6 +279,9 @@ public class OrderController {
if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) {
if (bussinessTypeEntity.isEntrutSpms()) {
BaseResponse baseResponse = spsDirectClient.downloadOrder(orderFilterRequest.getOrderId(), userId + "", orderFilterRequest.getAction());
if(baseResponse==null){
return ResultVOUtils.error(500,"中继服务连接失败!");
}
return baseResponse;
} else
return ResultVOUtils.error(500, "单据未找到!");

@ -14,6 +14,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.business.StockOrderEntity;
import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
@ -36,6 +37,7 @@ import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest;
import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.BussinessOriginTypeResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.inout.ErpOrderResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.basic.*;
@ -114,6 +116,9 @@ public class OrderDetailController {
@Resource
SpsDirectClient spsDirectClient;
@Resource
UdiRelevanceService udiRelevanceService;
@AuthRuleAnnotation("")
@GetMapping("/spms/erpOrder/filter")
@ -264,13 +269,14 @@ public class OrderDetailController {
List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) {
StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity();
// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
//
// if (udiRelevanceEntity == null) {
// return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
// }
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrOrderDetailEntity.getProductId(), thrOrderDetailEntity.getThirdSysFk());
if (udiRelevanceEntity == null) {
return ResultVOUtils.error(500, "单据里含有未维护的产品信息,选入失败!");
}
BeanUtils.copyProperties(thrOrderDetailEntity, stockOrderDetailEntity);
stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
// stockOrderDetailEntity.setProductId(thrOrderDetailEntity.getProductId());
stockOrderDetailEntity.setProductId(udiRelevanceEntity.getId());
stockOrderDetailEntity.setCount(thrOrderDetailEntity.getCount());
stockOrderDetailEntity.setReCount(thrOrderDetailEntity.getReCount());
stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId());
@ -294,11 +300,11 @@ public class OrderDetailController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
if (filterErpOrderRequest.getIsDownThrSys()) {
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest);
return responseBaseResponse;
}
//
// if (filterErpOrderRequest.getIsDownThrSys()) {
// BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(filterErpOrderRequest);
// return responseBaseResponse;
// }
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessOriginTypeService.findSysByAction(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
@ -505,10 +511,11 @@ public class OrderDetailController {
ErpOrderEntity item = new ErpOrderEntity();
BeanUtils.copyProperties(erpOrderEntity, item);
item.setCode(codeDetaiEntity.getCode());
item.setCount(codeDetaiEntity.getCount());
item.setCount(codeDetaiEntity.getCount() * getActCount(codeDetaiEntity, udiRelevanceService));
item.setReCount(codeDetaiEntity.getCount());
item.setErpCount(codeDetaiEntity.getCount());
item.setCodeId(codeDetaiEntity.getId().intValue());
item.setSerialNo(codeDetaiEntity.getSerialNo());
resultList.add(item);
}
}
@ -703,4 +710,21 @@ public class OrderDetailController {
}
return ResultVOUtils.success("后台已开始校验,请稍后刷新重试!");
}
public int getActCount(WarehouseEntity warehouseEntity, UdiRelevanceService udiRelevanceService) {
UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode());
if (udiInfoBean != null) {
if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) {
if (udiInfoBean.getBhzxxsbzsl() == 0)
return udiInfoBean.getZxxsbzbhsydysl();
else
return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl();
} else {
return udiInfoBean.getBhzxxsbzsl();
}
}
return 1;
}
}

@ -646,7 +646,7 @@ public class WareHouseController {
UdiInfoEntity udiInfoEntity = udiInfoService.findByNameCode(udiEntity.getUdi());
if (!udiInfoEntity.isAllowNoBatch()) {
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
return ResultVOUtils.error(500, "批次号不能为空!");
return ResultVOUtils.error(500, "序列号与批次号不能同时为空!");
}
}

@ -0,0 +1,206 @@
package com.glxp.api.admin.controller.inventory;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.RepeatSubmit;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest;
import com.glxp.api.admin.req.inventory.InnerOrderRequest;
import com.glxp.api.admin.req.inventory.PostInnerOrderRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.inventory.InnerOrderDetailService;
import com.glxp.api.admin.service.inventory.InnerOrderService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.OrderNoTypeBean;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
/**
* pur
*
* @author anthony.ywj
* @date 2022-10-12
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/inv/inner/order")
public class InnerOrderController {
@Resource
InnerOrderService innerOrderService;
@Resource
InnerOrderDetailService innerOrderDetailService;
@Resource
CustomerService customerService;
@Resource
GennerOrderUtils gennerOrderUtils;
/**
*
*/
@RepeatSubmit()
@AuthRuleAnnotation("")
@PostMapping("/postOrder")
public BaseResponse postOrder(@RequestBody PostInnerOrderRequest postInnerOrderRequest) {
Integer userId = customerService.getUserId();
InnerOrderEntity innerOrderEntity = postInnerOrderRequest.getInnerOrderEntity();
innerOrderEntity.setCreateBy(userId + "");
innerOrderEntity.setCreateTime(new Date());
innerOrderEntity.setUpdateTime(new Date());
innerOrderEntity.setStatus(postInnerOrderRequest.getEditStatus()); //草稿状态
if (innerOrderEntity.getId() == null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.NBM_ORDER, "yyyyMMdd"));
innerOrderEntity.setRecordKey(billNo);
innerOrderEntity.setPrintStatus(1);
innerOrderEntity.setGenStatus(1);
innerOrderService.insert(innerOrderEntity);
} else {
innerOrderService.update(innerOrderEntity);
if (CollUtil.isNotEmpty(postInnerOrderRequest.getSubErpOrders())) {
innerOrderDetailService.deleteByOrderId(innerOrderEntity.getId() + "");
}
}
if (CollUtil.isNotEmpty(postInnerOrderRequest.getSubErpOrders())) {
for (StockOrderDetailEntity stockOrderDetailEntity : postInnerOrderRequest.getSubErpOrders()) {
InnerOrderDetailEntity innerOrderDetailEntity = new InnerOrderDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, innerOrderDetailEntity);
innerOrderDetailEntity.setOrderIdFk(innerOrderEntity.getId() + "");
innerOrderDetailService.insert(innerOrderDetailEntity);
}
}
return ResultVOUtils.success("提交成功!");
}
/**
*
*/
@GetMapping("/list")
public BaseResponse list(InnerOrderRequest innerOrderRequest) {
// if (innerOrderRequest.getStatus() == null) {
// innerOrderRequest.setStatus(11); //查询未审核和草稿状态
// }
List<InnerOrderEntity> innerOrderEntities = innerOrderService.queryPageList(innerOrderRequest);
PageInfo<InnerOrderEntity> pageInfo;
pageInfo = new PageInfo<>(innerOrderEntities);
PageSimpleResponse<InnerOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(innerOrderEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
@RepeatSubmit()
@PostMapping()
public BaseResponse add(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.insert(innerOrderEntity);
return ResultVOUtils.success("新增成功!");
}
/**
*
*/
@RepeatSubmit()
@PutMapping()
public BaseResponse edit(@RequestBody InnerOrderEntity innerOrderEntity) {
innerOrderService.update(innerOrderEntity);
return ResultVOUtils.success("删除成功");
}
/**
*
*
* @param ids
*/
@DeleteMapping("/{ids}")
public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable String[] ids) {
List<String> idArray = Arrays.asList(ids);
if (CollUtil.isNotEmpty(idArray)) {
innerOrderService.deleteByIds(idArray);
for (String id : idArray) {
innerOrderDetailService.deleteByOrderId(id + "");
}
}
return ResultVOUtils.success("删除成功");
}
/**
*
*/
@GetMapping("/list/detail")
public BaseResponse detailList(InnerOrderDetailRequest innerOrderDetailRequest) {
List<StockOrderDetailEntity> purApplyDetailEntities = innerOrderDetailService.joinQueryList(innerOrderDetailRequest);
PageInfo<StockOrderDetailEntity> pageInfo;
pageInfo = new PageInfo<>(purApplyDetailEntities);
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyDetailEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
@RepeatSubmit()
@PostMapping("/detail")
public BaseResponse detailAdd(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.insert(innerOrderDetailEntity);
return ResultVOUtils.success("删除成功");
}
/**
*
*/
@RepeatSubmit()
@PutMapping("/detail")
public BaseResponse detailEdit(@RequestBody InnerOrderDetailEntity innerOrderDetailEntity) {
innerOrderDetailService.update(innerOrderDetailEntity);
return ResultVOUtils.success("删除成功");
}
/**
*
*
* @param ids
*/
@DeleteMapping("/detail/{ids}")
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
innerOrderDetailService.deleteByIds(Arrays.asList(ids));
return ResultVOUtils.success("删除成功");
}
}

@ -13,6 +13,7 @@ import com.glxp.api.admin.req.purchase.PostPurApplyRequest;
import com.glxp.api.admin.req.purchase.PurApplyDetailRequest;
import com.glxp.api.admin.req.purchase.PurApplyRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.purchase.PurApplyResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.purchase.IPurApplyDetailService;
import com.glxp.api.admin.service.purchase.IPurApplyService;
@ -41,7 +42,6 @@ import java.util.List;
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/purchase/apply")
public class PurApplyController {
@Resource
@ -60,7 +60,7 @@ public class PurApplyController {
*/
@RepeatSubmit()
@AuthRuleAnnotation("")
@PostMapping("/postOrder")
@PostMapping("/purchase/apply/postOrder")
public BaseResponse postOrder(@RequestBody PostPurApplyRequest postPurApplyRequest) {
Integer userId = customerService.getUserId();
@ -95,35 +95,79 @@ public class PurApplyController {
/**
*
*/
@GetMapping("/list")
@GetMapping("/purchase/apply/list")
public BaseResponse list(PurApplyRequest purApplyRequest) {
List<PurApplyEntity> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
PageInfo<PurApplyEntity> pageInfo;
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
}
List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
PageInfo<PurApplyResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
PageSimpleResponse<PurApplyEntity> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
@GetMapping("/purchase/apply/auditList")
public BaseResponse auditList(PurApplyRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(10); //查询未审核和已审核状态
}
List<PurApplyResponse> purApplyEntities = purApplyService.queryPageList(purApplyRequest);
PageInfo<PurApplyResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
PageSimpleResponse<PurApplyResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*/
@RepeatSubmit()
@PostMapping("/purchase/apply/auditOrder")
public BaseResponse auditOrder(@RequestBody PurApplyRequest purApplyRequest) {
PurApplyEntity purApplyEntity = new PurApplyEntity();
BeanUtils.copyProperties(purApplyRequest, purApplyEntity);
purApplyService.update(purApplyEntity);
//审核通过后转换成采购计划单
return ResultVOUtils.success("更新成功!");
}
/**
*
*/
@RepeatSubmit()
@PostMapping()
@PostMapping("/purchase/apply")
public BaseResponse add(@RequestBody PurApplyEntity purApplyRequest) {
purApplyService.insert(purApplyRequest);
return ResultVOUtils.success("删除成功");
return ResultVOUtils.success("新增成功!");
}
/**
*
*/
@RepeatSubmit()
@PutMapping()
@PutMapping("/purchase/apply")
public BaseResponse edit(@RequestBody PurApplyEntity purApplyRequest) {
purApplyService.update(purApplyRequest);
return ResultVOUtils.success("删除成功");
@ -134,11 +178,18 @@ public class PurApplyController {
*
* @param ids
*/
@DeleteMapping("/{ids}")
@DeleteMapping("/purchase/apply/{ids}")
public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
List<Long> idArray = Arrays.asList(ids);
if (CollUtil.isNotEmpty(idArray)) {
purApplyService.deleteByIds(idArray);
for (Long id : idArray) {
purApplyDetailService.deleteByOrderId(id + "");
}
}
purApplyService.deleteByIds(Arrays.asList(ids));
return ResultVOUtils.success("删除成功");
}
@ -146,7 +197,7 @@ public class PurApplyController {
/**
*
*/
@GetMapping("/list/detail")
@GetMapping("/purchase/apply/list/detail")
public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
List<StockOrderDetailEntity> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
@ -163,7 +214,7 @@ public class PurApplyController {
*
*/
@RepeatSubmit()
@PostMapping("/detail")
@PostMapping("/purchase/apply/detail")
public BaseResponse detailAdd(@RequestBody PurApplyDetailEntity purApplyDetailRequest) {
purApplyDetailService.insert(purApplyDetailRequest);
@ -174,7 +225,7 @@ public class PurApplyController {
*
*/
@RepeatSubmit()
@PutMapping("/detail")
@PutMapping("/purchase/apply/detail")
public BaseResponse detailEdit(@RequestBody PurApplyDetailEntity purApplyDetailRequest) {
purApplyDetailService.update(purApplyDetailRequest);
return ResultVOUtils.success("删除成功");
@ -185,7 +236,7 @@ public class PurApplyController {
*
* @param ids
*/
@DeleteMapping("/detail/{ids}")
@DeleteMapping("/purchase/apply/detail/{ids}")
public BaseResponse detailRemove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {

@ -1,25 +1,34 @@
package com.glxp.api.admin.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.annotation.RepeatSubmit;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.constant.Constant;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import com.glxp.api.admin.req.purchase.PurApplyDetailRequest;
import com.glxp.api.admin.req.purchase.PostPurPlanRequest;
import com.glxp.api.admin.req.purchase.PurPlanDetailRequest;
import com.glxp.api.admin.req.purchase.PurPlanRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.purchase.PurPlanResponse;
import com.glxp.api.admin.service.auth.CustomerService;
import com.glxp.api.admin.service.purchase.IPurPlanDetailService;
import com.glxp.api.admin.service.purchase.IPurPlanService;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.OrderNoTypeBean;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotEmpty;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@ -35,21 +44,88 @@ import java.util.List;
@RequestMapping("/purchase/plan")
public class PurPlanController {
@Resource
IPurPlanService purPlanService;
@Resource
IPurPlanDetailService purPlanDetailService;
@Resource
CustomerService customerService;
@Resource
GennerOrderUtils gennerOrderUtils;
/**
*
*/
@RepeatSubmit()
@AuthRuleAnnotation("")
@PostMapping("/postOrder")
public BaseResponse postOrder(@RequestBody PostPurPlanRequest postPurPlanRequest) {
Integer userId = customerService.getUserId();
PurPlanEntity purApplyEntity = postPurPlanRequest.getPurPlanEntity();
purApplyEntity.setCreateBy(userId + "");
purApplyEntity.setCreateTime(new Date());
purApplyEntity.setUpdateTime(new Date());
purApplyEntity.setStatus(postPurPlanRequest.getEditStatus()); //草稿状态
if (purApplyEntity.getId() == null) {
String billNo = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.JH_ORDER, "yyyyMMdd"));
purApplyEntity.setBillNo(billNo);
purPlanService.insert(purApplyEntity);
} else {
purPlanService.update(purApplyEntity);
if (CollUtil.isNotEmpty(postPurPlanRequest.getSubErpOrders())) {
purPlanDetailService.deleteByOrderId(purApplyEntity.getId() + "");
}
}
if (CollUtil.isNotEmpty(postPurPlanRequest.getSubErpOrders())) {
for (StockOrderDetailEntity stockOrderDetailEntity : postPurPlanRequest.getSubErpOrders()) {
PurPlanDetailEntity purApplyDetailEntity = new PurPlanDetailEntity();
BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity);
purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + "");
purPlanDetailService.insert(purApplyDetailEntity);
}
}
return ResultVOUtils.success("提交成功!");
}
/**
*
*
*/
@GetMapping("/list")
public BaseResponse list(PurPlanRequest purPlanRequest) {
public BaseResponse list(PurPlanRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(11); //查询未审核和草稿状态
}
List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
PageInfo<PurPlanResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
List<PurPlanEntity> purApplyEntities = purPlanService.queryPageList(purPlanRequest);
PageInfo<PurPlanEntity> pageInfo;
/**
*
*/
@GetMapping("/auditList")
public BaseResponse auditList(PurPlanRequest purApplyRequest) {
if (purApplyRequest.getStatus() == null) {
purApplyRequest.setStatus(10); //查询未审核和已审核状态
}
List<PurPlanResponse> purApplyEntities = purPlanService.queryPageList(purApplyRequest);
PageInfo<PurPlanResponse> pageInfo;
pageInfo = new PageInfo<>(purApplyEntities);
PageSimpleResponse<PurPlanEntity> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<PurPlanResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyEntities);
return ResultVOUtils.success(pageSimpleResponse);
@ -58,78 +134,103 @@ public class PurPlanController {
/**
*
*
*/
@RepeatSubmit()
@PostMapping("/auditOrder")
public BaseResponse auditOrder(@RequestBody PurPlanRequest purApplyRequest) {
PurPlanEntity purApplyEntity = new PurPlanEntity();
BeanUtils.copyProperties(purApplyRequest, purApplyEntity);
purPlanService.update(purApplyEntity);
return ResultVOUtils.success("更新成功!");
}
/**
*
*/
@RepeatSubmit()
@PostMapping()
public BaseResponse add(@RequestBody PurPlanRequest purApplyRequest) {
public BaseResponse add(@RequestBody PurPlanEntity purApplyRequest) {
purPlanService.insert(purApplyRequest);
return ResultVOUtils.success("删除成功");
return ResultVOUtils.success("新增成功!");
}
/**
*
*
*/
@RepeatSubmit()
@PutMapping()
public BaseResponse edit(@RequestBody PurPlanRequest purApplyRequest) {
public BaseResponse edit(@RequestBody PurPlanEntity purApplyRequest) {
purPlanService.update(purApplyRequest);
return ResultVOUtils.success("删除成功");
}
/**
*
*
* @param ids
*/
@DeleteMapping("/{ids}")
public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] ids) {
purPlanService.deleteByIds(Arrays.asList(ids));
return ResultVOUtils.success("删除成功");
}
/**
*
*
*/
@GetMapping("/list/detail")
public BaseResponse detailList(PurPlanDetailRequest purPlanDetailRequest) {
public BaseResponse detailList(PurPlanDetailRequest purApplyDetailRequest) {
List<PurPlanDetailEntity> purApplyDetailEntities = purPlanDetailService.queryPageList(purPlanDetailRequest);
PageInfo<PurPlanDetailEntity> pageInfo;
List<StockOrderDetailEntity> purApplyDetailEntities = purPlanDetailService.joinQueryList(purApplyDetailRequest);
PageInfo<StockOrderDetailEntity> pageInfo;
pageInfo = new PageInfo<>(purApplyDetailEntities);
PageSimpleResponse<PurPlanDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
PageSimpleResponse<StockOrderDetailEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(purApplyDetailEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
/**
*
*
*
* @param ids
*/
@DeleteMapping("/{ids}")
public BaseResponse remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
List<Integer> idArray = Arrays.asList(ids);
if (CollUtil.isNotEmpty(idArray)) {
purPlanService.deleteByIds(idArray);
for (Integer id : idArray) {
purPlanDetailService.deleteByOrderId(id + "");
}
}
return ResultVOUtils.success("删除成功");
}
/**
*
*/
@RepeatSubmit()
@PostMapping("/detail")
public BaseResponse detailAdd(@RequestBody PurPlanDetailRequest purPlanDetailRequest) {
public BaseResponse detailAdd(@RequestBody PurPlanDetailEntity purPlanDetailRequest) {
purPlanDetailService.insert(purPlanDetailRequest);
return ResultVOUtils.success("删除成功");
return ResultVOUtils.success("新增成功");
}
/**
*
*
*/
@RepeatSubmit()
@PutMapping("/detail")
public BaseResponse detailEdit(@RequestBody PurPlanDetailRequest purPlanDetailRequest) {
public BaseResponse detailEdit(@RequestBody PurPlanDetailEntity purPlanDetailRequest) {
purPlanDetailService.update(purPlanDetailRequest);
return ResultVOUtils.success("删除成功");
return ResultVOUtils.success("修改成功");
}
/**
*
*
*
* @param ids
*/
@ -141,4 +242,5 @@ public class PurPlanController {
return ResultVOUtils.success("删除成功");
}
}

@ -0,0 +1,151 @@
package com.glxp.api.admin.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.info.CompanyRequest;
import com.glxp.api.admin.req.info.DeleteCompanyFileRequest;
import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
import com.glxp.api.admin.req.purchase.PostSelCertRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.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("")
@PostMapping("/sup/info/selectAllCert")
public BaseResponse selectAllCert(@RequestBody PostSelCertRequest postSelCertRequest) {
String customerId = getCustomerId();
if (CollUtil.isEmpty(postSelCertRequest.getSupCertSetEntities())) {
return ResultVOUtils.error(500, "请选入资质证书!");
}
if (postSelCertRequest.getCertType() == null) {
return ResultVOUtils.error(500, "参数错误!");
}
for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
SupCertEntity supCertEntity = new SupCertEntity();
supCertEntity.setName(supCertSetEntity.getName());
supCertEntity.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk());
supCertEntity.setProductIdFk(postSelCertRequest.getProductIdFk());
supCertEntity.setCustomerId(customerId);
supCertEntity.setType(postSelCertRequest.getCertType());
supCertEntity.setCreateTime(new Date());
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT);
supCertEntity.setUpdateTime(new Date());
boolean b = supCertService.insertCompanyCert(supCertEntity);
}
return ResultVOUtils.success("成功");
}
@AuthRuleAnnotation("")
@GetMapping("/sale/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,76 @@
package com.glxp.api.admin.controller.purchase;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.purchase.SupCertSetService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
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 javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@RestController
public class SupCertSetController {
@Resource
private SupCertSetService supCertSetService;
@AuthRuleAnnotation("")
@GetMapping("/sup/cert/set/filter")
public BaseResponse filterCertSet(FilterCertSetsRequest filterCertSetsRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<SupCertSetEntity> supCertEntityList
= supCertSetService.filterCertSets(filterCertSetsRequest);
PageInfo<SupCertSetEntity> pageInfo;
pageInfo = new PageInfo<>(supCertEntityList);
PageSimpleResponse<SupCertSetEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(supCertEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/add")
public BaseResponse addCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
if (supCertSetEntity == null) {
supCertSetEntity = new SupCertSetEntity();
}
supCertSetEntity.setUpdateTime(new Date());
boolean b = supCertSetService.insertCertSet(supCertSetEntity);
return ResultVOUtils.success("添加成功!");
}
@AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/update")
public BaseResponse updateCertSet(@RequestBody SupCertSetEntity supCertSetEntity) {
boolean b = supCertSetService.updateCertSet(supCertSetEntity);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("")
@PostMapping("/sup/cert/set/delete")
public BaseResponse deleteCertSet(@RequestBody DeleteRequest deleteRequest) {
boolean b = supCertSetService.deleteById(deleteRequest.getId());
return ResultVOUtils.success("删除成功!");
}
}

@ -0,0 +1,251 @@
package com.glxp.api.admin.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
import com.glxp.api.admin.entity.purchase.CustomerContactEntity;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
import com.glxp.api.admin.req.purchase.FilterSupCompanyRequest;
import com.glxp.api.admin.req.purchase.SelectCorpBindRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.admin.service.purchase.CustomerContactService;
import com.glxp.api.admin.service.purchase.SupCertSetService;
import com.glxp.api.admin.service.purchase.SupCompanyService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.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;
import java.util.ListIterator;
@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;
@Resource
SupCertSetService supCertSetService;
@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) {
if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//提交审核
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId());
//验证
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.isNeed()) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传,无法提交审核!");
}
}
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)) {
for (SupCertEntity supCertEntity : supCertEntityList) {
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
supCertService.updateCompanyCert(supCertEntity);
}
// 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("/sup/company/selectBind")
public BaseResponse selectBind(@RequestBody SelectCorpBindRequest selectCorpBindRequest) {
BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByErpId(selectCorpBindRequest.getCustomerId());
SupCompanyEntity supCompanyEntity = new SupCompanyEntity();
supCompanyEntity.setCustomerId(basicUnitMaintainEntity.getErpId());
supCompanyEntity.setCompanyName(basicUnitMaintainEntity.getName());
supCompanyEntity.setCreditNum(basicUnitMaintainEntity.getCreditNo());
supCompanyEntity.setContacts(basicUnitMaintainEntity.getContact());
supCompanyEntity.setTel(basicUnitMaintainEntity.getMobile());
return ResultVOUtils.success(supCompanyEntity);
}
@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;
}
}

@ -0,0 +1,63 @@
package com.glxp.api.admin.controller.purchase;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.purchase.CustomerContactEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.purchase.CustomerContactService;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
@RestController
@Slf4j
public class SupContactController {
@Resource
private CustomerContactService customerContactService;
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/list")
public BaseResponse filterList(CustomerContactFilterRequest customerFilterRequest) {
List<CustomerContactEntity> customerContactEntityList = customerContactService.filterCustomerContact(customerFilterRequest);
PageInfo<CustomerContactEntity> pageInfo;
pageInfo = new PageInfo<>(customerContactEntityList);
PageSimpleResponse<CustomerContactEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(customerContactEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/add")
public BaseResponse addContact(CustomerContactEntity customerContactEntity) {
boolean b = customerContactService.insertCustomerContact(customerContactEntity);
if (b)
return ResultVOUtils.success("添加成功");
else {
return ResultVOUtils.error(500, "添加失败");
}
}
@AuthRuleAnnotation("")
@GetMapping("salewarehouse/customerContact/delete")
public BaseResponse deleteContact(DeleteRequest deleteRequest) {
boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
if (b)
return ResultVOUtils.success("删除成功");
else {
return ResultVOUtils.error(500, "删除失败");
}
}
}

@ -0,0 +1,241 @@
package com.glxp.api.admin.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.admin.service.purchase.SupCertSetService;
import com.glxp.api.admin.service.purchase.SupCompanyService;
import com.glxp.api.admin.service.purchase.SupManufacturerService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.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;
import java.util.ListIterator;
@RestController
public class SupManufacturerController {
@Resource
private AuthAdminService authAdminService;
@Resource
private SupManufacturerService supManufacturerService;
@Resource
private SupCertService supCertService;
@Resource
private SupCompanyService supCompanyService;
@Resource
SupCertSetService supCertSetService;
@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("")
@GetMapping("/sup/manufacturer/getCompanyBySup")
public BaseResponse getCompanyBySup(FilterSupManufacturerRequest filterSupManufacturerRequest) {
filterSupManufacturerRequest.setCustomerId(getCustomerId());
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, "所属配送企业资质未通过审核,暂时无法提交!");
}
//验证证书是否齐全
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId());
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.isNeed()
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(!supCertSetEntity.isNeed()
&& supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 1
&& supManufacturerEntity.getCompanyType().equals("1"))) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传,无法提交审核!");
}
}
supManufacturerEntity.setUpdateDate(new Date());
SupManufacturerEntity originEntity = supManufacturerService.findManufacturer(supManufacturerEntity.getManufacturerId());
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)) {
for (SupCertEntity supCertEntity : supCertEntityList) {
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
supCertService.updateCompanyCert(supCertEntity);
}
// 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,367 @@
package com.glxp.api.admin.controller.purchase;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.constant.ConstantStatus;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.admin.entity.purchase.SupProductEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.info.DeleteCompanyFileRequest;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import com.glxp.api.admin.req.purchase.FilterPoductRequest;
import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
import com.glxp.api.admin.req.purchase.SelectProductBindRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
import com.glxp.api.admin.res.purchase.SupProductResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.basic.BasicThirdSysService;
import com.glxp.api.admin.service.basic.UdiInfoService;
import com.glxp.api.admin.service.basic.UdiRelevanceService;
import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
import com.glxp.api.admin.service.purchase.SupCertService;
import com.glxp.api.admin.service.purchase.SupCertSetService;
import com.glxp.api.admin.service.purchase.SupManufacturerService;
import com.glxp.api.admin.service.purchase.SupProductService;
import com.glxp.api.admin.service.thrsys.ThrProductsService;
import com.glxp.api.admin.util.CustomUtil;
import com.glxp.api.admin.util.DateUtil;
import com.glxp.api.admin.util.GennerOrderUtils;
import com.glxp.api.admin.util.UdiInfoUtil;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
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;
import java.util.ListIterator;
@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;
@Resource
SupManufacturerService supManufacturerService;
@Resource
SupCertSetService supCertSetService;
@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/selectBind")
public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(selectProductBindRequest.getRelIdFk());
SupProductEntity supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
supProductEntity.setRelIdFk(selectProductBindRequest.getRelIdFk());
supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
supProductEntity.setCreate_date(new Date());
supProductEntity.setUpdate_date(new Date());
supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
return ResultVOUtils.success(supProductEntity);
// boolean b = supProductService.insertRegistration(supProductEntity);
// if (b) {
// return ResultVOUtils.success(supProductEntity);
// } 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, "参数错误!");
}
//提交审核
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN
|| supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) {
return ResultVOUtils.error(500, "所属生产企业资质未通过审核,暂时无法提交!");
}
//验证证书是否齐全
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
List<SupCertEntity> supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId());
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.isNeed()
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")
)
||
(!supCertSetEntity.isNeed() &&
supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3
&& !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进")
)
||
(!supCertSetEntity.isNeed() &&
!StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx())
)
||
(!supCertSetEntity.isNeed() &&
!StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb())
)
) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传,无法提交审核!");
}
}
supProductEntity.setUpdate_date(new Date());
SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId());
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)) {
for (SupCertEntity supCertEntity : supCertEntityList) {
supCertEntity.setAuditStatus(ConstantStatus.AUDIT_PASS);
supCertService.updateCompanyCert(supCertEntity);
}
// 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.setThirdSys(basicThirdSysEntity.getThirdId());
// 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() + "";
}
}

@ -0,0 +1,151 @@
package com.glxp.api.admin.controller.purchase;
import com.github.pagehelper.PageInfo;
import com.glxp.api.admin.annotation.AuthRuleAnnotation;
import com.glxp.api.admin.entity.auth.AuthAdmin;
import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity;
import com.glxp.api.admin.exception.JsonException;
import com.glxp.api.admin.req.info.CompanyRequest;
import com.glxp.api.admin.req.info.DeleteCompanyFileRequest;
import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.auth.AuthAdminService;
import com.glxp.api.admin.service.purchase.CompanySalesmanService;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.apache.commons.lang3.StringUtils;
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 SupSalesmanController {
@Resource
private AuthAdminService authAdminService;
@Resource
private CompanySalesmanService companySalesmanService;
@Value("${file_path}")
private String filePath;
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/salesman/filter")
public BaseResponse filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<CompanySalesmanEntity> companySalesmanEntityList
= companySalesmanService.filterCompanySalesman(filterCompanySalesmanRequest);
PageInfo<CompanySalesmanEntity> pageInfo;
pageInfo = new PageInfo<>(companySalesmanEntityList);
PageSimpleResponse<CompanySalesmanEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(companySalesmanEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@GetMapping("/sale/info/companySalesman")
public BaseResponse getCompanySalesmanInfo(CompanyRequest companyRequest) {
CompanySalesmanEntity companySalesmanEntity = companySalesmanService.findCompanySalesman(companyRequest.getCustomerId());
if (companySalesmanEntity != null) {
return ResultVOUtils.success(companySalesmanEntity);
}
return ResultVOUtils.error(500, "空");
}
@AuthRuleAnnotation("")
@GetMapping("/sale/info/getCompanySalesman")
public BaseResponse getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest) {
filterCompanySalesmanRequest.setCustomerId(getCustomerId());
List<CompanySalesmanEntity> companySalesmanEntities = companySalesmanService.getCompanySalesman(filterCompanySalesmanRequest);
PageInfo<CompanySalesmanEntity> pageInfo = new PageInfo<>(companySalesmanEntities);
PageSimpleResponse<CompanySalesmanEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(companySalesmanEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/sale/info/insertCompanySalesman")
public BaseResponse insertCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) {
companySalesmanEntity.setCreate_time(new Date());
companySalesmanEntity.setUpdate_time(new Date());
companySalesmanEntity.setAuditStatus("3");
boolean b = companySalesmanService.insertCompanySalesman(companySalesmanEntity);
return ResultVOUtils.success("成功");
}
@AuthRuleAnnotation("")
@PostMapping("/sale/info/updateCompanySalesman")
public BaseResponse updateCompanySalesman(@RequestBody CompanySalesmanEntity companySalesmanEntity) {
companySalesmanEntity.setUpdate_time(new Date());
if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath())) {
if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath())) {
String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
}
}
companySalesmanEntity.setFilePath(companySalesmanEntity.getNewFilePath());
}
if (StringUtils.isNotBlank(companySalesmanEntity.getNewFilePath2())) {
if (StringUtils.isNotBlank(companySalesmanEntity.getFilePath2())) {
String URL=filePath+"/register/file/image5/" + companySalesmanEntity.getFilePath2();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
}
}
companySalesmanEntity.setFilePath2(companySalesmanEntity.getNewFilePath2());
}
companySalesmanEntity.setAuditStatus("4");
boolean b = companySalesmanService.updateCompanySalesman(companySalesmanEntity);
return ResultVOUtils.success("修改成功");
}
@AuthRuleAnnotation("")
@PostMapping("/sale/info/deleteCompanySalesman")
public BaseResponse deleteCompanySalesman(@RequestBody DeleteCompanyFileRequest deleteCompanyFileRequest, BindingResult bindingResult) {
boolean b = companySalesmanService.deleteById(deleteCompanyFileRequest.getId());
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath())) {
String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath();
File file=new File(URL);
if(file.exists()&&file.isFile()) {
file.delete();
}
}
if (StringUtils.isNotBlank(deleteCompanyFileRequest.getFilePath2())) {
String URL=filePath+"/register/file/image5/" + deleteCompanyFileRequest.getFilePath2();
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() + "";
}
}

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

@ -0,0 +1,21 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.req.inventory.InnerOrderRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface InnerOrderDao {
List<InnerOrderEntity> queryPageList(InnerOrderRequest innerOrderRequest);
Integer insert(InnerOrderEntity innerOrderEntity);
Boolean update(InnerOrderEntity innerOrderEntity);
Boolean deleteByIds(@Param("ids") List<String> ids);
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.dao.inventory;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest;
import com.glxp.api.admin.req.purchase.PurApplyDetailRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InnerOrderDetailDao {
List<StockOrderDetailEntity> joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest);
Boolean insert(InnerOrderDetailEntity purApplyDetailEntity);
Boolean update(InnerOrderDetailEntity purApplyRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
}

@ -30,4 +30,7 @@ public interface InvPreInProductDao {
boolean deleteById(@Param("id") String id);
boolean deleteAll();
boolean deleteByOrderIdFk(@Param("orderIdFk") String orderIdFk);
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity;
import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface CompanySalesmanDao {
List<CompanySalesmanEntity> filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
CompanySalesmanEntity findCompanySalesman(String CustomerId);
CompanySalesmanEntity findCompanySalesmanByName(String name);
List<CompanySalesmanEntity> getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
boolean updateCompanySalesman(CompanySalesmanEntity companySalesmanEntity);
boolean insertCompanySalesman(CompanySalesmanEntity companySalesmanEntity);
boolean deleteById(String id);
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity;
import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface CompanyUpdateLogDao {
List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit);
List<CompanyUpdateLogEntity> getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity);
boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity);
boolean deleteById(String id);
}

@ -0,0 +1,25 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.CustomerContactEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface CustomerContacDao {
List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest);
boolean insertCustomerContact(CustomerContactEntity customerContactEntity);
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
boolean deleteById(Long customerId);
CustomerContactEntity selectById(Long customerId);
boolean deleteContact(DeleteRequest deleteRequest);
}

@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.req.purchase.PurApplyRequest;
import com.glxp.api.admin.res.purchase.PurApplyResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -10,7 +11,7 @@ import java.util.List;
@Mapper
public interface PurApplyDao {
List<PurApplyEntity> queryPageList(PurApplyRequest purApplyRequest);
List<PurApplyResponse> queryPageList(PurApplyRequest purApplyRequest);
Integer insert(PurApplyEntity purApplyRequest);

@ -2,19 +2,21 @@ package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import com.glxp.api.admin.req.purchase.PurPlanRequest;
import com.glxp.api.admin.res.purchase.PurPlanResponse;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface PurPlanDao {
List<PurPlanEntity> queryPageList(PurPlanRequest purPlanRequest);
List<PurPlanResponse> queryPageList(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanEntity purPlanRequest);
Boolean update(PurPlanRequest purPlanRequest);
Boolean update(PurPlanEntity purPlanRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByIds(@Param("ids") List<Integer> ids);
}

@ -1,18 +1,27 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity;
import com.glxp.api.admin.req.purchase.PurApplyDetailRequest;
import com.glxp.api.admin.req.purchase.PurPlanDetailRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface PurPlanDetailDao {
List<PurPlanDetailEntity> queryPageList(PurPlanDetailRequest purApplyRequest);
List<PurPlanDetailEntity> queryPageList(PurPlanDetailRequest purPlanDetailRequest);
List<StockOrderDetailEntity> joinQueryList(PurPlanDetailRequest purPlanDetailRequest);
Boolean insert(PurPlanDetailRequest purPlanDetailRequest);
Boolean insert(PurPlanDetailEntity purPlanDetailRequest);
Boolean update(PurPlanDetailRequest purPlanDetailRequest);
Boolean update(PurPlanDetailEntity purPlanDetailRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
}

@ -0,0 +1,35 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.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,19 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@Mapper
public interface SupCertSetDao {
List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
boolean insertCertSet(SupCertSetEntity supCertSetEntity);
boolean updateCertSet(SupCertSetEntity supCertSetEntity);
boolean deleteById(String id);
}

@ -0,0 +1,28 @@
package com.glxp.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.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.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.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.api.admin.dao.purchase;
import com.glxp.api.admin.entity.purchase.SupProductEntity;
import com.glxp.api.admin.req.purchase.FilterPoductRequest;
import com.glxp.api.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);
}

@ -9,16 +9,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 String price;
}

@ -76,4 +76,7 @@ public class OrderEntity {
* UDI
*/
private boolean codeFillCheck;
private String preInBillNo;
private String preOutBillNo;
}

@ -0,0 +1,17 @@
package com.glxp.api.admin.entity.inventory;
import lombok.Data;
@Data
public class InnerOrderDetailEntity {
private Long id;
private String orderIdFk;
private String productId;
private String productName;
private Integer count;
private String productDate;
private String expireDate;
private String batchNo;
}

@ -0,0 +1,22 @@
package com.glxp.api.admin.entity.inventory;
import lombok.Data;
import java.util.Date;
@Data
public class InnerOrderEntity {
private Integer id;
private String recordKey;
private Date createTime;
private Integer genStatus;
private Integer printStatus;
private Date updateTime;
private String remark;
private String createBy;
private int status;
private String createByName;
}

@ -27,6 +27,8 @@ public class InvProductEntity {
private String price;
private Date updateTime;
private String orderIdFk;
public Integer getInCount() {
if (inCount == null)
return 0;

@ -0,0 +1,28 @@
package com.glxp.api.admin.entity.purchase;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class CompanySalesmanEntity {
private Integer id;
private Long customerId;
private String name;
private String tel;
private String phone;
private String email;
private String certType;
private String certCode;
private String filePath;
private String filePath2;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date create_time;
private Date update_time;
private String auditStatus;
private String newFilePath;
private String newFilePath2;
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.entity.purchase;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@Data
public class CompanyUpdateLogEntity {
private Integer id;
private Long customerId;
private String updateCause;
private String status;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date create_time;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date update_time;
private String submit;
private String auditor;
private String noPassCause;
private String param;
private String logType;
}

@ -0,0 +1,15 @@
package com.glxp.api.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;
}

@ -70,4 +70,6 @@ public class PurApplyEntity {
private Date updateTime;
private String auditRemark;
}

@ -18,7 +18,7 @@ public class PurPlanDetailEntity {
/**
* ID
*/
private Long productId;
private String productId;
/**
*
*/
@ -26,7 +26,7 @@ public class PurPlanDetailEntity {
/**
*
*/
private Long count;
private Integer count;
/**
* ID
*/

@ -22,7 +22,7 @@ public class PurPlanEntity {
/**
*
*/
private Long id;
private Integer id;
/**
*
*/
@ -34,11 +34,11 @@ public class PurPlanEntity {
/**
* 1.稿2.3.
*/
private Long status;
private Integer status;
/**
*
*/
private Long billType;
private Integer billType;
/**
*
*/
@ -71,4 +71,6 @@ public class PurPlanEntity {
*/
private Date createTime;
private Date updateTime;
}

@ -0,0 +1,34 @@
package com.glxp.api.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;
private int status; //0启用1:禁用
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.entity.purchase;
import lombok.Data;
import java.util.Date;
@Data
public class SupCertSetEntity {
private Integer id;
private String name;
private boolean need;
private Integer foreign;
private String cplx;
private String hchzsb;
private String flbm;
private Integer imports;
private String remark;
private Date updateTime;
private Integer type;
private boolean isPass;
}

@ -0,0 +1,80 @@
package com.glxp.api.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;
private int status; //0启用1:禁用
}

@ -0,0 +1,40 @@
package com.glxp.api.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,61 @@
package com.glxp.api.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;
private String hchzsb;
private String relIdFk;
}

@ -38,4 +38,6 @@ public class ThrOrderEntity {
private Integer editStatus;
private String invWarehouseCode;
private String unitIdFk;
}

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

@ -6,6 +6,6 @@ import lombok.Data;
@Data
public class FilterStPrintTempRequest extends ListPageRequest {
private Integer id;
private Integer printCodeIdFk;
private Integer stockOrderFk;
private String printCodeIdFk;
private String stockOrderFk;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class InnerOrderDetailRequest extends ListPageRequest {
private String orderIdFk;
private String productId;
}

@ -0,0 +1,11 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class InnerOrderRequest extends ListPageRequest {
private String recordKey;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.req.inventory;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostInnerOrderRequest {
int editStatus;
InnerOrderEntity innerOrderEntity;
List<InnerOrderDetailEntity> innerOrderDetailEntities;
List<StockOrderDetailEntity> subErpOrders;
}

@ -0,0 +1,10 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class CustomerContactFilterRequest extends ListPageRequest {
private Integer customerId;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterCertSetsRequest extends ListPageRequest {
private String name;
private Integer type;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterCompanySalesmanRequest extends ListPageRequest {
private String customerId;
private String name;
private String auditStatus;
}

@ -0,0 +1,15 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.req.ListPageRequest;
import lombok.Data;
@Data
public class FilterCompanyUpdateLogRequest extends ListPageRequest {
private String customerId;
private String status;
private String submit;
private String logType;
private String noStatus;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.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.api.admin.req.purchase;
import com.glxp.api.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.api.admin.req.purchase;
import com.glxp.api.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.api.admin.req.purchase;
import com.glxp.api.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;
}

@ -0,0 +1,20 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostPurPlanRequest {
int editStatus;
PurPlanEntity purPlanEntity;
List<PurPlanDetailEntity> purPlanDetailEntities;
List<StockOrderDetailEntity> subErpOrders;
}

@ -0,0 +1,16 @@
package com.glxp.api.admin.req.purchase;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import lombok.Data;
import java.util.List;
@Data
public class PostSelCertRequest {
private Integer certType;
private String manufacturerIdFk;
private String productIdFk;
private List<SupCertSetEntity> supCertSetEntities;
}

@ -21,7 +21,7 @@ public class PurApplyRequest extends ListPageRequest {
*
*/
@NotNull(message = "不能为空")
private Long id;
private Integer id;
/**
*
@ -39,13 +39,13 @@ public class PurApplyRequest extends ListPageRequest {
* 1.稿2.3.
*/
@NotNull(message = "状态1.草稿2.未审核3.已审核)不能为空")
private Long status;
private Integer status;
/**
*
*/
@NotNull(message = "申购类型不能为空")
private Long billType;
private Integer billType;
/**
*
@ -94,4 +94,5 @@ public class PurApplyRequest extends ListPageRequest {
private Date createTime;
}

@ -41,7 +41,7 @@ public class PurPlanRequest extends ListPageRequest {
* 1.稿2.3.
*/
@NotNull(message = "状态1.草稿2.未审核3.已审核)不能为空")
private Long status;
private Integer status;
/**
*

@ -0,0 +1,9 @@
package com.glxp.api.admin.req.purchase;
import lombok.Data;
@Data
public class SelectCorpBindRequest {
private String customerId;
}

@ -0,0 +1,13 @@
package com.glxp.api.admin.req.purchase;
import lombok.Data;
@Data
public class SelectProductBindRequest {
private String productId;
private String relIdFk;
private String manufacturerId;
private String customerId;
private Integer auditStatus;
}

@ -86,6 +86,7 @@ public class UdiRelevanceResponse {
private String basicPrductRemak6;
private String basicPrductRemak7;
private String basicPrductRemak8;
private Integer rlId;
public int getBhzxxsbzsl() {

@ -20,4 +20,11 @@ public class OrderNoResult {
//复制单号,多个单号之间使用英文逗号,分隔
private String replicateNo;
//验收出库关联的预验收入库单,多个单号,隔开
private String preInBillNo;
//预验收入库单关联的预验收出库单,多个单号,隔开
private String preOutBillNo;
}

@ -25,8 +25,8 @@ public class InvProductResponse {
private String invStorageName;
private String invSubStorageName;
private String invWarehouseCode;
private String price;
private String orderIdFk;
public Integer getInCount() {
if (inCount == null)

@ -0,0 +1,71 @@
package com.glxp.api.admin.res.purchase;
import lombok.Data;
import java.util.Date;
@Data
public class PurApplyResponse {
/**
*
*/
private Integer id;
/**
*
*/
private String billNo;
/**
*
*/
private Date billDate;
/**
* 1.稿2.3.
*/
private int status;
/**
*
*/
private Long billType;
/**
*
*/
private String remark;
/**
*
*/
private String locStorageCode;
/**
*
*/
private String invWarehouseCode;
/**
*
*/
private String deptCode;
/**
*
*/
private String auditBy;
/**
*
*/
private Date auditTime;
private String createBy;
/**
*
*/
private Date createTime;
private Date updateTime;
private String createByName;
private String auditByName;
private String invName;
private String subInvName;
private String auditRemark;
}

@ -0,0 +1,69 @@
package com.glxp.api.admin.res.purchase;
import lombok.Data;
import java.util.Date;
@Data
public class PurPlanResponse {
/**
*
*/
private Integer id;
/**
*
*/
private String billNo;
/**
*
*/
private Date billDate;
/**
* 1.稿2.3.
*/
private Integer status;
/**
*
*/
private Integer billType;
/**
*
*/
private String remark;
/**
*
*/
private String locStorageCode;
/**
*
*/
private String invWarehouseCode;
/**
*
*/
private String deptCode;
/**
*
*/
private String auditBy;
/**
*
*/
private Date auditTime;
private String createBy;
/**
*
*/
private Date createTime;
private Date updateTime;
private String createByName;
private String auditByName;
private String invName;
private String subInvName;
private String auditRemark;
}

@ -0,0 +1,12 @@
package com.glxp.api.admin.res.purchase;
import com.glxp.api.admin.entity.purchase.SupProductEntity;
import lombok.Data;
@Data
public class SupProductResponse extends SupProductEntity {
private String supName;
private String manufacturerName;
}

@ -94,6 +94,9 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService {
@Override
public BasicUnitMaintainEntity selectByErpId(String id) {
if (id == null) {
return null;
}
BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest();
filterUdiInfoRequest.setErpId(id);
List<BasicUnitMaintainEntity> basicUnitMaintainEntities = basicUnitMaintainDao.filterList(filterUdiInfoRequest);

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

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

@ -238,6 +238,8 @@ public class OrderServiceImpl implements OrderService {
return orderDao.findAllByTime(orderFilterRequest);
}
//平衡补单
@Override
public BaseResponse supplementOrder(String billNo, String orderIdFk) {
//查询订单数据
@ -275,6 +277,7 @@ public class OrderServiceImpl implements OrderService {
supplementOrder.setCorpOrderId(CustomUtil.getId() + "x");
//修改往来单位及当前库存号
supplementOrder.setFromCorpId(order.getLocStorageCode());
supplementOrder.setFromSubInvCode(order.getInvWarehouseCode());
supplementOrder.setLocStorageCode(order.getFromCorpId());
supplementOrder.setInvWarehouseCode(null);
String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId());

@ -0,0 +1,23 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InnerOrderDetailService {
List<StockOrderDetailEntity> joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest);
Boolean insert(InnerOrderDetailEntity purApplyDetailEntity);
Boolean update(InnerOrderDetailEntity purApplyRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk);
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.service.inventory;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.req.inventory.InnerOrderRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface InnerOrderService {
InnerOrderEntity findByRecordKey(String recordKey);
List<InnerOrderEntity> queryPageList(InnerOrderRequest innerOrderRequest);
Integer insert(InnerOrderEntity innerOrderRequest);
Boolean update(InnerOrderEntity innerOrderRequest);
Boolean deleteByIds(List<String> ids);
}

@ -31,4 +31,6 @@ public interface InvPreInProductDetailService {
InvProductDetailEntity statInvPreInDetail(String code);
boolean deleteByOrderIdFk(String orderIdFk);
}

@ -25,4 +25,6 @@ public interface InvPreInProductService {
boolean deleteById(String id);
boolean deleteAll();
boolean deleteByOrderIdFk(String orderIdFk);
}

@ -0,0 +1,53 @@
package com.glxp.api.admin.service.inventory.impl;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.inventory.InnerOrderDetailDao;
import com.glxp.api.admin.dao.purchase.PurPlanDetailDao;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.inventory.InnerOrderDetailEntity;
import com.glxp.api.admin.req.inventory.InnerOrderDetailRequest;
import com.glxp.api.admin.service.inventory.InnerOrderDetailService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class InnerOrderDetailServiceImpl implements InnerOrderDetailService {
@Resource
InnerOrderDetailDao innerOrderDetailDao;
@Override
public List<StockOrderDetailEntity> joinQueryList(InnerOrderDetailRequest innerOrderDetailRequest) {
if (innerOrderDetailRequest == null) {
return Collections.emptyList();
}
if (innerOrderDetailRequest.getPage() != null) {
int offset = (innerOrderDetailRequest.getPage() - 1) * innerOrderDetailRequest.getLimit();
PageHelper.offsetPage(offset, innerOrderDetailRequest.getLimit());
}
List<StockOrderDetailEntity> data = innerOrderDetailDao.joinQueryList(innerOrderDetailRequest);
return data;
}
@Override
public Boolean insert(InnerOrderDetailEntity innerOrderDetailEntity) {
return innerOrderDetailDao.insert(innerOrderDetailEntity);
}
@Override
public Boolean update(InnerOrderDetailEntity innerOrderDetailEntity) {
return innerOrderDetailDao.update(innerOrderDetailEntity);
}
@Override
public Boolean deleteByIds(List<Long> ids) {
return innerOrderDetailDao.deleteByIds(ids);
}
@Override
public Boolean deleteByOrderId(String orderIdFk) {
return innerOrderDetailDao.deleteByOrderId(orderIdFk);
}
}

@ -0,0 +1,60 @@
package com.glxp.api.admin.service.inventory.impl;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.admin.dao.inventory.InnerOrderDao;
import com.glxp.api.admin.entity.inventory.InnerOrderEntity;
import com.glxp.api.admin.req.inventory.InnerOrderRequest;
import com.glxp.api.admin.service.inventory.InnerOrderService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.List;
@Service
public class InnerOrderServiceImpl implements InnerOrderService {
@Resource
InnerOrderDao innerOrderDao;
@Override
public InnerOrderEntity findByRecordKey(String recordKey) {
if (StrUtil.isEmpty(recordKey))
return null;
InnerOrderRequest innerOrderRequest = new InnerOrderRequest();
innerOrderRequest.setRecordKey(recordKey);
List<InnerOrderEntity> data = innerOrderDao.queryPageList(innerOrderRequest);
return data.get(0);
}
@Override
public List<InnerOrderEntity> queryPageList(InnerOrderRequest innerOrderRequest) {
if (innerOrderRequest == null) {
return Collections.emptyList();
}
if (innerOrderRequest.getPage() != null) {
int offset = (innerOrderRequest.getPage() - 1) * innerOrderRequest.getLimit();
PageHelper.offsetPage(offset, innerOrderRequest.getLimit());
}
List<InnerOrderEntity> data = innerOrderDao.queryPageList(innerOrderRequest);
return data;
}
@Override
public Integer insert(InnerOrderEntity innerOrderEntity) {
return innerOrderDao.insert(innerOrderEntity);
}
@Override
public Boolean update(InnerOrderEntity innerOrderEntity) {
return innerOrderDao.update(innerOrderEntity);
}
@Override
public Boolean deleteByIds(List<String> ids) {
return innerOrderDao.deleteByIds(ids);
}
}

@ -125,10 +125,16 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
} else {
bacthNo = invProductDetailEntity.getBatchNo();
}
InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode());
invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
// InvProductEntity invProductEntity = invPreInProductDao.selectByUuid(invProductDetailEntity.getProductIdFk(), bacthNo, invProductDetailEntity.getSupId(), invProductDetailEntity.getInvStorageCode(), invProductDetailEntity.getInvWarehouseCode());
// invProductDetailEntity.setCount(invProductEntity.getInCount() - invProductEntity.getOutCount());
return invProductDetailEntity;
}
return null;
}
@Override
public boolean deleteByOrderIdFk(String orderIdFk) {
return invPreInProductDetailDao.deleteByOrderId(orderIdFk);
}
}

@ -77,9 +77,15 @@ public class InvPreInProductServiceImpl implements InvPreInProductService {
public boolean deleteById(String id) {
return invPreInProductDao.deleteById(id);
}
@Override
public boolean deleteAll() {
return invPreInProductDao.deleteAll();
}
@Override
public boolean deleteByOrderIdFk(String orderIdFk) {
return invPreInProductDao.deleteByOrderIdFk(orderIdFk);
}
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.CompanySalesmanEntity;
import com.glxp.api.admin.req.purchase.FilterCompanySalesmanRequest;
import java.util.List;
public interface CompanySalesmanService {
List<CompanySalesmanEntity> filterCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
CompanySalesmanEntity findCompanySalesman(String CustomerId);
CompanySalesmanEntity findCompanySalesmanByName(String name);
List<CompanySalesmanEntity> getCompanySalesman(FilterCompanySalesmanRequest filterCompanySalesmanRequest);
boolean updateCompanySalesman(CompanySalesmanEntity companyCertEntity);
boolean insertCompanySalesman(CompanySalesmanEntity companyCertEntity);
boolean deleteById(String id);
}

@ -0,0 +1,24 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.CompanyUpdateLogEntity;
import com.glxp.api.admin.req.purchase.FilterCompanyUpdateLogRequest;
import java.util.List;
public interface CompanyUpdateLogService {
List<CompanyUpdateLogEntity> filterCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
CompanyUpdateLogEntity findCompanyUpdateLog(Long CustomerId);
CompanyUpdateLogEntity findCompanyUpdateLogBySubmit(String submit);
List<CompanyUpdateLogEntity> getCompanyUpdateLog(FilterCompanyUpdateLogRequest filterCompanyUpdateLogRequest);
boolean updateCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity);
boolean insertCompanyUpdateLog(CompanyUpdateLogEntity companyUpdateLogEntity);
boolean deleteById(String id);
}

@ -0,0 +1,23 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.CustomerContactEntity;
import com.glxp.api.admin.req.inout.DeleteRequest;
import com.glxp.api.admin.req.purchase.CustomerContactFilterRequest;
import java.util.List;
public interface CustomerContactService {
List<CustomerContactEntity> filterCustomerContact(CustomerContactFilterRequest userResisterFilterRequest);
boolean insertCustomerContact(CustomerContactEntity customerContactEntity);
boolean updateCustomerContact(CustomerContactEntity customerContactEntity);
boolean deleteById(Long id);
boolean deleteContact(DeleteRequest deleteRequest);
CustomerContactEntity selectById(Long emailId);
}

@ -2,12 +2,13 @@ package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.req.purchase.PurApplyRequest;
import com.glxp.api.admin.res.purchase.PurApplyResponse;
import java.util.List;
public interface IPurApplyService {
List<PurApplyEntity> queryPageList(PurApplyRequest purApplyRequest);
List<PurApplyResponse> queryPageList(PurApplyRequest purApplyRequest);
Integer insert(PurApplyEntity purApplyEntity);

@ -1,18 +1,24 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
import com.glxp.api.admin.entity.purchase.PurApplyDetailEntity;
import com.glxp.api.admin.entity.purchase.PurPlanDetailEntity;
import com.glxp.api.admin.req.purchase.PurApplyDetailRequest;
import com.glxp.api.admin.req.purchase.PurPlanDetailRequest;
import java.util.List;
public interface IPurPlanDetailService {
List<StockOrderDetailEntity> joinQueryList(PurPlanDetailRequest purApplyRequest);
List<PurPlanDetailEntity> queryPageList(PurPlanDetailRequest purPlanDetailRequest);
Boolean insert(PurPlanDetailRequest purPlanDetailRequest);
Boolean insert(PurPlanDetailEntity purPlanDetailRequest);
Boolean update(PurPlanDetailRequest purPlanDetailRequest);
Boolean update(PurPlanDetailEntity purPlanDetailRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByOrderId(String orderIdfK);
}

@ -4,18 +4,19 @@ import com.glxp.api.admin.entity.purchase.PurApplyEntity;
import com.glxp.api.admin.entity.purchase.PurPlanEntity;
import com.glxp.api.admin.req.purchase.PurApplyRequest;
import com.glxp.api.admin.req.purchase.PurPlanRequest;
import com.glxp.api.admin.res.purchase.PurPlanResponse;
import java.util.List;
public interface IPurPlanService {
List<PurPlanEntity> queryPageList(PurPlanRequest purPlanRequest);
List<PurPlanResponse> queryPageList(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanRequest purPlanRequest);
Boolean insert(PurPlanEntity purPlanRequest);
Boolean update(PurPlanRequest purPlanRequest);
Boolean update(PurPlanEntity purPlanRequest);
Boolean deleteByIds(List<Long> ids);
Boolean deleteByIds(List<Integer> ids);
}

@ -0,0 +1,35 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.SupCertEntity;
import com.glxp.api.admin.req.purchase.FilterSupCertRequest;
import java.util.List;
public interface SupCertService {
List<SupCertEntity> filterCompanyCert(FilterSupCertRequest filterSupCertRequest);
SupCertEntity findCompanyCertByName(String name);
List<SupCertEntity> findAll(String customerId);
List<SupCertEntity> findAll(String customerId, String manufacturerId);
List<SupCertEntity> findAll(String customerId, String manufacturerId, String productId);
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,20 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.SupCertSetEntity;
import com.glxp.api.admin.req.purchase.FilterCertSetsRequest;
import java.util.List;
public interface SupCertSetService {
List<SupCertSetEntity> filterCertSets(FilterCertSetsRequest filterCertSetsRequest);
boolean updateCertSet(SupCertSetEntity supCertSetEntity);
boolean insertCertSet(SupCertSetEntity supCertSetEntity);
boolean deleteById(String id);
}

@ -0,0 +1,29 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.SupCompanyEntity;
import com.glxp.api.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,26 @@
package com.glxp.api.admin.service.purchase;
import com.glxp.api.admin.entity.purchase.SupManufacturerEntity;
import com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest;
import java.util.List;
public interface SupManufacturerService {
SupManufacturerEntity findCompany(Long id);
SupManufacturerEntity findManufacturer(String manufacturerId);
SupManufacturerEntity findCompanyByName(String companyName);
List<SupManufacturerEntity> getCompany(FilterSupManufacturerRequest filterSupManufacturerRequest);
boolean modifyCompany(SupManufacturerEntity supManufacturerEntity);
boolean insertCompany(SupManufacturerEntity supManufacturerEntity);
boolean deleteById(String id);
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save