代码备份。单据自动生成以及bug修改

master
anthonyywj2 3 years ago
parent bff708d598
commit c34e935db4

@ -0,0 +1,369 @@
package com.glxp.sale.admin.controller.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.req.basic.CombineRequest;
import com.glxp.sale.admin.req.basic.RemoveRelRequest;
import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.service.auth.CustomerService;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.UdiContrastService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
import com.glxp.sale.admin.service.info.CompanyService;
import com.glxp.sale.admin.service.receipt.ProductInfoService;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.thread.UdiDlHttpClient;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.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 javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@RestController
public class UdiContrastController {
@Resource
UdiDlHttpClient udiDlHttpClient;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
@Resource
CustomerService customerService;
@Resource
private BasicThirdSysService basicThirdSysService;
@Resource
UdiContrastService udiContrastService;
@Resource
ThrProductsService thrProductsService;
@Resource
CompanyService companyService;
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
//添加产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {
combineRequest.setCustomerId(customerService.getCustomerId());
List<String> keys = combineRequest.getKeys();
if (keys != null && keys.size() > 0) {
for (String key : keys) {
//关联添加
if (StrUtil.isEmpty(combineRequest.getRelId()) || combineRequest.isIdSpliUdi()) {
if (StrUtil.isNotEmpty(combineRequest.getThirdId())) {
if (udiContrastService.isExit(key, combineRequest.getThirdId())) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
createUnionContrast(combineRequest, key);
if (combineRequest.isIdSpliUdi()) {
List<UdiRelevanceEntity> temps = udiContrastService.findByUnion(key, combineRequest.getThirdId());
if (CollUtil.isNotEmpty(temps)) {
UdiRelevanceEntity temp = temps.get(0);
CompanyEntity companyEntity = companyService.findCompany(combineRequest.getCustomerId());
CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
companyProductRelevanceEntity.setCreate_time(new Date());
companyProductRelevanceEntity.setUpdate_time(new Date());
companyProductRelevanceEntity.setAuditStatus("3");
companyProductRelevanceEntity.setUnitFk(companyEntity.getUnitIdFk());
companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(temp.getId()));
companyProductRelevanceEntity.setCustomerId(companyEntity.getCustomerId());
boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
}
}
}
} else {
//只添加DI
if (udiContrastService.isExit(key, null)) {
return ResultVOUtils.error(500, "已存在该DI且未对照");
} else {
createOnlyUuid(combineRequest, key);
}
}
} else {//修改关联DI
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
if (udiContrastService.isExit(key, udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
updateDi(udiRelevanceEntity, key);
}
}
}
} else if (CollUtil.isNotEmpty(combineRequest.getThirdIds())) {
//只添加产品
for (String thirdId : combineRequest.getThirdIds()) {
if (udiContrastService.isExit(null, thirdId)) {
return ResultVOUtils.error(500, "产品编码:" + thirdId + "已存在!");
} else {
createOnlyMainId(combineRequest, thirdId);
}
}
}
return ResultVOUtils.success("添加成功");
}
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/changeVersion")
public BaseResponse changeVersion(@RequestBody CombineRequest combineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
if (udiContrastService.isExit(combineRequest.getKeys().get(0), udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "已存在相同的对照关系,无法切换版本");
}
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
udiInfoService.insertUdiInfos(udiInfoEntities);
udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setUpdateTime(DateUtil.formatDateTime(new Date()));
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
return ResultVOUtils.success("切换成功!");
}
//更换关联ERP产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/modifyRel")
public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(combineRequest.getRelId());
udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
udiRelevanceEntity.setSupName(combineRequest.getSupName());
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
} else {
try {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
}
}
return ResultVOUtils.success("更新成功");
}
//解除绑定产品信息ID
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/thirdSys/remove")
public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid());
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) {
if (udiRelevanceEntity1.getThirdId() == null && udiRelevanceEntity1.getThirdId1() == null &&
udiRelevanceEntity1.getThirdId2() == null && udiRelevanceEntity1.getThirdId3() == null && udiRelevanceEntity1.getThirdId4() == null) {
return ResultVOUtils.error(500, "解除绑定失败!");
}
}
}
if (removeRelRequest.getThirdSys().equals("thirdId")) {
udiRelevanceEntity.setThirdId("");
udiRelevanceEntity.setThirdName("");
UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
if (udiContrastService.isExit(temp.getOriginUuid(), null)) {
return ResultVOUtils.error(500, "解除绑定失败!");
}
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
udiRelevanceEntity.setThirdId1("");
udiRelevanceEntity.setThirdName1("");
} else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
udiRelevanceEntity.setThirdId2("");
udiRelevanceEntity.setThirdName2("");
} else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
udiRelevanceEntity.setThirdId3("");
udiRelevanceEntity.setThirdName3("");
} else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
udiRelevanceEntity.setThirdId4("");
udiRelevanceEntity.setThirdName4("");
}
try {
CombineRequest combineRequest = new CombineRequest();
combineRequest.setRelId(removeRelRequest.getRelId());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "解除绑定失败!");
}
return ResultVOUtils.success("解除绑定成功!");
}
@Resource
ProductInfoService productInfoService;
//獲取DI版本号
@AuthRuleAnnotation("")
@GetMapping("/udiwms/syncdi/version")
public BaseResponse getVersion(CombineRequest combineRequest) {
List<ProductInfoEntity> productInfoEntityList = new ArrayList<>();
List<UdiRelevanceEntity> udiRelevanceEntities = udiContrastService.findByUuid(combineRequest.getUuid());
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
String originUuid = udiRelevanceEntities.get(0).getOriginUuid();
List<ProductInfoEntity> productInfoEntities = productInfoService.selectByUuid(originUuid);
if (CollUtil.isNotEmpty(productInfoEntities)) {
String deviceRecordKey = productInfoEntities.get(0).getDeviceRecordKey();
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
productInfoFilterRequest.setDeviceRecordKey(deviceRecordKey);
List<ProductInfoEntity> result = productInfoService.filterProductGroup(productInfoFilterRequest);
if (CollUtil.isNotEmpty(result)) {
productInfoEntityList.addAll(result);
}
}
}
PageInfo<ProductInfoEntity> pageInfo;
pageInfo = new PageInfo<>(productInfoEntityList);
PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(productInfoEntityList);
return ResultVOUtils.success(pageSimpleResponse);
}
public void createUnionContrast(CombineRequest combineRequest, String key) {
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(key);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setThirdId(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName(combineRequest.getErpName());
udiRelevanceEntity.setMainId(combineRequest.getThirdId());
udiRelevanceEntity.setMainName(combineRequest.getErpName());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
if (combineRequest.getManufactory() != null) {
udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
} else
udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc());
udiRelevanceEntity.setSupName(combineRequest.getSupName());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
udiInfoService.insertUdiInfos(udiInfoEntities);
}
public void createOnlyUuid(CombineRequest combineRequest, String key) {
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(key);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc());
udiRelevanceEntity.setSupName(combineRequest.getSupName());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
udiInfoService.insertUdiInfos(udiInfoEntities);
}
public void createOnlyMainId(CombineRequest combineRequest, String mainId) {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
filterThrProductsRequest.setCode(mainId);
List<ThrProductsEntity> thrProductsEntities = thrProductsService.selectThrProducts(filterThrProductsRequest);
ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setThirdId(thrProductsEntity.getCode());
udiRelevanceEntity.setThirdName(thrProductsEntity.getName());
udiRelevanceEntity.setMainId(thrProductsEntity.getCode());
udiRelevanceEntity.setMainName(thrProductsEntity.getName());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(CustomUtil.getUUId());
udiRelevanceEntity.setManufactory(thrProductsEntity.getManufactory());
udiRelevanceEntity.setSupName(combineRequest.getSupName());
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
udiInfoEntity.setNameCode(thrProductsEntity.getCode());
udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
udiInfoEntity.setDiType(1);
udiInfoService.insertUdiInfo(udiInfoEntity);
}
public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(key);
udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
udiInfoService.insertUdiInfos(udiInfoEntities);
}
public UdiRelevanceEntity setThird(CombineRequest combineRequest, UdiRelevanceEntity udiRelevanceEntity) {
if ("thirdId".equals(combineRequest.getThirdSys())) {
udiRelevanceEntity.setThirdId(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName(combineRequest.getErpName());
} else if ("thirdId1".equals(combineRequest.getThirdSys())) {
udiRelevanceEntity.setThirdId1(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName1(combineRequest.getErpName());
} else if ("thirdId2".equals(combineRequest.getThirdSys())) {
udiRelevanceEntity.setThirdId2(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName2(combineRequest.getErpName());
} else if ("thirdId3".equals(combineRequest.getThirdSys())) {
udiRelevanceEntity.setThirdId3(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName3(combineRequest.getErpName());
} else if ("thirdId4".equals(combineRequest.getThirdSys())) {
udiRelevanceEntity.setThirdId4(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName4(combineRequest.getErpName());
}
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
String mainSys = basicThirdSysEntity.getThirdId();
if (mainSys.equals("thirdId")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName());
} else if (mainSys.equals("thirdId1")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1());
} else if (mainSys.equals("thirdId2")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2());
} else if (mainSys.equals("thirdId3")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3());
} else if (mainSys.equals("thirdId4")) {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4());
}
if (combineRequest.getErpProductsResponse() != null) {
udiRelevanceEntity.setMeasname(combineRequest.getErpProductsResponse().getMeasname());
udiRelevanceEntity.setManufactory(combineRequest.getErpProductsResponse().getManufactory());
}
return udiRelevanceEntity;
}
}

@ -11,7 +11,6 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.FilterSysEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.CompanyEntity;
import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.inventory.InvProductEntity;
@ -37,13 +36,11 @@ import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrDataService;
import com.glxp.sale.admin.thread.BasicBackUpdateProductService;
import com.glxp.sale.admin.thread.BasicUpdateProductService;
import com.glxp.sale.admin.thread.UdiDlHttpClient;
import com.glxp.sale.admin.util.*;
import com.glxp.sale.common.enums.ResultEnum;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils;
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;
@ -52,15 +49,12 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@RestController
public class UdiRelevanceController {
@Resource
UdiDlHttpClient udiDlHttpClient;
@Resource
UdiRelevanceService udiRelevanceService;
@Resource
@ -76,21 +70,15 @@ public class UdiRelevanceController {
@Resource
private BasicThirdSysService basicThirdSysService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
ThrDataService thrDataService;
@Resource
InvProductService invProductService;
@Resource
InvPreProductService invPreProductService;
@Resource
CompanyService companyService;
@Resource
private CompanyProductRelevanceService companyProductRelevanceService;
@Resource
CustomerService customerService;
@Resource
RedisUtil redisUtil;
@AuthRuleAnnotation("")
@GetMapping("/udi/udirel/download")
@ -287,126 +275,7 @@ public class UdiRelevanceController {
return ResultVOUtils.error(499, "所选产品DI已经被" + "第三方产品ID" + "绑定,您确定继续对照");
}
}
return ResultVOUtils.success("合并成功");
}
//新增或修改关联
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {
combineRequest.setCustomerId(customerService.getCustomerId());
List<String> keys = combineRequest.getKeys();
if (keys != null && keys.size() > 0) {
for (String key : keys) {
// UdiInfoEntity udiInfoEntity = getUdiInfo(combineRequest);
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setUuid(key);
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterAllUdiInfo(filterUdiInfoRequest);
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
if (udiInfoEntities == null || udiInfoEntities.isEmpty()) {
udiInfoEntities = udiDlHttpClient.getUdiByUuid(key);
if (udiInfoEntities != null && !udiInfoEntities.isEmpty()) {
udiInfoService.insertUdiInfos(udiInfoEntities);
} else {
return ResultVOUtils.error(500, "连接UDI数据下载服务出错");
}
}
if (combineRequest.getManufactory() != null) {
udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
} else
udiRelevanceEntity.setManufactory(udiInfoEntities.get(0).getYlqxzcrbarmc());
if (combineRequest.isIdSpliUdi()) {
udiRelevanceEntity.setThirdId(combineRequest.getThirdId());
udiRelevanceEntity.setThirdName(combineRequest.getErpName());
udiRelevanceEntity.setMainId(combineRequest.getThirdId());
udiRelevanceEntity.setMainName(combineRequest.getErpName());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(key);
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
udiRelevanceEntity = udiRelevanceService.selectUpteaByAll(udiRelevanceEntity.getUuid(), udiRelevanceEntity.getThirdId());
CompanyEntity companyEntity = companyService.findCompany(combineRequest.getCustomerId());
CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
companyProductRelevanceEntity.setCreate_time(new Date());
companyProductRelevanceEntity.setUpdate_time(new Date());
companyProductRelevanceEntity.setAuditStatus("3");
companyProductRelevanceEntity.setUnitFk(companyEntity.getUnitIdFk());
companyProductRelevanceEntity.setUdiRlIdFk(Integer.parseInt(udiRelevanceEntity.getId()));
companyProductRelevanceEntity.setCustomerId(companyEntity.getCustomerId());
boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
return ResultVOUtils.success("拆分成功!");
}
if (combineRequest.getRelId() != null && !combineRequest.getRelId().equals("")) {
//修改
//判断DI是否被使用若使用则新增一条
UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(temp.getUuid());
if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) {
for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) {
List<UdiInfoEntity> temps = udiInfoService.findByUuids(udiRelevanceEntity1.getUuid());
if (temps != null && temps.size() > 0) {
for (int i = 0; i < temps.size(); i++) {
List<WarehouseEntity> warehouseEntityList = warehouseService.searchCode(temps.get(i).getNameCode());
if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
//新增一条记录
UdiRelevanceEntity newRlEntity = new UdiRelevanceEntity();
newRlEntity = setThird(combineRequest, newRlEntity);
newRlEntity.setUpdateTime(DateUtil.getDateTime());
newRlEntity.setUuid(key);
udiRelevanceEntity.setManufactory(temps.get(0).getYlqxzcrbarmc());
udiRelevanceService.insertUdiRelevance(newRlEntity);
return ResultVOUtils.success("合并成功");
}
}
}
}
}
UdiInfoEntity tempEntity = udiInfoEntities.get(0);
udiRelevanceEntity.setId(combineRequest.getRelId());
udiRelevanceEntity.setUuid(key);
if (combineRequest.getManufactory() != null) {
udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
} else
udiRelevanceEntity.setManufactory(tempEntity.getManufactory());
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
try {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
}
removeProducts(combineRequest);
} else {
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(key);
if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) {
for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) {
if (StrUtil.isEmpty(combineRequest.getThirdId()) && StrUtil.isEmpty(udiRelevanceEntity1.getMainId())) {
return ResultVOUtils.error(500, "已存在该DI且未关联");
}
}
}
udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(key, combineRequest.getThirdId());
if (temp == null || StrUtil.isEmpty(udiRelevanceEntity.getThirdId())) {
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
udiRelevanceEntity.setUuid(key);
udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
} else {
return ResultVOUtils.error(500, "重复关联!");
}
}
}
}
return ResultVOUtils.success("合并成功");
return ResultVOUtils.success("未选择产品");
}
@ -418,27 +287,6 @@ public class UdiRelevanceController {
return ResultVOUtils.success("后台已开始导入,请稍后刷新查看");
}
//更换关联ERP产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/modifyRel")
public BaseResponse modifyRel(@RequestBody CombineRequest combineRequest) {
UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
udiRelevanceEntity.setId(combineRequest.getRelId());
udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
removeProducts(combineRequest);
udiRelevanceEntity.setManufactory(combineRequest.getManufactory());
// udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
try {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
}
return ResultVOUtils.success("更新成功");
}
//更换关联ERP产品
@AuthRuleAnnotation("")
@ -471,20 +319,6 @@ public class UdiRelevanceController {
return null;
}
public UdiInfoEntity removeProducts(CombineRequest combineRequest) {
UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(combineRequest.getThirdId());
filterUdiInfoRequest.setUuid(temp.getUuid());
List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
UdiInfoEntity udiInfoEntity = udiInfoEntities.get(0);
if (udiInfoEntity.getDeviceRecordKey() == null)
udiInfoService.deleteById(udiInfoEntities.get(0).getId() + "");
return udiInfoEntity;
}
return null;
}
//单独选入ERP产品
@AuthRuleAnnotation("")
@ -511,42 +345,12 @@ public class UdiRelevanceController {
@PostMapping("/udi/udirel/addAllErp")
public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) {
String status = (String) redisUtil.get("load_thrid_basic");
// if (status == null || !status.equals("process")) {
// redisUtil.set("load_thrid_basic", "process", 10 * 60);
// } else {
// return ResultVOUtils.error(500, "当前正在导入,请稍后刷新重试");
// }
if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, true);
} else {
basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, null);
}
// BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
// if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
// return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
// String url = basicThirdSysDetailEntity.getValue();
// BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
// if (basicThirdSysDetailEntity.getFromType() == 0) {
//
//
// if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {//是否关联库存
// basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), true);
// } else {
// basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), null);
// }
//
// } else {
//
// if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
// basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), true);
// } else {
// basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), null);
// }
//
// }
return ResultVOUtils.success("后台正在添加,请稍后刷新查看!");
}
@ -789,59 +593,15 @@ public class UdiRelevanceController {
return ResultVOUtils.success(pageSimpleResponse);
}
//解除绑定产品信息ID
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/thirdSys/remove")
public BaseResponse removeThirdId(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiRelevanceEntity.getUuid());
if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
for (UdiRelevanceEntity udiRelevanceEntity1 : udiRelevanceEntities) {
if (udiRelevanceEntity1.getThirdId() == null && udiRelevanceEntity1.getThirdId1() == null &&
udiRelevanceEntity1.getThirdId2() == null && udiRelevanceEntity1.getThirdId3() == null && udiRelevanceEntity1.getThirdId4() == null) {
return ResultVOUtils.error(500, "解除绑定失败!");
}
}
}
if (removeRelRequest.getThirdSys().equals("thirdId")) {
udiRelevanceEntity.setThirdId("");
udiRelevanceEntity.setThirdName("");
} else if (removeRelRequest.getThirdSys().equals("thirdId1")) {
udiRelevanceEntity.setThirdId1("");
udiRelevanceEntity.setThirdName1("");
} else if (removeRelRequest.getThirdSys().equals("thirdId2")) {
udiRelevanceEntity.setThirdId2("");
udiRelevanceEntity.setThirdName2("");
} else if (removeRelRequest.getThirdSys().equals("thirdId3")) {
udiRelevanceEntity.setThirdId3("");
udiRelevanceEntity.setThirdName3("");
} else if (removeRelRequest.getThirdSys().equals("thirdId4")) {
udiRelevanceEntity.setThirdId4("");
udiRelevanceEntity.setThirdName4("");
}
try {
CombineRequest combineRequest = new CombineRequest();
combineRequest.setRelId(removeRelRequest.getRelId());
removeProducts(combineRequest);
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
e.printStackTrace();
return ResultVOUtils.error(500, "解除绑定失败!");
}
return ResultVOUtils.success("解除绑定成功!");
}
//解除绑定DI器械信息
@AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/di/remove")
public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "未关联第三方产品ID无法解除绑定");
}
List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId());
if (temps.size() > 0) {
for (UdiRelevanceResponse temp : temps) {
@ -851,8 +611,6 @@ public class UdiRelevanceController {
}
}
}
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
@ -944,14 +702,4 @@ public class UdiRelevanceController {
}
public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
if (thirdId.equals(basicThirdSysEntity.getThirdId())) {
return basicThirdSysEntity;
}
}
}
return null;
}
}

@ -13,6 +13,8 @@ public interface ProductInfoDao {
List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);

@ -1,6 +1,7 @@
package com.glxp.sale.admin.dao.basic;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
import org.apache.ibatis.annotations.Mapper;
@ -41,6 +42,8 @@ public interface UdiInfoDao {
*/
List<UdiInfoEntity> batchSelectByUuid(@Param("uuids") List<String> uuids);
List<UdiInfoEntity> batchSelectByOriginUuid(@Param("uuids") List<String> originUuids);
/**
*
*

@ -21,6 +21,10 @@ public interface UdiRelevanceDao {
// UdiRelevanceResponse selectUdiByUUid
List<UdiRelevanceEntity> selectByUuid(@Param("uuid") String uuid);
List<UdiRelevanceEntity> selectByOrigiUuid(FilterUdiInfoRequest filterUdiInfoRequest);
UdiRelevanceEntity selectById(@Param("id") String id);
UdiRelevanceEntity selectByThirdId(FilterUdiInfoRequest filterUdiInfoRequest);
@ -48,6 +52,7 @@ public interface UdiRelevanceDao {
*/
List<UdiRelevanceEntity> batchSelectByUuid(@Param("uuids") List<String> uuids);
List<UdiRelevanceEntity> batchSelectByIds(@Param("ids") List<String> ids);
/**

@ -42,7 +42,7 @@ public class UdiInfoEntity {
private String scbssfbhscrq;
private String scbssfbhsxrq;
private String cpms;
private String originUuid;
//本地生成信息
private String batchNo;

@ -31,6 +31,7 @@ public class UdiRelevanceEntity {
private String udplatCode;
private Boolean isAdavence;
private String supName;
private String originUuid;
public Integer getLockStatus() {
if (lockStatus == null)

@ -21,5 +21,7 @@ public class CombineRequest {
private Long customerId;
private Boolean supEnable;
private String manufactory;
private String supName;
private boolean idSpliUdi;
private String uuid;
}

@ -57,6 +57,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String uniqueNameCode;
private String supName;
private String unitFk;
private String originUuid;
}

@ -10,6 +10,7 @@ public class CompanyProductRelevanceResponse {
private String thirdId;
private String thirdName;
private String uuid;
private String originUuid;
private String nameCode;
private String packLevel;
private String packRatio;

@ -65,7 +65,7 @@ public class UdiRelevanceResponse {
private String manufactory;
private String unitFk;
private String companyName;
private String originUuid;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

@ -0,0 +1,98 @@
package com.glxp.sale.admin.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
@Service
public class UdiContrastService {
@Resource
UdiRelevanceDao udiRelevanceDao;
public boolean isExit(String originUuid, String mainId) {
if (StrUtil.isNotEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) {
List<UdiRelevanceEntity> udiRelevanceEntities = findByUnion(originUuid, mainId);
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
return true;
} else
return false;
} else if (StrUtil.isNotEmpty(originUuid) && StrUtil.isEmpty(mainId)) {
List<UdiRelevanceEntity> udiRelevanceEntities = findByOriginUuid(originUuid);
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) {
if (StrUtil.isEmpty(udiRelevanceEntity.getMainId()) && StrUtil.isNotEmpty(udiRelevanceEntity.getOriginUuid())) {
return true;
}
}
}
return false;
} else if (StrUtil.isEmpty(originUuid) && StrUtil.isNotEmpty(mainId)) {
List<UdiRelevanceEntity> udiRelevanceEntities = findByMainId(mainId);
if (CollUtil.isNotEmpty(udiRelevanceEntities)) {
for (UdiRelevanceEntity udiRelevanceEntity : udiRelevanceEntities) {
if (StrUtil.isEmpty(udiRelevanceEntity.getOriginUuid()) && StrUtil.isNotEmpty(udiRelevanceEntity.getMainId())) {
return true;
}
}
}
return false;
} else return false;
}
public List<UdiRelevanceEntity> findByUnion(String originUuid, String mainId) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setMainId(mainId);
filterUdiInfoRequest.setOriginUuid(originUuid);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
public List<UdiRelevanceEntity> findByUuid(String uuid) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setUuid(uuid);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
public UdiRelevanceEntity findById(String id) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setId(id);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
if (CollUtil.isNotEmpty(udiRelevanceEntities))
return udiRelevanceEntities.get(0);
return null;
}
public List<UdiRelevanceEntity> findByOriginUuid(String originUuid) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setOriginUuid(originUuid);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
public List<UdiRelevanceEntity> findByMainId(String mainId) {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setMainId(mainId);
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
public List<UdiRelevanceEntity> filterAll(FilterUdiInfoRequest filterUdiInfoRequest) {
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByOrigiUuid(filterUdiInfoRequest);
return udiRelevanceEntities;
}
}

@ -18,7 +18,7 @@ public interface UdiRelevanceService {
UdiRelevanceResponse selectByNameCode(String nameCode);
List<UdiRelevanceResponse> selectAllByNameCode(String nameCode,String unitFk);
List<UdiRelevanceResponse> selectAllByNameCode(String nameCode, String unitFk);
boolean isExit();
@ -28,10 +28,12 @@ public interface UdiRelevanceService {
List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids);
List<UdiRelevanceEntity> batchSelectByIds(List<String> ids);
List<UdiRelevanceEntity> selectByUuid(String uuid);
UdiRelevanceEntity selectById(String id);
UdiRelevanceResponse selectGroupById(String id);

@ -129,6 +129,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return udiRelevanceDao.batchSelectByUuid(uuids);
}
@Override
public List<UdiRelevanceEntity> batchSelectByIds(List<String> ids) {
return udiRelevanceDao.batchSelectByIds(ids);
@ -139,6 +140,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return udiRelevanceDao.selectByUuid(uuid);
}
@Override
public UdiRelevanceEntity selectById(String id) {
return udiRelevanceDao.selectById(id);
@ -218,15 +220,6 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
}
List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiInfoRequest);
// if ((data == null || data.isEmpty()) && thirdId != null) {
// filterUdiInfoRequest.setUuid(null);
// data = udiRelevanceDao.filterEntity(filterUdiInfoRequest);
// if ((data == null || data.isEmpty()) && uuid != null) {
// filterUdiInfoRequest.setUuid(uuid);
// filterUdiInfoRequest.setThirdId(null);
// data = udiRelevanceDao.filterEntity(filterUdiInfoRequest);
// }
// }
if (data != null && data.size() > 0)

@ -15,6 +15,8 @@ public interface ProductInfoService {
List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

@ -42,6 +42,20 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return data;
}
@Override
public List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest) {
if (productInfoFilterRequest == null) {
return Collections.emptyList();
}
if (productInfoFilterRequest.getPage() != null && !productInfoFilterRequest.getPage().equals("")) {
int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
}
List<ProductInfoEntity> data = productInfoDao.filterProductGroup(productInfoFilterRequest);
return data;
}
@Override
public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) {

@ -8,6 +8,7 @@ import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.sale.admin.service.receipt.ProductInfoService;
import com.glxp.sale.admin.util.BeanUtils;
import com.glxp.sale.admin.util.HttpClient;
import com.glxp.sale.admin.util.UuidUtils;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import org.springframework.beans.factory.annotation.Value;
@ -37,32 +38,15 @@ public class UdiDlHttpClient {
List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
String myUuid = UuidUtils.getUUId();
for (ProductInfoEntity productInfoEntity : productInfoEntityList) {
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(productInfoEntity, udiInfoEntity);
udiInfoEntity.setUuid(myUuid);
udiInfoEntity.setOriginUuid(productInfoEntity.getUuid());
udiInfoEntities.add(udiInfoEntity);
}
return udiInfoEntities;
//
// Map<String, Object> paramMap = new HashMap<>(16);
// paramMap.put("page", 1);
// paramMap.put("limit", 100);
// paramMap.put("uuid", uuid);
// String response = httpClient.mipsGetHead(udiUrl + "/udidl/device/filterByUuid", paramMap);
// try {
//// BaseResponse<List<UdiInfoEntity>> udiDlDeviceResponse = (BaseResponse<List<UdiInfoEntity>>) JSONObject.parseObject(response, BaseResponse.class);
//
// BaseResponse<List<UdiInfoEntity>> udiDlDeviceResponse =
// JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiInfoEntity>>>() {
//
// });
//
// List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
// return udiInfoEntities;
// } catch (Exception e) {
// e.printStackTrace();
// return null;
// }
}
public List<UdiInfoEntity> getUdiByDi(String key) {
@ -90,25 +74,5 @@ public class UdiDlHttpClient {
}
return udiInfoEntities;
// Map<String, Object> paramMap = new HashMap<>(16);
// paramMap.put("page", 1);
// paramMap.put("limit", 100);
// paramMap.put("nameCode", key);
// String response = httpClient.mipsGetHead(udiUrl + "/udidl/device/filterByNameCode", paramMap);
// try {
// BaseResponse<List<UdiInfoEntity>> udiDlDeviceResponse =
// JSONObject.parseObject(response, new TypeReference<BaseResponse<List<UdiInfoEntity>>>() {
//
// });
// if (udiDlDeviceResponse != null && udiDlDeviceResponse.getCode() == 20000) {
// List<UdiInfoEntity> udiInfoEntities = udiDlDeviceResponse.getData();
// return udiInfoEntities;
// }
//
// } catch (Exception e) {
// e.printStackTrace();
// return null;
// }
// return null;
}
}

@ -37,8 +37,8 @@
<onMismatch>ACCEPT</onMismatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天一归档 -->
<fileNamePattern>d://glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
<!-- 每天一归档 d://glxpdata/udiwms -->
<fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_INFO_HOME}//%d{yyyy-MM-dd}_%i.log
</fileNamePattern>
<maxHistory>30</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy
@ -59,7 +59,7 @@
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 每天一归档 /home/glxpdata/udiwms -->
<fileNamePattern>d://glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
<fileNamePattern>/home/glxpdata/udiwms/logs/${LOG_ERROR_HOME}//%d{yyyy-MM-dd}_%i.log
</fileNamePattern>
<maxHistory>30</maxHistory>
<timeBasedFileNamingAndTriggeringPolicy

@ -38,6 +38,39 @@
</select>
<select id="filterProductGroup" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
SELECT * FROM productinfo
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat(#{cpmctymc},'%')
</if>
<if test="nameCode != '' and nameCode != null">
AND nameCode LIKE concat(#{nameCode},'%')
</if>
<if test="uuid != '' and uuid != null">
AND uuid = #{uuid}
</if>
<if test="deviceRecordKey != '' and deviceRecordKey != null">
AND deviceRecordKey = #{deviceRecordKey}
</if>
<if test="ggxh != '' and ggxh != null">
AND ggxh LIKE concat(#{ggxh},'%')
</if>
<if test="tyshxydm != '' and tyshxydm != null">
AND tyshxydm = #{tyshxydm}
</if>
<if test="updateTime!=null and updateTime!=''">
<![CDATA[ and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S') ]]>
</if>
</where>
GROUP BY uuid
</select>
<select id="filterCpmctymc" parameterType="com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest"
resultType="com.glxp.sale.admin.entity.receipt.ProductInfoEntity">
select * from productinfo

@ -19,6 +19,9 @@
<if test="uuid != '' and uuid != null">
AND uuid = #{uuid}
</if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if>
</where>
</select>
@ -40,7 +43,7 @@
basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid
FROM (company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@ -81,8 +84,11 @@
</if>
<if test="customerId != '' and customerId != null">
AND company_product_relevance.customerId = #{customerId}
</if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if>
</where>
ORDER BY updateTime DESC
</select>
@ -124,7 +130,7 @@
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory)
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid)
values
(
#{id},
@ -155,7 +161,9 @@
#{scbssfbhph},
#{scbssfbhxlh},
#{scbssfbhscrq},
#{scbssfbhsxrq},#{cpms},#{manufactory}
#{scbssfbhsxrq},
#{cpms},
#{manufactory},#{originUuid}
)
</insert>
@ -165,7 +173,7 @@
nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory
,diType,productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,manufactory,originUuid
)
values
@ -197,7 +205,7 @@
#{item.diType},#{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory}
#{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory},#{item.originUuid}
)
</foreach>
</insert>
@ -248,6 +256,7 @@
<if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
<if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
<if test="cpms != null">cpms=#{cpms},</if>
<if test="originUuid != null">originUuid=#{originUuid},</if>
</trim>
WHERE nameCode = #{nameCode}
@ -261,12 +270,21 @@
</foreach>
</select>
<select id="batchSelectByOriginUuid" resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select *
from basic_products where originUuid in
<foreach collection="uuids" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<insert id="importUdiInfo" parameterType="java.util.List">
replace into basic_products
(id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname,
productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms) values
productType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,cpms,originUuid) values
<foreach collection="udiInfoEntities" item="item" index="index" separator=",">
(#{item.id},
#{item.nameCode},
@ -300,7 +318,7 @@
#{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh},
#{item.scbssfbhscrq},
#{item.scbssfbhsxrq},#{item.cpms})
#{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid})
</foreach>
</insert>
</mapper>

@ -24,7 +24,7 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -109,7 +109,8 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk, customer_info.companyName
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,
customer_info.companyName,basic_products.originUuid
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
@ -196,7 +197,7 @@
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
FROM basic_products
right JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
@ -296,6 +297,26 @@
</select>
<select id="selectByOrigiUuid" parameterType="com.glxp.sale.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select * from basic_udirel INNER JOIN basic_products on basic_udirel.uuid = basic_products.uuid
<where>
<if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid}
</if>
<if test="mainId != '' and mainId != null">
AND basic_udirel.mainId = #{mainId}
</if>
<if test="originUuid != '' and originUuid != null">
AND basic_products.originUuid = #{originUuid}
</if>
<if test="id != '' and id != null">
AND basic_udirel.id = #{id}
</if>
</where>
</select>
<select id="selectById" parameterType="java.lang.String"
resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select *
@ -499,6 +520,7 @@
</foreach>
</select>
<select id="batchSelectByIds" resultType="com.glxp.sale.admin.entity.basic.UdiRelevanceEntity">
select *
from basic_udirel where id in

@ -49,7 +49,7 @@
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence,basic_products.scbssfbhph,
basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms
basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid
FROM company_product_relevance
inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id

Loading…
Cancel
Save