UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化 service

Browse Source
dev_2.5_ocean
qiuyt 8 months ago
parent 2bb4c8b869
commit 42a29c9d69
7 changed files with 0 additions and 214 deletions
Show Stats Download Patch File Download Diff File

71
src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java
Unescape Escape View File

@ -79,14 +79,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
return data;
}
public List<UdiRelevanceEntity> filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) {
List<UdiRelevanceEntity> data = udiRelevanceDao.filterEntity(filterUdiRelRequest);
return data;
}
public List<UdiRelevanceResponse> selectAllByNameCode(String nameCode) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setUniqueNameCode(nameCode);
@ -178,12 +170,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
if (CollUtil.isNotEmpty(udiRelevanceResponses)) {
return udiRelevanceResponses.get(0);
}
// if (udiRelevanceResponses.size() == 1) {
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
// if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {
// return selectByMainId(nameCode);
// }
// }
return null;
@ -216,15 +202,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
}
public boolean isExitByUuid(String uuid) {
List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid);
if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) {
return true;
}
return false;
}
public List<UdiRelevanceEntity> batchSelectByUuid(List<String> uuids) {
return udiRelevanceDao.batchSelectByUuid(uuids);
}
@ -309,17 +286,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
return null;
}
public UdiRelevanceEntity selectByMainIdLimitOne(String mainId) {
if (mainId == null)
return null;
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setMainId(mainId);
return udiRelevanceDao.selectByThirdId(filterUdiRelRequest);
}
public List<UdiRelevanceResponse> selectByMainId(String mainId) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setMainId(mainId);
@ -409,14 +375,7 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) {
if (udiProductEntity != null) {
udiRelevanceEntity.setDistributeLevel(1);
// udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
// udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
// udiRelevanceEntity.setDistributeLevelCount(IntUtil.value(udiProductEntity.getBhxjsl()));
udiRelevanceEntity.setUseLevel(0);
// udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
// udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
// udiRelevanceEntity.setUseLeverCount(IntUtil.value(udiProductEntity.getBhxjsl()));
}
return udiRelevanceEntity;
@ -434,11 +393,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
return null;
}
public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) {
return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity);
}
public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
String mainSys = basicThirdSysEntity.getThirdId();
@ -467,30 +421,10 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
}
public boolean deleteByUuid(String uuid) {
return udiRelevanceDao.deleteByUuid(uuid);
}
public String findUuidById(String relId) {
return udiRelevanceDao.selectUuidById(relId);
}
public List<UdiRelevanceResponse> selectGroupByNameCode(String nameCode, Boolean isDisable) {
return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable);
}
public String getRelIdByUdiCode(String code) {
if (StrUtil.isBlank(code)) {
return null;
}
UdiEntity udi = FilterUdiUtils.getUdi(code);
return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi());
}
public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) {
return udiRelevanceDao.selectOneUdi(filterUdiRelRequest);
}
@ -508,11 +442,6 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
List<UdiRelevanceEntity> udiRelevanceEntityList = udiRelevanceDao.selectList(qw);
if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) {
mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity));
// List<Long> relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList());
// List<BasicProductsEntity> basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds);
// if (CollectionUtil.isNotEmpty(basicProductsEntities)){
// relIdBasicProductsEntityMap = basicProductsEntities.stream().collect(Collectors.toMap(BasicProductsEntity::getId, x -> x));
// }
}
mainIdRelIdAndProductResponse.setMainIdRelIdMap(mainIdRelIdMap);

14
src/main/java/com/glxp/api/service/basic/UdiRlSupService.java
Unescape Escape View File

@ -19,8 +19,6 @@ public interface UdiRlSupService extends IService<CompanyProductRelevanceEntity>
UdiRlSupEntity findCompanyProductRelevance(String CustomerId);
UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId);
UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId);
UdiRlSupEntity findByUdiRlIdUnitFk(String udiRlIdFk, String unitFk);
@ -35,22 +33,10 @@ public interface UdiRlSupService extends IService<CompanyProductRelevanceEntity>
int updateCompanyProductRelevance(CompanyProductRelevanceEntity companyCertEntity);
int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity);
boolean insertCompanyProductRelevance(UdiRlSupEntity companyCertEntity);
boolean deleteById(String id);
boolean deleteByRlId(String id);
/**
* 查询供应商是否存在此配送产品
*
* @param companyProductRelevanceRequest
* @return
*/
boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest);
UdiRlSupResponse findByRelUnitFk(String udiRlIdFk, String unitFk);
}

20
src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java
Unescape Escape View File

@ -68,10 +68,6 @@ public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, CompanyProduct
return companyEntities;
}
@Override
public UdiRlSupEntity findCompanyProductRelevanceByProductId(String productId) {
return udiRlSupDao.findCompanyProductRelevanceByProductId(productId);
}
@Override
public UdiRlSupEntity findCompanyProductRelevanceByUdiRlIdFk(String udiRlIdFk, String customerId) {
@ -113,12 +109,6 @@ public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, CompanyProduct
return udiRlSupDao.updateById(udiRlSupEntity);
}
@Override
public int updateCompanyProductRelevanceByUdiFk(CompanyProductRelevanceEntity companyCertEntity) {
QueryWrapper<CompanyProductRelevanceEntity> ew = new QueryWrapper<>();
ew.eq("udiRlIdFk", companyCertEntity.getUdiRlIdFk());
return udiRlSupDao.update(companyCertEntity, ew);
}
@Override
public boolean insertCompanyProductRelevance(UdiRlSupEntity udiRlSupEntity) {
@ -130,16 +120,6 @@ public class UdiRlSupServiceImpl extends ServiceImpl<UdiRlSupDao, CompanyProduct
return udiRlSupDao.deleteById(id);
}
@Override
public boolean deleteByRlId(String id) {
return udiRlSupDao.deleteByRlId(id);
}
@Override
public boolean findExist(CompanyProductRelevanceRequest companyProductRelevanceRequest) {
Long count = udiRlSupDao.selectSupRlCount(companyProductRelevanceRequest);
return null != count && count != 0;
}
@Override
public UdiRlSupResponse findByRelUnitFk(String udiRlIdFk, String unitFk) {

2
src/main/java/com/glxp/api/service/collect/IoCollectCodeBackService.java
Unescape Escape View File

@ -411,10 +411,8 @@ public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMappe
BeanUtils.copyProperties(ioCollectCodeBackup, ioCollectOrderCheckCode);
ioCollectCodeBackup.setScanCodeCheckStatus(1);
updateById(ioCollectCodeBackup);
// orderBackup.setCheckCodeStatus(1);
ThreadUtil.execAsync(() -> {
ioCollectOrderCheckCodeService.save(ioCollectOrderCheckCode);
// ioCollectOrderBackupService.updateByBillNo(orderBackup);
});
}
}

17
src/main/java/com/glxp/api/service/collect/IoCollectCodeService.java
Unescape Escape View File

@ -31,8 +31,6 @@ import org.springframework.transaction.annotation.Transactional;
public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCollectCode> {
@Resource
IoCollectCodeMapper collectCodeMapper;
@Resource
IoCollectOrderCodeAutoService collectOrderCodeAutoService;
@Resource
@ -101,9 +99,6 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
}
}
//有问题
// depleteScanCode(collectOrder.getBillNo());
}
@Resource
@ -188,16 +183,4 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
collectCodeBackService.saveBatch(ioCollectCodes);
}
public void depleteScanCode(String billNo) {
List<IoCollectCodeBackup> ioCollectCodeBackups = collectCodeBackService.listByBillNo(billNo);
ArrayList<IoCollectCodeBackup> ioCollectCodeBackups1 = new ArrayList<>();
for (IoCollectCodeBackup collectCodeBackup : ioCollectCodeBackups) {
if (collectCodeBackup.getBusType().equals("QXCF001") && collectCodeBackup.getPurType() != 1) {
collectCodeBackup.setIsUsed(true);
ioCollectCodeBackups1.add(collectCodeBackup);
}
}
collectCodeBackService.updateBatchById(ioCollectCodeBackups1);
}
}

23
src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java
Unescape Escape View File

@ -114,8 +114,6 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
updateById(one);
}
// http://192.168.0.166:9099/wms/associate/lighttagsled
String json = JSONUtil.toJsonStr(ledGroupRequest);
log.error("json:{}" + json);
try {
@ -132,27 +130,6 @@ public class IoCollectLedGroupService extends ServiceImpl<IoCollectLedGroupMappe
}
private Integer setLedNum(IoCollectLedGroup ioCollectLedGroup) {
// sys_order_led 灯亮设置
if (IntUtil.value(ioCollectLedGroup.getRed()) == 0) {
return LedColorStatusEnum.RED_FALSE.getReturnValue();
}
if (IntUtil.value(ioCollectLedGroup.getOrange()) == 0) {
return LedColorStatusEnum.ORANGE_FALSE.getReturnValue();
}
if (IntUtil.value(ioCollectLedGroup.getBlue()) == 0) {
return LedColorStatusEnum.BLUE_FALSE.getReturnValue();
}
if (IntUtil.value(ioCollectLedGroup.getBlue()) == 0) {
return LedColorStatusEnum.DEFAULT.getReturnValue();
}
return LedColorStatusEnum.DEFAULT.getReturnValue();
}
@Resource
private RedisDelayedQueue redisDelayedQueue;
private Integer setLedNumByOrderId(String orderIdFk,String mac,Long bizId){

67
src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
Unescape Escape View File

@ -192,15 +192,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
//todo
buildInnerOrder(collectOrder, sysWorkplaceDocumentEntity);
} else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1 && sysWorkplaceDocumentEntity.getScanType() != 1) {
//更新单据为已完成
// IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
//// orderEntity.setStatus(7);
//// orderEntity.setFromType(2);
//// orderEntity.setDealStatus(3);
//// orderEntity.setAuditTime(new Date());
//// orderService.update(orderEntity);
//// //推送自助平台
//// spGetHttpClient.updateCheckStatus(orderEntity, collectOrder.getCreateUser());
IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
@ -222,23 +213,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
}
}
// //插入处方备份表
// IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
// BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
// boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
// if (!save){
// throw new JsonException(500,"处方备用上传失败");
// }
// List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
// for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
// IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
// BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
// boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
// if (!save1){
// throw new JsonException(500,"处方备用明细上传失败");
// }
// }
}
/**
@ -467,11 +441,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
} else {
throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
}
// if (baseResponse.getCode() == 520) {
// Log.error("上传失败，" + baseResponse.getMessage());
// } else {
// throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
// }
}
@ -582,32 +551,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
}
// public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
// List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
// List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());;
// List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
// for (CollectOrderBizResponse collectOrderBiz : list) {
// CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
// BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
// //查询手动赋码的code
// for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(collectOrderBizResponse.getNameCode());
// if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
// collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
// }
// }
// if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())){
// collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
// }
// collectOrderBizResponses.add(collectOrderBizResponse);
// }
//
// return collectOrderBizResponses;
// }
public List<CollectOrderBizResponse> setScanCodeOrderDetail(CollectOrderBizRequest collectOrderBizRequest) {
List<CollectOrderBizResponse> list = ioCollectOrderBizBackupService.filterListByBillNo(collectOrderBizRequest);
List<IoCollectCodeBackup> ioCollectCodeBackups = ioCollectCodeBackService.listByBillNo(collectOrderBizRequest.getOrderIdFk());
List<CollectOrderBizResponse> collectOrderBizResponses = new ArrayList<>();
Map<String, UdiRelevanceResponse> udiRelevanceMap = new HashMap<>();
@ -618,18 +563,6 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
for (CollectOrderBizResponse collectOrderBiz : list) {
CollectOrderBizResponse collectOrderBizResponse = new CollectOrderBizResponse();
BeanUtils.copyProperties(collectOrderBiz, collectOrderBizResponse);
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceMap.get(collectOrderBizResponse.getNameCode());
if (udiRelevanceResponse != null) {
// for (IoCollectCodeBackup ioCollectCodeBackup : ioCollectCodeBackups) {
// if (ioCollectCodeBackup.getRelId().equals(udiRelevanceResponse.getId())) {
// collectOrderBizResponse.setScanUdiCode(StrUtil.trimToEmpty(collectOrderBizResponse.getScanUdiCode()) + "," + ioCollectCodeBackup.getCode());
// }
// }
// if (StrUtil.isNotEmpty(collectOrderBizResponse.getScanUdiCode())) {
// collectOrderBizResponse.setFinishUdiCode(collectOrderBizResponse.getScanUdiCode() == null ? "" : collectOrderBizResponse.getScanUdiCode().substring(1));
// }
}
collectOrderBizResponses.add(collectOrderBizResponse);
}

Write Preview
Loading…
Cancel
Save