|
|
|
@ -777,23 +777,6 @@ public class UdiRelevanceController extends BaseController {
|
|
|
|
|
return basicProductThirdSysResponse;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private BasicProductThirdSysResponse createResponse(ThrSystemEntity thrSystemEntity, UdiRelevanceEntity udiRelevanceEntity, ThrDataService thrDataService, String thirdId) {
|
|
|
|
|
BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse();
|
|
|
|
|
if (StrUtil.isNotEmpty(udiRelevanceEntity.getThirdId()))
|
|
|
|
|
basicProductThirdSysResponse.setThirdId(udiRelevanceEntity.getThirdId());
|
|
|
|
|
basicProductThirdSysResponse.setSysName(thrSystemEntity.getThirdName());
|
|
|
|
|
basicProductThirdSysResponse.setSysId(thrSystemEntity.getThirdId());
|
|
|
|
|
if (udiRelevanceEntity.getThirdId()!= null &&!udiRelevanceEntity.getThirdId().isEmpty()) {
|
|
|
|
|
ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getThirdId(), thirdId);
|
|
|
|
|
if (thrProductsEntity!= null) {
|
|
|
|
|
basicProductThirdSysResponse.setManufactory(thrProductsEntity.getManufactory());
|
|
|
|
|
basicProductThirdSysResponse.setRegisterNo(thrProductsEntity.getRegisterNo());
|
|
|
|
|
basicProductThirdSysResponse.setSpec(thrProductsEntity.getSpec());
|
|
|
|
|
basicProductThirdSysResponse.setThirdName(thrProductsEntity.getName());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return basicProductThirdSysResponse;
|
|
|
|
|
}
|
|
|
|
|
//获取是否启用供应商维护产品信息
|
|
|
|
|
@AuthRuleAnnotation("")
|
|
|
|
|
@GetMapping("/udiwms/udiinfo/spcombie")
|
|
|
|
|