DI版本切换

master
anthonyywj2 3 years ago
parent de1a6c7d81
commit 807562d696

@ -0,0 +1,338 @@
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.constant.ConstantStatus;
import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.api.admin.entity.basic.ProductInfoEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.api.admin.httpclient.UdiDlHttpClient;
import com.glxp.api.admin.req.basic.CombineRequest;
import com.glxp.api.admin.req.basic.RemoveRelRequest;
import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.api.admin.res.PageSimpleResponse;
import com.glxp.api.admin.service.basic.*;
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.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 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
private BasicThirdSysService basicThirdSysService;
@Resource
UdiContrastService udiContrastService;
@Resource
ThrProductsService thrProductsService;
//添加产品
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {
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);
}
} 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;
}
}

@ -302,119 +302,10 @@ public class UdiRelevanceController {
return ResultVOUtils.error(499, "所选产品DI已经被" + "第三方产品ID" + "绑定,您确定继续对照"); return ResultVOUtils.error(499, "所选产品DI已经被" + "第三方产品ID" + "绑定,您确定继续对照");
} }
} }
return ResultVOUtils.success("合并成功"); return ResultVOUtils.success("未选择产品");
} }
//新增或修改关联
@AuthRuleAnnotation("")
@PostMapping("/udi/udirel/revleance")
public BaseResponse revleanceUdi(@RequestBody CombineRequest combineRequest) {
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.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("合并成功");
}
public void 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() + "");
}
}
//选入查询结果的所有DI //选入查询结果的所有DI
@ -425,26 +316,6 @@ public class UdiRelevanceController {
return ResultVOUtils.success("后台已开始导入,请稍后刷新查看"); 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());
try {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
} catch (Exception e) {
return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
}
return ResultVOUtils.success("更新成功");
}
//更换关联ERP产品 //更换关联ERP产品
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -748,59 +619,15 @@ public class UdiRelevanceController {
return ResultVOUtils.success(pageSimpleResponse); 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器械信息 //解除绑定DI器械信息
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("/udiwms/udirl/di/remove") @GetMapping("/udiwms/udirl/di/remove")
public BaseResponse removeDI(RemoveRelRequest removeRelRequest) { public BaseResponse removeDI(RemoveRelRequest removeRelRequest) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId());
if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) { if (StrUtil.isEmpty(udiRelevanceEntity.getMainId())) {
return ResultVOUtils.error(500, "未关联第三方产品ID无法解除绑定"); return ResultVOUtils.error(500, "未关联第三方产品ID无法解除绑定");
} }
List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId()); List<UdiRelevanceResponse> temps = udiRelevanceService.selectByMainId(udiRelevanceEntity.getMainId());
if (temps.size() > 0) { if (temps.size() > 0) {
for (UdiRelevanceResponse temp : temps) { for (UdiRelevanceResponse temp : temps) {
@ -810,8 +637,6 @@ public class UdiRelevanceController {
} }
} }
} }
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
@ -903,14 +728,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;
}
} }

@ -11,7 +11,6 @@ import java.util.List;
@Mapper @Mapper
public interface CompanyProductRelevanceDao { public interface CompanyProductRelevanceDao {
List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest); List<CompanyProductRelevanceResponse> filterUdiGp(CompanyProductRelevanceRequest basicInstrumentMaintainRequest);
List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest); List<CompanyProductRelevanceEntity> filterCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest);

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

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

@ -10,10 +10,12 @@ import java.util.List;
@Mapper @Mapper
public interface ThrProductsDao { public interface ThrProductsDao {
List<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); List<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
List<ThrProductsEntity> batchSelectByIds(FilterThrProductsRequest filterThrProductsRequest);
ThrProductsEntity selectById(@Param("id") String id); ThrProductsEntity selectById(@Param("id") String id);
List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProducts(ThrProductsEntity thrProductsEntity);
@ -25,6 +27,13 @@ public interface ThrProductsDao {
boolean deleteAll(); boolean deleteAll();
/**
*
*
* @param thrProductsEntities
*/
void importThrProducts(@Param("thrProductsEntities") List<ThrProductsEntity> thrProductsEntities);
/** /**
* *
* *

@ -4,7 +4,6 @@ import lombok.Data;
@Data @Data
public class UdiInfoEntity { public class UdiInfoEntity {
private Integer id; private Integer id;
private String nameCode; private String nameCode;
private String packRatio; private String packRatio;
@ -42,7 +41,7 @@ public class UdiInfoEntity {
private String scbssfbhscrq; private String scbssfbhscrq;
private String scbssfbhsxrq; private String scbssfbhsxrq;
private String cpms; private String cpms;
private String originUuid;
//本地生成信息 //本地生成信息
private String batchNo; private String batchNo;

@ -31,10 +31,12 @@ public class UdiRelevanceEntity {
private String udplatCode; private String udplatCode;
private Boolean isAdavence; private Boolean isAdavence;
private String supName; private String supName;
private String originUuid;
public Integer getLockStatus() { public Integer getLockStatus() {
if (lockStatus == null) if (lockStatus == null)
return 1; return 1;
return lockStatus; return lockStatus;
} }
} }

@ -1,20 +1,15 @@
package com.glxp.api.admin.httpclient; package com.glxp.api.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.api.admin.entity.basic.ProductInfoEntity; import com.glxp.api.admin.entity.basic.ProductInfoEntity;
import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity;
import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
import com.glxp.api.admin.service.basic.ProductInfoService; import com.glxp.api.admin.service.basic.ProductInfoService;
import com.glxp.api.admin.util.HttpClient; import com.glxp.api.admin.util.UuidUtils;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -27,6 +22,7 @@ public class UdiDlHttpClient {
@Resource @Resource
ProductInfoService productInfoService; ProductInfoService productInfoService;
public List<UdiInfoEntity> getUdiByUuid(String uuid) { public List<UdiInfoEntity> getUdiByUuid(String uuid) {
ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
productInfoFilterRequest.setPage(1); productInfoFilterRequest.setPage(1);
@ -35,9 +31,12 @@ public class UdiDlHttpClient {
List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
List<UdiInfoEntity> udiInfoEntities = new ArrayList<>(); List<UdiInfoEntity> udiInfoEntities = new ArrayList<>();
String myUuid = UuidUtils.getUUId();
for (ProductInfoEntity productInfoEntity : productInfoEntityList) { for (ProductInfoEntity productInfoEntity : productInfoEntityList) {
UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtils.copyProperties(productInfoEntity, udiInfoEntity); BeanUtils.copyProperties(productInfoEntity, udiInfoEntity);
udiInfoEntity.setUuid(myUuid);
udiInfoEntity.setOriginUuid(productInfoEntity.getUuid());
udiInfoEntities.add(udiInfoEntity); udiInfoEntities.add(udiInfoEntity);
} }
return udiInfoEntities; return udiInfoEntities;

@ -18,11 +18,12 @@ public class CombineRequest {
private String thirdSys; private String thirdSys;
private Boolean isRlInv; private Boolean isRlInv;
private FilterErpGoodsRequest query; private FilterErpGoodsRequest query;
private String erpId; private String erpId;
private Long customerId;
private Boolean supEnable; private Boolean supEnable;
private String manufactory; private String manufactory;
private String supName;
private boolean idSpliUdi; private boolean idSpliUdi;
private String uuid;
} }

@ -29,7 +29,7 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String zczbhhzbapzbh; private String zczbhhzbapzbh;
private Integer diType; private Integer diType;
private Boolean isDisable;
private String unionCode; private String unionCode;
private String udiCode; private String udiCode;
private String thrPiId; private String thrPiId;
@ -51,11 +51,12 @@ public class FilterUdiInfoRequest extends ListPageRequest {
private String sptm; private String sptm;
private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询 private String unionFilterStr;//产品名称,规格,批文,生产厂家联合查询
private Boolean isDisable;
List<String> relIds; List<String> relIds;
private String uniqueNameCode; private String uniqueNameCode;
private String supName; private String supName;
private String unitFk; private String unitFk;
private String originUuid;
} }

@ -65,6 +65,7 @@ public class UdiRelevanceResponse {
private String manufactory; private String manufactory;
private String unitFk; private String unitFk;
private String companyName; private String companyName;
private String originUuid;
public int getBhzxxsbzsl() { public int getBhzxxsbzsl() {

@ -10,6 +10,7 @@ public class CompanyProductRelevanceResponse {
private String thirdId; private String thirdId;
private String thirdName; private String thirdName;
private String uuid; private String uuid;
private String originUuid;
private String nameCode; private String nameCode;
private String packLevel; private String packLevel;
private String packRatio; private String packRatio;
@ -33,7 +34,7 @@ public class CompanyProductRelevanceResponse {
private String sydycpbs; private String sydycpbs;
private int versionNumber; private int versionNumber;
private int diType; private int diType;
private Boolean isDisable;
private String thirdId1; private String thirdId1;
private String thirdId2; private String thirdId2;
private String thirdId3; private String thirdId3;
@ -47,7 +48,7 @@ public class CompanyProductRelevanceResponse {
private String sptm; private String sptm;
private String manufactory; private String manufactory;
private String measname; private String measname;
private Boolean isDisable;
private long customerId; private long customerId;
private String auditStatus; private String auditStatus;
@ -58,4 +59,10 @@ public class CompanyProductRelevanceResponse {
private String mainName; private String mainName;
private Boolean isAdavence; private Boolean isAdavence;
private String scbssfbhph;
private String scbssfbhxlh;
private String scbssfbhscrq;
private String scbssfbhsxrq;
private String cpms;
private String supName;
} }

@ -1,7 +1,6 @@
package com.glxp.api.admin.service.basic; package com.glxp.api.admin.service.basic;
import com.glxp.api.admin.entity.basic.ProductInfoEntity; import com.glxp.api.admin.entity.basic.ProductInfoEntity;
import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
@ -16,6 +15,8 @@ public interface ProductInfoService {
List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

@ -0,0 +1,98 @@
package com.glxp.api.admin.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.glxp.api.admin.dao.basic.UdiRelevanceDao;
import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.api.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;
}
}

@ -57,6 +57,4 @@ public interface UdiRelevanceService {
boolean deleteByIds(List<String> id); boolean deleteByIds(List<String> id);
boolean deleteByUuid(String uuid); boolean deleteByUuid(String uuid);
} }

@ -42,6 +42,20 @@ public class ProductInfoServiceImpl implements ProductInfoService {
return data; 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 @Override
public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) { public List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest) {

@ -219,17 +219,6 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
} }
List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiInfoRequest); 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) if (data != null && data.size() > 0)
return data.get(0); return data.get(0);
return null; return null;

@ -11,6 +11,8 @@ public interface ThrProductsService {
List<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest); List<ThrProductsEntity> filterThrProductsRequest(FilterThrProductsRequest filterThrProductsRequest);
List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
ThrProductsEntity selectById(String id); ThrProductsEntity selectById(String id);
boolean insertThrProducts(ThrProductsEntity thrProductsEntity); boolean insertThrProducts(ThrProductsEntity thrProductsEntity);

@ -33,6 +33,19 @@ public class ThrProductsServiceImpl implements ThrProductsService {
return data; return data;
} }
@Override
public List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest) {
if (filterThrProductsRequest == null) {
return Collections.emptyList();
}
if (filterThrProductsRequest.getPage() != null) {
int offset = (filterThrProductsRequest.getPage() - 1) * filterThrProductsRequest.getLimit();
PageHelper.offsetPage(offset, filterThrProductsRequest.getLimit());
}
List<ThrProductsEntity> data = thrProductsDao.selectThrProducts(filterThrProductsRequest);
return data;
}
@Override @Override
public ThrProductsEntity selectById(String id) { public ThrProductsEntity selectById(String id) {
return thrProductsDao.selectById(id); return thrProductsDao.selectById(id);

@ -0,0 +1,42 @@
package com.glxp.api.admin.util;
import java.util.UUID;
public class UuidUtils {
public static String getUUId() {
UUID uuid = UUID.randomUUID();
return uuid.toString().replace("-", "");
}
public static String[] chars = new String[]{"a", "b", "c", "d", "e", "f",
"g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
"t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
"6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
"J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
"W", "X", "Y", "Z"};
public static String getShortUuid() {
StringBuffer shortBuffer = new StringBuffer();
String uuid = UUID.randomUUID().toString().replace("-", "");
for (int i = 0; i < 8; i++) {
String str = uuid.substring(i * 4, i * 4 + 4);
int x = Integer.parseInt(str, 16);
shortBuffer.append(chars[x % 0x3E]);
}
return shortBuffer.toString();
}
public static String getShortUuid(int idLength) {
if (idLength <= 0) idLength = 4;
StringBuffer shortBuffer = new StringBuffer();
String uuid = UUID.randomUUID().toString().replace("-", "");
for (int i = 0; i < idLength; i++) {
String str = uuid.substring(i * 4, i * 4 + 4);
int x = Integer.parseInt(str, 16);
shortBuffer.append(chars[x % 0x3E]);
}
return shortBuffer.toString();
}
}

@ -45,7 +45,10 @@
basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,
basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid, basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,
basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType, basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType,
basic_udirel.mainId,basic_udirel.mainName,basic_udirel.isAdavence 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.originUuid
FROM company_product_relevance FROM company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id ON company_product_relevance.udiRlIdFk = basic_udirel.id

@ -36,7 +36,37 @@
</where> </where>
</select> </select>
<select id="filterProductGroup" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
resultType="com.glxp.api.admin.entity.basic.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.api.admin.req.receipt.ProductInfoFilterRequest" <select id="filterCpmctymc" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
resultType="com.glxp.api.admin.entity.basic.ProductInfoEntity"> resultType="com.glxp.api.admin.entity.basic.ProductInfoEntity">

@ -19,6 +19,9 @@
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND uuid = #{uuid} AND uuid = #{uuid}
</if> </if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if>
</where> </where>
</select> </select>
@ -40,7 +43,7 @@
basic_products.scbssfbhph, basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid
FROM (company_product_relevance FROM (company_product_relevance
inner JOIN basic_udirel inner JOIN basic_udirel
ON company_product_relevance.udiRlIdFk = basic_udirel.id) ON company_product_relevance.udiRlIdFk = basic_udirel.id)
@ -80,7 +83,9 @@
</if> </if>
<if test="customerId != '' and customerId != null"> <if test="customerId != '' and customerId != null">
AND company_product_relevance.customerId = #{customerId} AND company_product_relevance.customerId = #{customerId}
</if>
<if test="originUuid != '' and originUuid != null">
AND originUuid = #{originUuid}
</if> </if>
</where> </where>
ORDER BY updateTime DESC ORDER BY updateTime DESC
@ -123,7 +128,7 @@
nameCode,packRatio,packLevel,bhxjsl, nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber 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 values
( (
#{id}, #{id},
@ -154,7 +159,7 @@
#{scbssfbhph}, #{scbssfbhph},
#{scbssfbhxlh}, #{scbssfbhxlh},
#{scbssfbhscrq}, #{scbssfbhscrq},
#{scbssfbhsxrq},#{cpms},#{manufactory} #{scbssfbhsxrq},#{cpms},#{manufactory},#{originUuid}
) )
</insert> </insert>
@ -164,7 +169,7 @@
nameCode,packRatio,packLevel,bhxjsl, nameCode,packRatio,packLevel,bhxjsl,
bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey,
cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber 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 values
@ -196,7 +201,7 @@
#{item.diType},#{item.productType}, #{item.scbssfbhph}, #{item.diType},#{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh}, #{item.scbssfbhxlh},
#{item.scbssfbhscrq}, #{item.scbssfbhscrq},
#{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory} #{item.scbssfbhsxrq},#{item.cpms},#{item.manufactory},#{item.originUuid}
) )
</foreach> </foreach>
</insert> </insert>
@ -247,6 +252,7 @@
<if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if> <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
<if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if> <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
<if test="cpms != null">cpms=#{cpms},</if> <if test="cpms != null">cpms=#{cpms},</if>
<if test="originUuid != null">originUuid=#{originUuid},</if>
</trim> </trim>
WHERE nameCode = #{nameCode} WHERE nameCode = #{nameCode}
@ -265,7 +271,7 @@
(id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType, (id, nameCode, packRatio, packLevel, bhxjsl, bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, addType,
deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, deviceRecordKey, cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh,
ylqxzcrbarywmc, sydycpbs, uuid, sjcpbm, versionNumber, diType, ybbm, sptm, manufactory, measname, 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=","> <foreach collection="udiInfoEntities" item="item" index="index" separator=",">
(#{item.id}, (#{item.id},
#{item.nameCode}, #{item.nameCode},
@ -299,7 +305,7 @@
#{item.productType}, #{item.scbssfbhph}, #{item.productType}, #{item.scbssfbhph},
#{item.scbssfbhxlh}, #{item.scbssfbhxlh},
#{item.scbssfbhscrq}, #{item.scbssfbhscrq},
#{item.scbssfbhsxrq},#{item.cpms}) #{item.scbssfbhsxrq},#{item.cpms},#{item.originUuid})
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

@ -24,7 +24,7 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, 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 FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -109,7 +109,7 @@
basic_products.diType,basic_products.productType,basic_products.scbssfbhph, basic_products.diType,basic_products.productType,basic_products.scbssfbhph,
basic_products.scbssfbhxlh, basic_products.scbssfbhxlh,
basic_products.scbssfbhscrq, basic_products.scbssfbhscrq,
basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid
FROM basic_udirel FROM basic_udirel
inner JOIN basic_products inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid ON basic_products.uuid = basic_udirel.uuid
@ -302,6 +302,28 @@
FROM basic_udirel FROM basic_udirel
WHERE id = #{id} WHERE id = #{id}
</select> </select>
<select id="selectByOrigiUuid" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.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="selectByThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest" <select id="selectByThirdId" parameterType="com.glxp.api.admin.req.basic.FilterUdiInfoRequest"
resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity"> resultType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
select * FROM basic_udirel select * FROM basic_udirel

@ -45,6 +45,43 @@
</where> </where>
</select> </select>
<select id="selectThrProducts" parameterType="com.glxp.api.admin.req.thrsys.FilterThrProductsRequest"
resultType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
SELECT * FROM thr_products
<where>
<if test="name != '' and name != null">
AND name =#{name}
</if>
<if test="code != '' and code != null">
AND code =#{code}
</if>
<if test="registerNo != '' and registerNo != null">
AND registerNo=#{registerNo}
</if>
<if test="manufactory != '' and manufactory != null">
AND manufactory=#{manufactory}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
ORDER BY updateTime DESC
</select>
<select id="batchSelectByIds" resultType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
select *
from thr_products where code in
<foreach collection="codes" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
and thirdSysFk = #{thirdSysFk}
</select>
<!-- ORDER BY updateTime DESC--> <!-- ORDER BY updateTime DESC-->
<select id="selectById" parameterType="Map" resultType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity"> <select id="selectById" parameterType="Map" resultType="com.glxp.api.admin.entity.thrsys.ThrProductsEntity">
select * select *

Loading…
Cancel
Save