|
|
|
|
@ -25,9 +25,12 @@ import com.glxp.api.req.inout.AddOrderRequest;
|
|
|
|
|
import com.glxp.api.req.inout.FilterOrderRequest;
|
|
|
|
|
import com.glxp.api.res.basic.UdiRelevanceResponse;
|
|
|
|
|
import com.glxp.api.service.alihealth.AlihealthBusService;
|
|
|
|
|
import com.glxp.api.service.basic.UdiRelevanceService;
|
|
|
|
|
import com.glxp.api.service.inout.IoCodeLostService;
|
|
|
|
|
import com.glxp.api.service.inout.IoOrderDetailBizService;
|
|
|
|
|
import com.glxp.api.service.inout.IoOrderService;
|
|
|
|
|
import com.glxp.api.service.inout.impl.IoCodeTempService;
|
|
|
|
|
import com.glxp.api.util.IntUtil;
|
|
|
|
|
import com.glxp.api.util.StringUtils;
|
|
|
|
|
import com.glxp.api.util.alihealth.AlihealthYljgUtils;
|
|
|
|
|
import com.glxp.api.util.udi.FilterUdiUtils;
|
|
|
|
|
@ -39,6 +42,7 @@ import org.w3c.dom.Document;
|
|
|
|
|
import org.w3c.dom.Element;
|
|
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.io.InputStream;
|
|
|
|
|
@ -65,23 +69,23 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
AlihealthYljgListupoutReqeust alihealthYljgListupoutReqeust1 = new AlihealthYljgListupoutReqeust();
|
|
|
|
|
alihealthYljgListupoutReqeust1.setBegin_date(aliYljgSearchbillReqeust.getBeginDate());
|
|
|
|
|
alihealthYljgListupoutReqeust1.setEnd_date(aliYljgSearchbillReqeust.getEnsDate());
|
|
|
|
|
if(StringUtils.isNotEmpty(aliYljgSearchbillReqeust.getBillCode())){
|
|
|
|
|
if (StringUtils.isNotEmpty(aliYljgSearchbillReqeust.getBillCode())) {
|
|
|
|
|
alihealthYljgListupoutReqeust1.setBill_code(aliYljgSearchbillReqeust.getBillCode());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (aliYljgSearchbillReqeust.getPage() != null) {
|
|
|
|
|
alihealthYljgListupoutReqeust1.setPage(aliYljgSearchbillReqeust.getPage());
|
|
|
|
|
alihealthYljgListupoutReqeust1.setPage_size(aliYljgSearchbillReqeust.getLimit());
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
alihealthYljgListupoutReqeust1.setPage(1);
|
|
|
|
|
alihealthYljgListupoutReqeust1.setPage_size(20);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BaseResponse<List<AliYljgSearchbill>> listBaseResponse = alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, aliYljgSearchbillReqeust.getErpId());
|
|
|
|
|
if (listBaseResponse.getCode() == 20000){
|
|
|
|
|
if (listBaseResponse.getCode() == 20000) {
|
|
|
|
|
List<AliYljgSearchbill> data = listBaseResponse.getData();
|
|
|
|
|
return data;
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
throw new JsonException(listBaseResponse.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -93,10 +97,10 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
alihealthYljgListupoutDetailReqeust.setFrom_ref_user_id(aliYljgSearchbillReqeust.getFromRefUserId());
|
|
|
|
|
|
|
|
|
|
BaseResponse<AliYljgBillDetail> aliYljgBillDetailBaseResponse = alihealthYljgUtils.listupoutDetail(alihealthYljgListupoutDetailReqeust);
|
|
|
|
|
if (aliYljgBillDetailBaseResponse.getCode() == 20000){
|
|
|
|
|
if (aliYljgBillDetailBaseResponse.getCode() == 20000) {
|
|
|
|
|
AliYljgBillDetail data = aliYljgBillDetailBaseResponse.getData();
|
|
|
|
|
return data;
|
|
|
|
|
}else {
|
|
|
|
|
} else {
|
|
|
|
|
throw new JsonException(aliYljgBillDetailBaseResponse.getMessage());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -110,7 +114,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void ycFileUpload(String billNo,MultipartFile file) {
|
|
|
|
|
public void ycFileUpload(String billNo, MultipartFile file) {
|
|
|
|
|
try {
|
|
|
|
|
String fileName = file.getOriginalFilename();
|
|
|
|
|
String suffix = FileUtil.getSuffix(fileName);
|
|
|
|
|
@ -125,14 +129,14 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<YcFileCodeUploadVo> list = getList(file);
|
|
|
|
|
if (CollUtil.isEmpty(list)){
|
|
|
|
|
if (CollUtil.isEmpty(list)) {
|
|
|
|
|
throw new JsonException("文件数据为空");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
FilterOrderRequest request = new FilterOrderRequest();
|
|
|
|
|
request.setBillNo(billNo);
|
|
|
|
|
List<IoOrderEntity> ioOrderEntities = ioOrderService.filterOrderList(request);
|
|
|
|
|
if (CollUtil.isEmpty(ioOrderEntities)){
|
|
|
|
|
if (CollUtil.isEmpty(ioOrderEntities)) {
|
|
|
|
|
throw new JsonException("单据编号未找到信息");
|
|
|
|
|
}
|
|
|
|
|
IoOrderEntity ioOrderEntity = ioOrderEntities.get(0);
|
|
|
|
|
@ -146,8 +150,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
addOrderRequest.setCode(code);
|
|
|
|
|
UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
|
|
|
|
|
|
|
|
|
|
if (udiEntity == null){
|
|
|
|
|
throw new JsonException("追溯码解析错误：【"+code+"】");
|
|
|
|
|
if (udiEntity == null) {
|
|
|
|
|
throw new JsonException("追溯码解析错误：【" + code + "】");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IoCodeLostEntity codeLostEntity = ioCodeLostService.findByCode(ycFileCodeUploadVo.getCode());
|
|
|
|
|
@ -174,7 +178,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
codeLostEntity.setExpireDate(udiEntity.getExpireDate());
|
|
|
|
|
}
|
|
|
|
|
Long id = codeLostEntity.getId();
|
|
|
|
|
if (id == null) codeLostEntity.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
if (id == null) codeLostEntity.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
}
|
|
|
|
|
ioCodeLostService.insertOrUpdate(codeLostEntity);
|
|
|
|
|
|
|
|
|
|
@ -185,11 +189,43 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private UdiRelevanceService udiRelevanceService;
|
|
|
|
|
@Resource
|
|
|
|
|
private IoOrderDetailBizService orderDetailBizService;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public IoOrderEntity ycOrderFileUpload(String billNoJson, MultipartFile file) {
|
|
|
|
|
public BaseResponse ycOrderFileUpload(String billNoJson, MultipartFile file) {
|
|
|
|
|
// 解析请求参数
|
|
|
|
|
AddBizProductReqeust bizProductRequest = JSONObject.parseObject(billNoJson, AddBizProductReqeust.class);
|
|
|
|
|
|
|
|
|
|
// 校验上传文件
|
|
|
|
|
validateUploadFile(file);
|
|
|
|
|
|
|
|
|
|
// 解析Excel文件数据
|
|
|
|
|
List<YcFileOrderUploadVo> orderList = getOrderList(file);
|
|
|
|
|
if (CollUtil.isEmpty(orderList)) {
|
|
|
|
|
throw new JsonException("文件数据为空");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 构建业务请求参数
|
|
|
|
|
IoOrderEntity orderEntity = bizProductRequest.getOrderEntity();
|
|
|
|
|
bizProductRequest.setProductType(2);
|
|
|
|
|
bizProductRequest.setOrderEntity(orderEntity);
|
|
|
|
|
|
|
|
|
|
// 处理每条订单数据
|
|
|
|
|
List<AddBizProductReqeust> productRequests = new ArrayList<>();
|
|
|
|
|
for (YcFileOrderUploadVo orderUploadVo : orderList) {
|
|
|
|
|
AddBizProductReqeust productRequest = buildProductRequest(orderUploadVo, orderEntity, bizProductRequest.getFromCorp());
|
|
|
|
|
productRequests.add(productRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
AddBizProductReqeust addBizProductReqeust = JSONObject.parseObject(billNoJson, AddBizProductReqeust.class);
|
|
|
|
|
bizProductRequest.setDatas(productRequests);
|
|
|
|
|
return orderDetailBizService.addBizProduct(bizProductRequest);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void validateUploadFile(MultipartFile file) {
|
|
|
|
|
try {
|
|
|
|
|
String fileName = file.getOriginalFilename();
|
|
|
|
|
String suffix = FileUtil.getSuffix(fileName);
|
|
|
|
|
@ -202,75 +238,29 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new JsonException("上传失败：" + e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
List<YcFileOrderUploadVo> list = getOrderList(file);
|
|
|
|
|
if (CollUtil.isEmpty(list)){
|
|
|
|
|
throw new JsonException("文件数据为空");
|
|
|
|
|
private AddBizProductReqeust buildProductRequest(YcFileOrderUploadVo orderUploadVo, IoOrderEntity orderEntity, String fromCorp) {
|
|
|
|
|
orderEntity.setYcBillNo(orderUploadVo.getYcBillNo());
|
|
|
|
|
|
|
|
|
|
UdiRelevanceResponse udiRelevance = udiRelevanceService.selectByMainIdOne(orderUploadVo.getDrugUnifiedCode());
|
|
|
|
|
if (udiRelevance == null) {
|
|
|
|
|
throw new JsonException(500, "未通过药品标识获取详情信息！");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity();
|
|
|
|
|
// TODO: 2024/12/25 阳采导入业务明细功能 1、参考阿里的业务导入（下方注释的代码）搜索 addAliBizProduct 参考 需要考虑 发票的问题 和 后续导出 阳采的单号 和 明细 需要先做存储 有单号追加
|
|
|
|
|
return ioOrderEntity;
|
|
|
|
|
//
|
|
|
|
|
// IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity();
|
|
|
|
|
// addBizProductReqeust.setAliOrderBillNo(billCode);
|
|
|
|
|
// ioOrderEntity.setAliOrderBillNo(billCode);
|
|
|
|
|
// for (int i = 0; i < aliYljgBillDetailDrugList.size(); i++) {
|
|
|
|
|
// AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i);
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
// String code = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList().get(0).getCode();
|
|
|
|
|
// if (StrUtil.isEmpty(code)) {
|
|
|
|
|
// return ResultVOUtils.error("单据码为空！");
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// UdiEntity drugInfo = FilterUdiUtils.getDrugInfo(code);
|
|
|
|
|
// if (drugInfo == null) {
|
|
|
|
|
// return ResultVOUtils.error("单据码解析药品信息错误！");
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// //获取药品信息
|
|
|
|
|
// String nameCode = drugInfo.getUdi();
|
|
|
|
|
// if (StrUtil.isEmpty(nameCode)) {
|
|
|
|
|
// return ResultVOUtils.error("单据码解析药品标识错误！");
|
|
|
|
|
// }
|
|
|
|
|
// FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
|
|
|
|
|
// filterUdiRelRequest.setNameCode(nameCode);
|
|
|
|
|
// List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest);
|
|
|
|
|
// if (CollUtil.isEmpty(udiRelevanceResponses)) {
|
|
|
|
|
// return ResultVOUtils.error("未通过药品标识获取详情信息！");
|
|
|
|
|
// }
|
|
|
|
|
// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0);
|
|
|
|
|
// List<AliYljgBillDetailDrugCode> aliYljgBillDetailDrugCodeList1 = aliYljgBillDetailDrug.getAliYljgBillDetailDrugCodeList();
|
|
|
|
|
// //1、直接模拟增加biz一行
|
|
|
|
|
// addBizProductReqeust.setProductId(String.valueOf(udiRelevanceResponse.getProductId()));
|
|
|
|
|
// addBizProductReqeust.setRelId(udiRelevanceResponse.getRelId());
|
|
|
|
|
// addBizProductReqeust.setZczbhhzbapzbh(udiRelevanceResponse.getZczbhhzbapzbh());
|
|
|
|
|
// addBizProductReqeust.setSupId(udiRelevanceResponse.getSupId());
|
|
|
|
|
// addBizProductReqeust.setDatas(null);
|
|
|
|
|
// addBizProductReqeust.setCount(aliYljgBillDetailDrugCodeList1.size() * udiCalCountUtil.getCirActCount(udiRelevanceResponse));
|
|
|
|
|
//
|
|
|
|
|
// addBizProductReqeust.setBatchNo(aliYljgBillDetailDrug.getProduceBatchNo());
|
|
|
|
|
// if (StrUtil.isNotEmpty(aliYljgBillDetailDrug.getProduceDate())) {
|
|
|
|
|
// addBizProductReqeust.setProductDate(aliYljgBillDetailDrug.getProduceDate().substring(2).replace(" 00:00:00", "").replace("-", ""));
|
|
|
|
|
// }
|
|
|
|
|
// if (StrUtil.isNotEmpty(aliYljgBillDetailDrug.getValidEndDate())) {
|
|
|
|
|
// addBizProductReqeust.setExpireDate(aliYljgBillDetailDrug.getValidEndDate().substring(2).replace(" 00:00:00", "").replace("-", ""));
|
|
|
|
|
// }
|
|
|
|
|
// if (i == 0) {
|
|
|
|
|
// addBizProductReqeust.setOrderEntity(ioOrderEntity);
|
|
|
|
|
// }
|
|
|
|
|
// addBizProductReqeust.setProductType(udiRelevanceResponse.getProductType());
|
|
|
|
|
// BaseResponse response = orderDetailBizService.addBizProduct(addBizProductReqeust);
|
|
|
|
|
// if (response.getCode() != 20000) {
|
|
|
|
|
// return response;
|
|
|
|
|
// }
|
|
|
|
|
// if (i == 0) {
|
|
|
|
|
// ioOrderEntity = JSONObject.parseObject(JSONObject.toJSONString(response.getData()), IoOrderEntity.class);
|
|
|
|
|
// addBizProductReqeust.setOrderEntity(ioOrderEntity);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
AddBizProductReqeust productRequest = new AddBizProductReqeust();
|
|
|
|
|
productRequest.setProductId(String.valueOf(udiRelevance.getProductId()));
|
|
|
|
|
productRequest.setRelId(udiRelevance.getRelId());
|
|
|
|
|
productRequest.setZczbhhzbapzbh(udiRelevance.getZczbhhzbapzbh());
|
|
|
|
|
productRequest.setDatas(null);
|
|
|
|
|
productRequest.setCount(IntUtil.value(orderUploadVo.getShipmentQuantity()));
|
|
|
|
|
productRequest.setBatchNo(orderUploadVo.getBatchNumber());
|
|
|
|
|
productRequest.setProductType(udiRelevance.getProductType());
|
|
|
|
|
productRequest.setYcBizNo(orderUploadVo.getShipmentDetailId());
|
|
|
|
|
productRequest.setPrice(orderUploadVo.getPurchasePrice());
|
|
|
|
|
productRequest.setSupId(fromCorp);
|
|
|
|
|
|
|
|
|
|
return productRequest;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public List<YcFileCodeUploadVo> getList(MultipartFile file) {
|
|
|
|
|
|
yewj
3 months ago