耗材字典关联

newFrame
anthonywj 2 years ago
parent b8188c748b
commit dc1948b2f3

@ -41,7 +41,6 @@ public class SystemPDFTemplateController {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
// systemPDFTemplateRequest.setType(2);
List<SystemPDFTemplateEntity> systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest);
List<SystemPDFTemplateResponse> systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> {

@ -21,38 +21,7 @@ public class ErpInvClient {
@Resource
HttpOkClient httpOkClient;
public List<ErpOnHandResponse> getOnHand(ErpOnhandRequest onhandRequest, String url) {
BaseResponse<PageSimpleResponse<ErpOnHandResponse>> onHandsResponse = getOnHandResponse(onhandRequest, url);
List<ErpOnHandResponse> erpOnHandResponses = onHandsResponse.getData().getList();
return erpOnHandResponses;
}
public BaseResponse<PageSimpleResponse<ErpOnHandResponse>> getOnHandResponse(ErpOnhandRequest onhandRequest, String url) {
Map<String, Object> paramMap = new HashMap<>(16);
if (onhandRequest.getBatchNo() != null && !onhandRequest.getBatchNo().equals(""))
paramMap.put("batchNo", onhandRequest.getBatchNo());
if (onhandRequest.getWarehouseCode() != null && !onhandRequest.getWarehouseCode().equals(""))
paramMap.put("warehouseCode", onhandRequest.getWarehouseCode());
if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals(""))
paramMap.put("inventoryCode", onhandRequest.getInventoryCode());
if (onhandRequest.getPage() != null)
paramMap.put("page", onhandRequest.getPage());
if (onhandRequest.getLimit() != null)
paramMap.put("limit", onhandRequest.getLimit());
// String response = HttpClient.mipsGet(url, paramMap);
String response = httpOkClient.uCloudPost(url, onhandRequest);
try {
BaseResponse<PageSimpleResponse<ErpOnHandResponse>> onHandsResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpOnHandResponse>>>() {
});
return onHandsResponse;
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
public BaseResponse<PageSimpleResponse<ErpInvProductResponse>> getInvPrdoductResponse(ErpOnhandRequest onhandRequest, String url) {

@ -297,10 +297,6 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4());
udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4());
}
UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
BeanUtil.copyProperties(udiRelevanceEntity, udiInfoEntity);
udiInfoDao.updateUdiInfoByUuid(udiInfoEntity);
return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
}

Loading…
Cancel
Save