diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index c49a436..498d5ce 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -151,7 +151,7 @@ public class CtqyyClient extends CommonHttpClient {
@Override
public BaseResponse getUnit(UdiwmsUnitRequest udiwmsUnitRequest) {
CtqyyRequest ctqyyRequest = new CtqyyRequest();
- udiwmsUnitRequest.setUnitType("1");
+ udiwmsUnitRequest.setUnitType("2");
ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialUnit"));
ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsUnitRequest));
String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_CORP_URL), ctqyyRequest);
diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
new file mode 100644
index 0000000..33582d7
--- /dev/null
+++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/YxfyyyClient.java
@@ -0,0 +1,1289 @@
+package com.glxp.mipsdl.client.yxfuyy;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.glxp.mipsdl.client.CommonHttpClient;
+import com.glxp.mipsdl.client.yxfuyy.entity.InvCodeResultEntity;
+import com.glxp.mipsdl.client.yxfuyy.entity.InvProjectResultEntity;
+import com.glxp.mipsdl.client.yxfuyy.entity.InvResultEntity;
+import com.glxp.mipsdl.config.ThirdSysConfig;
+import com.glxp.mipsdl.constant.ConstantType;
+import com.glxp.mipsdl.constant.Constants;
+import com.glxp.mipsdl.dao.auth.AuthUserDao;
+import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
+import com.glxp.mipsdl.dao.auth.AuthWarehouseUserMapper;
+import com.glxp.mipsdl.dao.basic.*;
+import com.glxp.mipsdl.dao.inout.*;
+import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao;
+import com.glxp.mipsdl.dao.thrsys.ThrProductsDao;
+import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
+import com.glxp.mipsdl.entity.auth.AuthUserEntity;
+import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
+import com.glxp.mipsdl.entity.basic.*;
+import com.glxp.mipsdl.entity.ctqyy.BasicSkPrescribeItemEntity;
+import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity;
+import com.glxp.mipsdl.entity.ctqyy.PriceClassEntity;
+import com.glxp.mipsdl.entity.ctqyy.ThrHslbEntity;
+import com.glxp.mipsdl.entity.inout.*;
+import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
+import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
+import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
+import com.glxp.mipsdl.http.HttpClient;
+import com.glxp.mipsdl.req.base.*;
+import com.glxp.mipsdl.req.ctqyy.*;
+import com.glxp.mipsdl.req.post.*;
+import com.glxp.mipsdl.req.zaxyy.ZaxzyyOrderRequest;
+import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest;
+import com.glxp.mipsdl.res.BaseResponse;
+import com.glxp.mipsdl.res.PageSimpleResponse;
+import com.glxp.mipsdl.res.ctqyy.CtBaseResponse;
+import com.glxp.mipsdl.res.udiwms.*;
+import com.glxp.mipsdl.service.auth.AuthWarehouseService;
+import com.glxp.mipsdl.service.order.OrderUploadLogService;
+import com.glxp.mipsdl.service.system.SysParamConfigService;
+import com.glxp.mipsdl.service.thrsys.ThrCorpService;
+import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
+import com.glxp.mipsdl.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service(value = "100013HttpClient")
+public class YxfyyyClient extends CommonHttpClient {
+ @Resource
+ AuthWarehouseUserMapper authWarehouseUserMapper;
+ @Resource
+ private ThrSystemDetailService thrSystemDetailService;
+ @Resource
+ private HttpClient httpClient;
+
+ @Resource
+ private SubmitOrderUtil submitOrderUtil;
+ @Resource
+ private IoOrderUploadLogDao orderUploadLogDao;
+
+ @Resource
+ private IoOrderDao orderDao;
+ @Resource
+ private ThrSystemBusApiDao thrSystemBusApiDao;
+ @Resource
+ private BasicBussinessTypeDao basicBussinessTypeDao;
+ @Resource
+ private BasicCorpDao basicCorpDao;
+ @Resource
+ private IoCodeDao codeDao;
+ @Resource
+ private AuthWarehouseDao authWarehouseDao;
+ @Resource
+ private ThrInvWarehouseDao thrInvWarehouseDao;
+ @Resource
+ private AuthWarehouseService authWarehouseService;
+ @Resource
+ private ThirdSysConfig thirdSysConfig;
+ @Resource
+ private ThrCorpService thrCorpService;
+ @Resource
+ private IoOrderDetailBizDao orderDetailBizDao;
+ @Resource
+ private IoOrderDetailCodeDao orderDetailCodeDao;
+ @Resource
+ private AuthUserDao authUserDao;
+ @Resource
+ BasicUdirelDao basicUdirelDao;
+ @Resource
+ BasicProductsDao basicProductsDao;
+ @Resource
+ private OrderUploadLogService orderUploadLogService;
+
+ /**
+ * 拼接xml请求头
+ *
+ * @param methodName 方法名
+ * @return
+ */
+ public String getMsgHeader(String methodName) {
+ return "" +
+ "" +
+ "" +
+ methodName +
+ "" +
+ "";
+ }
+
+
+ public String parserResult(String response) {
+ if (response.contains(" zzzyyProductsResponse = JSON.parseArray(map.get("list") + "", ZzzyyProductsResponse.class);
+ for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) {
+ //判断要是规格和型号一致就是取规格 不一致就合并
+ if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) {
+ if (productsResponse.getModel_number().equals(productsResponse.getStandard())) {
+ productsResponse.setStandard(productsResponse.getStandard());
+ } else {
+ productsResponse.setStandard(productsResponse.getStandard() + productsResponse.getModel_number());
+ }
+ } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) {
+ productsResponse.setStandard(productsResponse.getModel_number());
+ }
+ }
+ map.put("list", JSON.toJSON(zzzyyProductsResponse));
+ baseResponse.setData("");
+ baseResponse.setData(map);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析云霄妇幼医院智业接口返回产品信息字典数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+ @Override
+ public BaseResponse getOrderTypes(UdiwmsBusTypeRequest udiwmsBusTypeRequest) {
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialType"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsBusTypeRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_BUS_TYPE_QUERY_URL), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析云霄妇幼医院智业接口返回单据类型数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+ /**
+ * 提交关联产品更新
+ *
+ * @return
+ */
+ @Override
+ public BaseResponse postRelProduct(PostRelProductRequest postThrInvProductsRequest) {
+ UdiRelevanceResponse udiRelevanceResponse = postThrInvProductsRequest.getUdiRelevanceResponse();
+
+ if (udiRelevanceResponse == null) {
+ return ResultVOUtils.error(500, "提交产品列表不能为空!");
+ }
+ MaterialDictEntity materialDictEntity = new MaterialDictEntity();
+ if (StrUtil.isEmpty(udiRelevanceResponse.getMainId()) && StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid()))
+ materialDictEntity.setOperatType("1");
+ else
+ materialDictEntity.setOperatType("2");
+ materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc());
+ materialDictEntity.setCostlySign("1");
+ if (StrUtil.isNotEmpty(udiRelevanceResponse.getMainId()) && udiRelevanceResponse.getMainId().endsWith("x")) {
+ materialDictEntity.setMaterialMasterCode(null);
+ materialDictEntity.setHisMaterialCode(null);
+ materialDictEntity.setCostlySign("0");
+ materialDictEntity.setOperatType("1");
+ } else {
+ materialDictEntity.setMaterialMasterCode(udiRelevanceResponse.getNameCode());
+ materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId());
+ }
+
+ materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh());
+ materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname());
+ //暂无区分进货价,零售价
+ materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice() == null ? "0" : udiRelevanceResponse.getPrice().toString());
+ materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice() == null ? "0" : udiRelevanceResponse.getPrice().toString());
+ materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory());
+ materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName());
+ materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm());
+ materialDictEntity.setRegeditNo(udiRelevanceResponse.getZczbhhzbapzbh());
+ materialDictEntity.setMaterialClass(udiRelevanceResponse.getBasicPrductRemak7());
+ //暂无中标标识
+ materialDictEntity.setPublicFlag("1");
+ materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8());
+ //暂无收费标志
+ materialDictEntity.setFeeFlag(udiRelevanceResponse.getBasicPrductRemak6());
+
+
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ log.error("提交新增产品信息:" + ctqyyRequest.getMsgBody());
+ CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class);
+ if (baseResponse.getCode() != 20000) {
+ String errMsg = "提交新增产品信息,异常:{}" + response;
+ log.error(errMsg);
+ return ResultVOUtils.error(500, "提交新增产品失败!");
+
+ } else {
+// materialDictEntity.setMaterialNo(baseResponse.getMaterialNo());
+ log.error("提交新增产品信息,成功:{}", response);
+ return ResultVOUtils.success(baseResponse.getMaterialNo());
+ }
+ } catch (Exception e) {
+ String errMsg = "提交新增产品信息,异常:{}" + response;
+ log.error(errMsg);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, errMsg);
+
+ }
+ }
+
+
+ /**
+ * 获取患者信息
+ *
+ * @param getSickRequest
+ * @return
+ */
+ public BaseResponse getSickInfo(GetSickRequest getSickRequest) {
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getSickVisitInfo"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ Map map = (Map) baseResponse.getData();
+ List basicSkSickerResponses = JSON.parseArray(map.get("list") + "", BasicSkSickerResponse.class);
+// for (BasicSkSickerResponse productsResponse : basicSkSickerResponses) {
+//
+// }
+ map.put("list", JSON.toJSON(basicSkSickerResponses));
+ baseResponse.setData("");
+ baseResponse.setData(map);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析长泰医院智业返回病人信息数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+ /**
+ * 获取患者处方信息
+ *
+ * @param getSickPrescribeRequest
+ * @return
+ */
+ public BaseResponse getSickPescribe(GetSickPrescribeRequest getSickPrescribeRequest) {
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getResiPresInfo"));
+ getSickPrescribeRequest.setResiNo(getSickPrescribeRequest.getAdNum());
+ getSickPrescribeRequest.setAdNum(null);
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(getSickPrescribeRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_SICKER_PRESCIRBE), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ Map map = (Map) baseResponse.getData();
+ List basicSkPrescribeResponses = JSON.parseArray(map.get("list") + "", BasicSkPrescribeResponse.class);
+ for (BasicSkPrescribeResponse basicSkPrescribeResponse : basicSkPrescribeResponses) {
+ List itemEntities = basicSkPrescribeResponse.getItemList();
+ if (CollUtil.isNotEmpty(itemEntities)) {
+ for (BasicSkPrescribeItemEntity itemEntity : itemEntities) {
+ itemEntity.setCount("0");
+ }
+ }
+ }
+ map.put("list", JSON.toJSON(basicSkPrescribeResponses));
+ baseResponse.setData("");
+ baseResponse.setData(map);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析长泰医院智业返回处方信息数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+
+ }
+
+
+// public String getStrConut(String str) {
+// if (StrUtil.isNotEmpty(str)) {
+// return "0";
+// }
+// Pattern pattern = Pattern.compile("\\d+");
+// Matcher matcher = pattern.matcher(str);
+// String strCount = "";
+// while (matcher.find()) {
+// strCount = strCount + matcher.group();
+// }
+// return strCount;
+// }
+
+
+ /**
+ * 获取项目组套字典
+ *
+ * @param dlThirdProjectRequest
+ * @return
+ */
+ @Override
+ public BaseResponse getBasicProject(DlThirdProjectRequest dlThirdProjectRequest) {
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(dlThirdProjectRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_PROJECT), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ Map map = (Map) baseResponse.getData();
+ List basicSkProjectResponses = JSON.parseArray(map.get("list") + "", BasicSkProjectResponse.class);
+ for (BasicSkProjectResponse basicSkProjectResponse : basicSkProjectResponses) {
+
+ }
+ map.put("list", JSON.toJSON(basicSkProjectResponses));
+ baseResponse.setData("");
+ baseResponse.setData(map);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析长泰医院智业返回项目信息数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+
+ /**
+ * 获取核算类别
+ *
+ * @param hslbRequest
+ * @return
+ */
+ @Override
+ public BaseResponse getHsfl(FilterThrHslbRequest hslbRequest) {
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getItemClass"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(hslbRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_HSLB), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ Map map = (Map) baseResponse.getData();
+ List priceClassEntities = JSON.parseArray(map.get("list") + "", PriceClassEntity.class);
+
+ List hslbEntities = new ArrayList<>();
+ for (PriceClassEntity priceClassEntity : priceClassEntities) {
+ ThrHslbEntity thrHslbEntity = new ThrHslbEntity();
+ thrHslbEntity.setHsbm(priceClassEntity.getClassCode());
+ thrHslbEntity.setHsmc(priceClassEntity.getClassName());
+ hslbEntities.add(thrHslbEntity);
+ }
+ map.put("list", JSON.toJSON(hslbEntities));
+ baseResponse.setData("");
+ baseResponse.setData(map);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析长泰医院智业返回物价类别信息异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+
+ @Override
+ public BaseResponse getOrders(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) {
+ return null;
+ }
+
+ @Resource
+ SysParamConfigService sysParamConfigService;
+
+ @Override
+ public BaseResponse submitOrders(UdiwmsOrderRequest udiwmsOrderRequest) {
+ if (StrUtil.isBlank(udiwmsOrderRequest.getBillNo())) {
+ return ResultVOUtils.error(500, "单据号不能为空");
+ }
+
+ ZaxzyyOrderRequest zaxzyyOrderRequest = new ZaxzyyOrderRequest();
+ BeanUtil.copyProperties(udiwmsOrderRequest, zaxzyyOrderRequest);
+ //查询单据和详情信息,组装第三方系统接口所需参数
+ IoOrderEntity orderEntity = orderDao.selectOne(new QueryWrapper().eq("billNo", udiwmsOrderRequest.getBillNo()));
+
+ zaxzyyOrderRequest.setBillDate(DateUtil.formatDateTime(orderEntity.getCreateTime()));
+ //查询对应的第三方单据类型
+ ThrSystemBusApiEntity thrSystemBusApiEntity = thrSystemBusApiDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getBillType()));
+ zaxzyyOrderRequest.setThirdSys(getUserName(orderEntity));
+ zaxzyyOrderRequest.setBillType(thrSystemBusApiEntity.getThirdBuyCode());
+ zaxzyyOrderRequest.setBillFlag("1");
+
+ //查询单据类型
+ BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeDao.selectByAction(udiwmsOrderRequest.getBillType());
+ if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_HOSPTIAL)) {
+ //医院客户
+ zaxzyyOrderRequest.setCorpId(orderEntity.getFromCorp());
+ //查询客户名称
+ String corpName = basicCorpDao.selectNameByErpId(orderEntity.getFromCorp());
+ zaxzyyOrderRequest.setCorpName(corpName);
+ } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_INTTERNAL)) {
+ //内部科室
+ BasicCorpEntity basicCorpEntity = null;
+ if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) {
+ basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp());
+ }
+ if (basicCorpEntity != null) {
+ zaxzyyOrderRequest.setCorpId(basicCorpEntity.getThirdId());
+ zaxzyyOrderRequest.setCorpName(basicCorpEntity.getName());
+ } else {
+ AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper().eq("code", udiwmsOrderRequest.getCorpId()));
+ try {
+ //根据第三方系统标识,获取对应字段的值
+ ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper()
+ .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity))
+ .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId()));
+
+ zaxzyyOrderRequest.setCorpId(thrInvWarehouseEntity.getCode());
+ zaxzyyOrderRequest.setCorpName(thrInvWarehouseEntity.getName());
+ } catch (Exception e) {
+ String msg = "查询单据对应往来单位的第三方仓库信息异常";
+ orderUploadLogService.updateLocalErr(orderEntity, msg);
+ log.error("----单据提交-----" + orderEntity.getBillNo() + msg);
+ return ResultVOUtils.error(500, msg);
+ }
+ }
+
+ } else {
+ //供应商
+ BasicCorpEntity basicCorpEntity = null;
+ if (StrUtil.isNotEmpty(orderEntity.getFromCorp())) {
+ basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp());
+ }
+ if (basicCorpEntity != null) {
+ zaxzyyOrderRequest.setCorpId(basicCorpEntity.getThirdId());
+ zaxzyyOrderRequest.setCorpName(basicCorpEntity.getName());
+ } else {
+ String msg = "查询单据对应的第三方往来单位信息异常";
+ orderUploadLogService.updateLocalErr(orderEntity, msg);
+ log.error("----单据提交-----" + orderEntity.getBillNo() + msg);
+ return ResultVOUtils.error(500, msg);
+ }
+ }
+
+
+ //查询仓库信息
+ AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new QueryWrapper().eq("code", orderEntity.getInvCode()));
+ try {
+ ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectOne(new LambdaQueryWrapper()
+ .eq(ThrInvWarehouseEntity::getCode, authWarehouseService.getThirdInvCode(warehouseEntity))
+ .eq(ThrInvWarehouseEntity::getThirdSysFk, thirdSysConfig.getThirdId()));
+
+ zaxzyyOrderRequest.setLocInvCode(thrInvWarehouseEntity.getCode());
+ zaxzyyOrderRequest.setLocInvName(thrInvWarehouseEntity.getName());
+
+ zaxzyyOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode());
+ zaxzyyOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName());
+ } catch (Exception e) {
+ log.error("查询第三方系统仓库信息异常", e);
+ String msg = "查询第三方系统仓库信息异常";
+ orderUploadLogService.updateLocalErr(orderEntity, msg);
+ return ResultVOUtils.error(500, msg);
+ }
+
+ //设置单据出入库类型
+ if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
+ zaxzyyOrderRequest.setInoutType(1); //入库
+ } else if (basicBussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+ zaxzyyOrderRequest.setInoutType(2); //出库
+ }
+
+ //设置备注信息
+ zaxzyyOrderRequest.setRemark("udi管理系统提交单据");
+ //组装单据明细数据
+ List ioCodeEntities = codeDao.selectList(new QueryWrapper()
+ .eq("orderId", orderEntity.getBillNo())
+ .ne("action", "StockCheck")
+ );
+ List items = new ArrayList<>();
+ //查询业务单据详情
+ List detailBizEntities = orderDetailBizDao.selectList(new QueryWrapper().eq("orderIdFk", orderEntity.getBillNo()));
+ String errMsg = setOrderDetailList(ioCodeEntities, items, detailBizEntities);
+ zaxzyyOrderRequest.setItem(items);
+ if (CollUtil.isEmpty(items)) {
+ orderUploadLogService.updateLocalErr(orderEntity, errMsg);
+ return ResultVOUtils.error(500, errMsg);
+ }
+
+ if (StrUtil.isNotEmpty(errMsg)) {
+ orderUploadLogService.updateLocalErr(orderEntity, errMsg);
+ return ResultVOUtils.error(500, errMsg);
+ }
+
+
+ for (UdiwmsOrderDetailRequest i : items) {
+ String fphm = "";
+ String fprq = null;
+ List invoiceList = IoOrderInvoiceEntity.builder().build()
+ .selectList(Wrappers.lambdaQuery(IoOrderInvoiceEntity.class).eq(IoOrderInvoiceEntity::getOrderIdFk, orderEntity.getBillNo())
+ .eq(IoOrderInvoiceEntity::getBindRlFk, i.getBindRlFk())
+ .eq(StrUtil.isNotEmpty(i.getBatchNo()), IoOrderInvoiceEntity::getBatchNo, i.getBatchNo()).
+ groupBy(IoOrderInvoiceEntity::getInvoiceEncode));
+ if (CollectionUtil.isNotEmpty(invoiceList)) {
+ fphm = invoiceList.stream().map(IoOrderInvoiceEntity::getInvoiceEncode).collect(Collectors.joining(","));
+ if (invoiceList.get(0).getInvoiceDate() != null)
+ fprq = DateUtil.formatDateTime(invoiceList.get(0).getInvoiceDate());
+ }
+ i.setFirstSalesInvNo(fphm);
+ i.setSecSalesInvNo(fphm);
+ i.setInvoiceDate(fprq);
+ }
+
+
+ //构造诏安接口参数
+ ZzzyyRequest zaZyRequest = new ZzzyyRequest();
+
+ //提交到第三方系统
+ if (thrSystemBusApiEntity.getUrl().equals("saveMasterialInput")) {
+// //采购入库单据
+// if (vailHightMaterial(detailBizEntities.get(0))) {
+// zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
+// UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
+// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
+// } else {
+// zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+// }
+ Boolean b = sysParamConfigService.selectByKey("ct_split_groupbuy");
+ if (b) {
+ Map> splitMap = items.stream()
+ .collect(Collectors.groupingBy(UdiwmsOrderDetailRequest::getFirstSalesInvNo));
+ BaseResponse baseResponse = null;
+ int index = 1;
+ if (splitMap.size() > 1) {
+ for (List splitItems : splitMap.values()) {
+ zaxzyyOrderRequest.setItem(splitItems);
+ zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+ zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+ orderEntity.setBillNo(orderEntity.getBillNo() + "-" + index);
+ baseResponse = submitOrder(orderEntity, zaZyRequest);
+ }
+ return baseResponse;
+ } else {
+ zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+ zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+ return submitOrder(orderEntity, zaZyRequest);
+ }
+ } else {
+ zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+ zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+ return submitOrder(orderEntity, zaZyRequest);
+ }
+
+
+ } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) {
+
+// // 1.先提交到物资
+// zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+// zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+// submitOrder(orderEntity, zaZyRequest);
+
+
+ //2.提交到预备货
+ zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
+ UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
+ zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
+ return submitOrder(orderEntity, zaZyRequest);
+ }
+
+ return ResultVOUtils.error(500, "提交失败!");
+ }
+
+
+ /**
+ * 校验是否高值耗材
+ *
+ * @return
+ */
+ public boolean vailHightMaterial(IoOrderDetailBizEntity orderDetailBizEntity) {
+ BasicUdirelEntity basicUdirel = basicUdirelDao.selectById(orderDetailBizEntity.getBindRlFk());
+ BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new QueryWrapper().eq("uuid", basicUdirel.getUuid()).last("limit 1"));
+ if (basicProductsEntity != null &&
+ (StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("1101")
+ || StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("3601"))) {
+ return true;
+ } else
+ return false;
+
+ }
+
+
+ public String getUserName(IoOrderEntity orderEntity) {
+
+ return "黄跃祥/177";
+// String userName = null;
+// //创建人非供应商
+// if (StrUtil.isNotEmpty(orderEntity.getCheckUser())) {
+// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
+// if (authUserEntity == null)
+// userName = null;
+// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
+// } else if (StrUtil.isNotEmpty(orderEntity.getReviewUser())) {
+// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getReviewUser());
+// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
+// } else if (StrUtil.isNotEmpty(orderEntity.getCreateUser()) && orderEntity.getCreateUser().length() != 14) {
+// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCreateUser());
+// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
+// } else if (StrUtil.isNotEmpty(orderEntity.getUpdateUser()) && orderEntity.getUpdateUser().length() != 14) {
+// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getUpdateUser());
+// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
+// }
+// if (userName == null) {
+// List authWarehouseUsers = authWarehouseUserMapper.selectList(new QueryWrapper().eq("code", orderEntity.getInvCode()));
+// if (CollUtil.isNotEmpty(authWarehouseUsers)) {
+// AuthWarehouseUser authWarehouseUser = authWarehouseUsers.get(0);
+// AuthUserEntity authUserEntity = authUserDao.selectById(orderEntity.getCheckUser());
+// userName = authUserEntity.getUserName() + authUserEntity.getEmployeeName();
+// return userName;
+// }
+// }
+// return userName;
+
+ }
+
+ /**
+ * 获取库存出入库明细 (普耗出库明细)
+ *
+ * @param udiwmsInvProductsRequest
+ * @return
+ */
+ @Override
+ public BaseResponse getInvResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+ CtqyyInvRequest ptxhyyInvRequest = new CtqyyInvRequest();
+ ptxhyyInvRequest.setStartdate(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd"));
+ ptxhyyInvRequest.setEnddate(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd"));
+
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialSheet"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest));
+
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest);
+// String response = "{\"code\":20000,\"message\":\"success\",\"data\":{\"list\":[{\"applyNo\":\"74192\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"65\",\"CreditName\":\"急诊科\",\"AccoutDate\":\"2024-02-2210:36:28\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"66666666\",\"materialName\":\"一次性注射器2ml\",\"materialSpec\":\"0.6\",\"materialUnit\":\"支\",\"batchNo\":65212,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":200,\"importPrc\":0.21,\"importMoney\":42,\"factoryCode\":\"0006064349\",\"factoryName\":\"河南曙光汇知康生物科技股份有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管(吸氧管)\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":64113,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":19,\"importPrc\":1.15,\"importMoney\":21.85,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74208\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"70\",\"CreditName\":\"手术室\",\"AccoutDate\":\"2024-02-2315:29:48\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"31585\",\"materialName\":\"一次性使用鼻氧管(吸氧管)\",\"materialSpec\":\"长单鼻/条\",\"materialUnit\":\"条\",\"batchNo\":65526,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":81,\"importPrc\":1.15,\"importMoney\":93.15,\"factoryCode\":\"0006063576\",\"factoryName\":\"苏州市麦克林医疗器械制品有限公司\"},{\"applyNo\":\"74209\",\"ioFlag\":\"出库业务\",\"ioType\":\"104\",\"ioTypeName\":\"科室领用\",\"Debit\":\"50\",\"DebitName\":\"供应室仓库\",\"Credit\":\"92\",\"CreditName\":\"儿科\",\"AccoutDate\":\"2024-02-2315:31:58\",\"Accoutant\":\"徐秀娥/160\",\"receiveOper\":\"\",\"materialCode\":\"30936\",\"materialName\":\"一次性静脉输液针5(1/2)\",\"materialSpec\":\"/条\",\"materialUnit\":\"条\",\"batchNo\":64898,\"invoiceNo\":\"\",\"invoiceDate\":\"\",\"quantity\":250,\"importPrc\":0.17,\"importMoney\":42.5,\"factoryCode\":\"0006063565\",\"factoryName\":\"浙江康康\"}],\"total\":4}}";
+
+ BaseResponse> baseResponse =
+ JSONObject.parseObject(response, new TypeReference>>() {
+ });
+ if (baseResponse.getCode() == 20000) {
+ List ptxhInvResponses = baseResponse.getData().getList();
+ List thrInvResultResponses = new ArrayList<>();
+ if (CollUtil.isNotEmpty(ptxhInvResponses)) {
+ for (InvResultEntity ptxhInvResponse : ptxhInvResponses) {
+ ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse();
+ thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode());
+ thrInvResultResponse.setCpmctymc(ptxhInvResponse.getMaterialName());
+ thrInvResultResponse.setGgxh(ptxhInvResponse.getMaterialSpec());
+ thrInvResultResponse.setBatchNo(ptxhInvResponse.getBatchNo());
+ thrInvResultResponse.setMeasname(ptxhInvResponse.getMaterialUnit());
+ thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getImportPrc()));
+ thrInvResultResponse.setAmount(BigDecimal.valueOf(ptxhInvResponse.getImportMoney()));
+// thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName());
+// thrInvResultResponse.setDeptCode(ptxhInvResponse.getDebit());
+// thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName());
+// thrInvResultResponse.setInvCode(ptxhInvResponse.getCredit());
+
+ thrInvResultResponse.setDeptName(ptxhInvResponse.getDebitName());
+ thrInvResultResponse.setDeptCode("1002");
+ thrInvResultResponse.setInvName(ptxhInvResponse.getCreditName());
+ thrInvResultResponse.setInvCode("1000003");
+
+ thrInvResultResponse.setManufacturer(ptxhInvResponse.getFactoryName());
+ thrInvResultResponse.setManufactoryCode(ptxhInvResponse.getFactoryCode());
+ thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
+ thrInvResultResponse.setBillType(ptxhInvResponse.getIoType());
+ thrInvResultResponse.setType("1");
+ thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
+ thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
+ thrInvResultResponses.add(thrInvResultResponse);
+ }
+ }
+ PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();
+ pageSimpleResponse.setTotal(thrInvResultResponses.size() + 0l);
+ pageSimpleResponse.setList(thrInvResultResponses);
+ return ResultVOUtils.success(pageSimpleResponse);
+ }
+ return baseResponse;
+ }
+
+
+ /**
+ * 获取库存扫码出入库明细(高值耗材出库明细)
+ *
+ * @param udiwmsInvProductsRequest
+ * @return
+ */
+ @Override
+ public BaseResponse getInvCodeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+ CtqyyInvRequest ptxhyyInvRequest = new CtqyyInvRequest();
+ ptxhyyInvRequest.setStartdate(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd"));
+ ptxhyyInvRequest.setEnddate(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd"));
+
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getSickHighitem"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest));
+
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest);
+// String response =
+// "{\"code\": 20000,\"message\": \"success\",\"data\": {\"list\": [{\"recordNo\": 391,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106971221560052\",\"Barcode\": \"111704022117000188340055\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 390,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63374\",\"materialName\": \"调节杠\",\"materialPrc\": 2100,\"dictBarcode\": \"0106946149100093\",\"Barcode\": \"111704022117000188340007\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 408,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63182\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695502193\",\"Barcode\": \"111703012117000076800035\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 401,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695522023\",\"Barcode\": \"111612212116120902040009\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 423,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106938695525055\",\"Barcode\": \"111701062116122700670005\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 400,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111612212116120902040047\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"},{\"recordNo\": 422,\"visitNo\": \"1711088001\",\"sickName\": \"黄瑞梅\",\"inDept\": \"88\",\"deptName\": \"骨科\",\"materialCode\": \"63186\",\"materialName\": \"椎弓根螺钉\",\"materialPrc\": 4000,\"dictBarcode\": \"0106921814249918\",\"Barcode\": \"111701062116122700670013\",\"feeTime\": \"2024-03-01 19:29:02\",\"feeOper\": \"郑淑环/2032\"}],\"total\": 7}}";
+// String response = null;
+// try {
+// response = FileUtils.getFileContent("E://ghresponse.json");
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+
+ BaseResponse> baseResponse =
+ JSONObject.parseObject(response, new TypeReference>>() {
+ });
+ if (baseResponse.getCode() == 20000) {
+ Map mapArry = new HashMap<>();
+ List newArry = new ArrayList<>();
+ List ptxhInvResponses = baseResponse.getData().getList();
+ List thrInvResultResponses = new ArrayList<>();
+ if (CollUtil.isNotEmpty(ptxhInvResponses)) {
+ for (InvCodeResultEntity ptxhInvResponse : ptxhInvResponses) {
+ ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse();
+ thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode());
+ thrInvResultResponse.setCpmctymc(ptxhInvResponse.getMaterialName());
+ thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getMaterialPrc()));
+
+
+ thrInvResultResponse.setInvName(ptxhInvResponse.getDeptName());
+
+// AuthWarehouseEntity warehouseEntity = authWarehouseDao.selectOne(new LambdaQueryWrapper().eq(AuthWarehouseEntity::getThirdId, ptxhInvResponse.getInDept()));
+// if (warehouseEntity != null)
+// thrInvResultResponse.setInvCode(warehouseEntity.getCode());
+// else
+// thrInvResultResponse.setInvCode(ptxhInvResponse.getInDept());
+
+ thrInvResultResponse.setInvCode("1000003");
+ thrInvResultResponse.setDeptCode("1002");
+ thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo());
+ thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName());
+ thrInvResultResponse.setBillType("SC71090077430919");
+ thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
+ thrInvResultResponse.setType("1");
+ thrInvResultResponse.setOutCount("1");
+ thrInvResultResponse.setReCount("1");
+ IoCodeEntity codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+ if (codeEntity == null) {
+ codeEntity = codeDao.selectOne(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, ptxhInvResponse.getBarcode()).last("limit 1"));
+ }
+ if (codeEntity != null)
+ thrInvResultResponse.setUdiCode(codeEntity.getCode());
+ else
+ thrInvResultResponse.setUdiCode(ptxhInvResponse.getBarcode());
+ thrInvResultResponses.add(thrInvResultResponse);
+ }
+
+ for (ThrInvResultResponse thrInvResultResponse : thrInvResultResponses) {
+ mapArry.merge(thrInvResultResponse.getUdiCode(), thrInvResultResponse, (existingValue, newValue) -> {
+ // Assuming reCount can be directly handled as an integer to avoid String to Integer conversions
+ int updatedReCount = Integer.parseInt(existingValue.getReCount()) + Integer.parseInt(newValue.getReCount());
+ existingValue.setReCount(String.valueOf(updatedReCount));
+ existingValue.setOutCount(existingValue.getReCount());
+ return existingValue;
+ });
+ }
+ for (String key : mapArry.keySet()) {
+ newArry.add(mapArry.get(key));
+ }
+
+ }
+ PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();
+ pageSimpleResponse.setTotal(newArry.size() + 0l);
+ pageSimpleResponse.setList(newArry);
+ return ResultVOUtils.success(pageSimpleResponse);
+ }
+ return baseResponse;
+ }
+
+ @Resource
+ BasicSkProjectMapper basicSkProjectMapper;
+ @Resource
+ UdiRlSupDao udiRlSupDao;
+ @Resource
+ BasicDestinyRelMapper basicDestinyRelMapper;
+
+ @Override
+ public BaseResponse getInvFeeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+ CtqyyInvRequest ptxhyyInvRequest = new CtqyyInvRequest();
+ ptxhyyInvRequest.setStartdate(DateUtil.formatDate(udiwmsInvProductsRequest.getStartDate(), "yyyy-MM-dd"));
+ ptxhyyInvRequest.setEnddate(DateUtil.formatDate(udiwmsInvProductsRequest.getEndDate(), "yyyy-MM-dd"));
+
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("getSickPriceitem"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(ptxhyyInvRequest));
+
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_GET_INV_RESULT), ctqyyRequest);
+// String response =
+// "{\"code\": 20000,\"message\": \"success\",\"data\": {\"list\": [{\"seqNo\": \"97425947\",\"visitNo\": \"1471827014\",\"sickName\": \"杨玉聪\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 00:53:56\"},{\"seqNo\": \"97425950\",\"visitNo\": \"1471827014\",\"sickName\": \"杨玉聪\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 00:53:56\"},{\"seqNo\": \"97426036\",\"visitNo\": \"1940696001\",\"sickName\": \"郑良屹\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950057000000\",\"itemName\": \"热敏胶片 8in*10in/HQ-KX411 A型\",\"Price\": 7.8,\"quantity\": 4,\"Cost\": 31.2,\"materialCode\": \"00087\",\"materialName\": \"热敏胶片\",\"OperTime\": \"2024-02-21 01:39:39\"},{\"seqNo\": \"97426048\",\"visitNo\": \"1746585006\",\"sickName\": \"张杨妍\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 02:06:05\"},{\"seqNo\": \"97426113\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:49:46\"},{\"seqNo\": \"97426233\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 04:54:51\"},{\"seqNo\": \"97426247\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:54:55\"},{\"seqNo\": \"97426250\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950029000010\",\"itemName\": \"一次性使用输液器BI-IT带针0.7# /支)\",\"Price\": 0.81,\"quantity\": 1,\"Cost\": 0.81,\"materialCode\": \"02585\",\"materialName\": \"一次性使用输液器 带针\",\"OperTime\": \"2024-02-21 04:56:20\"},{\"seqNo\": \"97426251\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000006\",\"itemName\": \"一次性无菌注射器20ml(/支)\",\"Price\": 0.48,\"quantity\": 2,\"Cost\": 0.96,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:56:21\"},{\"seqNo\": \"97426252\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950031000025\",\"itemName\": \"一次性使用静脉留置针22GII型A(直型连接座式安全型)Y型2225601\",\"Price\": 4.82,\"quantity\": 1,\"Cost\": 4.82,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 04:56:21\"},{\"seqNo\": \"97426258\",\"visitNo\": \"1735717004\",\"sickName\": \"林文秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 04:56:24\"},{\"seqNo\": \"97426284\",\"visitNo\": \"1801137003\",\"sickName\": \"杨立群\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 05:03:40\"},{\"seqNo\": \"97426357\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950031000025\",\"itemName\": \"一次性使用静脉留置针22GII型A(直型连接座式安全型)Y型2225601\",\"Price\": 4.82,\"quantity\": 1,\"Cost\": 4.82,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426358\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000006\",\"itemName\": \"一次性无菌注射器20ml(/支)\",\"Price\": 0.48,\"quantity\": 2,\"Cost\": 0.96,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426359\",\"visitNo\": \"1940699001\",\"sickName\": \"严明祥\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950029000010\",\"itemName\": \"一次性使用输液器BI-IT带针0.7# /支)\",\"Price\": 0.81,\"quantity\": 1,\"Cost\": 0.81,\"materialCode\": \"02585\",\"materialName\": \"一次性使用输液器 带针\",\"OperTime\": \"2024-02-21 05:28:40\"},{\"seqNo\": \"97426433\",\"visitNo\": \"1940702001\",\"sickName\": \"伍邦柏\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950030000005\",\"itemName\": \"一次性注射器2ml(/支)\",\"Price\": 0.21,\"quantity\": 1,\"Cost\": 0.21,\"materialCode\": \"77375\",\"materialName\": \"一次性注射器2ml\",\"OperTime\": \"2024-02-21 06:51:25\"},{\"seqNo\": \"97426478\",\"visitNo\": \"1927463002\",\"sickName\": \"林海龙\",\"applyDept\": \"187\",\"deptName\": \"门诊呼吸与危重症医学科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:42:23\"},{\"seqNo\": \"97426486\",\"visitNo\": \"1927463002\",\"sickName\": \"林海龙\",\"applyDept\": \"187\",\"deptName\": \"门诊呼吸与危重症医学科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:42:24\"},{\"seqNo\": \"97426518\",\"visitNo\": \"1940705001\",\"sickName\": \"姚连菊\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:48:31\"},{\"seqNo\": \"97426521\",\"visitNo\": \"1940705001\",\"sickName\": \"姚连菊\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:48:31\"},{\"seqNo\": \"97426523\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:49:10\"},{\"seqNo\": \"97426529\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:49:11\"},{\"seqNo\": \"97426535\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:49:13\"},{\"seqNo\": \"97426537\",\"visitNo\": \"1940703001\",\"sickName\": \"薛连辉\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:49:15\"},{\"seqNo\": \"97426557\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:11\"},{\"seqNo\": \"97426559\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:12\"},{\"seqNo\": \"97426561\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:14\"},{\"seqNo\": \"97426567\",\"visitNo\": \"1629086067\",\"sickName\": \"杨培恭\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:15\"},{\"seqNo\": \"97426570\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426572\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426574\",\"visitNo\": \"1407999064\",\"sickName\": \"蔡美花\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:24\"},{\"seqNo\": \"97426576\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:44\"},{\"seqNo\": \"97426581\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:46\"},{\"seqNo\": \"97426583\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:50:47\"},{\"seqNo\": \"97426591\",\"visitNo\": \"1547551020\",\"sickName\": \"黄靖宇\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:50:48\"},{\"seqNo\": \"97426642\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:13\"},{\"seqNo\": \"97426649\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:16\"},{\"seqNo\": \"97426654\",\"visitNo\": \"1613276019\",\"sickName\": \"黄英连\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:18\"},{\"seqNo\": \"97426704\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426705\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426713\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426714\",\"visitNo\": \"1408701039\",\"sickName\": \"胡玮坤\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:40\"},{\"seqNo\": \"97426719\",\"visitNo\": \"1900545011\",\"sickName\": \"李光婷\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 07:56:42\"},{\"seqNo\": \"97426724\",\"visitNo\": \"1900545011\",\"sickName\": \"李光婷\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 07:56:42\"},{\"seqNo\": \"97426934\",\"visitNo\": \"1719779006\",\"sickName\": \"吴玉秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:00:20\"},{\"seqNo\": \"97427072\",\"visitNo\": \"1719779006\",\"sickName\": \"吴玉秀\",\"applyDept\": \"65\",\"deptName\": \"急诊科\",\"itemCode\": \"950046000007\",\"itemName\": \"一次性使用人体静脉血样采集容器(肝素锂 绿色 5ml/支)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68972\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:00:22\"},{\"seqNo\": \"97427377\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950027000004\",\"itemName\": \"一次性使用静脉采血针\",\"Price\": 0.19,\"quantity\": 1,\"Cost\": 0.19,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:02:37\"},{\"seqNo\": \"97427380\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:02:39\"},{\"seqNo\": \"97427383\",\"visitNo\": \"1537583008\",\"sickName\": \"刘阿花\",\"applyDept\": \"113\",\"deptName\": \"内一门诊\",\"itemCode\": \"950046000004\",\"itemName\": \"一次性使用人体静脉血样采集容器(血常规管 2ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"\",\"materialName\": \"\",\"OperTime\": \"2024-02-21 08:02:41\"},{\"seqNo\": \"97427390\",\"visitNo\": \"1398769053\",\"sickName\": \"徐丽松\",\"applyDept\": \"56\",\"deptName\": \"门诊内科\",\"itemCode\": \"950046000005\",\"itemName\": \"一次性使用人体静脉血样采集容器(生化管 5ml)\",\"Price\": 0.59,\"quantity\": 1,\"Cost\": 0.59,\"materialCode\": \"68973\",\"materialName\": \"一次性使用人体静脉血样采集容器\",\"OperTime\": \"2024-02-21 08:02:48\"}],\"total\": 12296}}";
+ BaseResponse> baseResponse =
+ JSONObject.parseObject(response, new TypeReference>>() {
+ });
+ if (baseResponse.getCode() == 20000) {
+ List ptxhInvResponses = baseResponse.getData().getList();
+ List thrInvResultResponses = new ArrayList<>();
+ Set seenNames = new HashSet<>();
+ List itemData = new ArrayList<>();
+ if (CollUtil.isNotEmpty(ptxhInvResponses)) {
+ for (InvProjectResultEntity ptxhInvResponse : ptxhInvResponses) {
+ ThrInvResultResponse thrInvResultResponse = new ThrInvResultResponse();
+ thrInvResultResponse.setThrCode(ptxhInvResponse.getMaterialCode());
+ thrInvResultResponse.setCpmctymc(ptxhInvResponse.getItemName());
+ thrInvResultResponse.setSickerCode(ptxhInvResponse.getVisitNo());
+ thrInvResultResponse.setSickerName(ptxhInvResponse.getSickName());
+ thrInvResultResponse.setPrice(BigDecimal.valueOf(ptxhInvResponse.getPrice()));
+ thrInvResultResponse.setAmount(BigDecimal.valueOf(ptxhInvResponse.getCost()));
+ thrInvResultResponse.setDeptName(ptxhInvResponse.getDeptName());
+ thrInvResultResponse.setDeptCode("1002");
+ thrInvResultResponse.setInvName(ptxhInvResponse.getDeptName());
+ thrInvResultResponse.setInvCode("1000003");
+ thrInvResultResponse.setThrCode(ptxhInvResponse.getItemCode());
+ thrInvResultResponse.setMainAction(ConstantType.TYPE_OUT);
+ thrInvResultResponse.setType("1");
+ thrInvResultResponse.setOutCount(ptxhInvResponse.getQuantity() + "");
+ thrInvResultResponse.setReCount(ptxhInvResponse.getQuantity() + "");
+ thrInvResultResponses.add(thrInvResultResponse);
+ if (seenNames.add(ptxhInvResponse.getItemCode())) {
+ itemData.add(ptxhInvResponse);
+ }
+ }
+ }
+ for (InvProjectResultEntity invProjectResultEntity : itemData) {
+ if (!basicSkProjectMapper.exists(new QueryWrapper().eq("code", invProjectResultEntity.getItemCode()))) {
+ BasicSkProjectEntity basicSkProjectEntity = new BasicSkProjectEntity();
+ basicSkProjectEntity.setCode(invProjectResultEntity.getItemCode());
+ basicSkProjectEntity.setName(invProjectResultEntity.getItemName());
+ basicSkProjectEntity.setType(2);
+ basicSkProjectEntity.setCreateTime(new Date());
+ basicSkProjectEntity.setUpdateTime(new Date());
+ basicSkProjectEntity.setRemark("出入库明细自动生成");
+ basicSkProjectEntity.setId(IdUtil.getSnowflakeNextId());
+ basicSkProjectMapper.insert(basicSkProjectEntity);
+ List thrProductsEntitys = thrProductsDao.selectList(new QueryWrapper().eq("prcitmcode", invProjectResultEntity.getItemCode()));
+ if (CollUtil.isNotEmpty(thrProductsEntitys)) {
+ for (ThrProductsEntity thrProductsEntity : thrProductsEntitys) {
+ CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
+ companyProductRelevanceRequest.setThirdId(thrProductsEntity.getCode());
+ List udiRlSupResponses = udiRlSupDao.filterUdiGp(companyProductRelevanceRequest);
+ if (CollUtil.isNotEmpty(udiRlSupResponses)) {
+ UdiRlSupResponse udiRlSupResponse = udiRlSupResponses.get(0);
+ BasicSkProjectDetailEntity basicSkProjectDetailEntity = new BasicSkProjectDetailEntity();
+ basicSkProjectDetailEntity.setId(IdUtil.getSnowflakeNextId());
+ basicSkProjectDetailEntity.setRelId(udiRlSupResponse.getRlId());
+ basicSkProjectDetailEntity.setSupId(udiRlSupResponse.getCustomerId());
+ basicSkProjectDetailEntity.setPId(basicSkProjectEntity.getId());
+ basicSkProjectDetailEntity.setThrCode(thrProductsEntity.getCode());
+ basicSkProjectDetailEntity.setThrName(thrProductsEntity.getName());
+ basicSkProjectDetailEntity.setCreateTime(DateUtil.formatDateTime(new Date()));
+ basicSkProjectDetailEntity.setCreateUser("1");
+ basicSkProjectDetailEntity.setUpdateTime(DateUtil.formatDateTime(new Date()));
+ basicSkProjectDetailEntity.setUpdateUser("1");
+ basicSkProjectDetailEntity.setRemark("出入库明细自动生成");
+ basicSkProjectDetailEntity.setCount(1);
+ basicDestinyRelMapper.insert(basicSkProjectDetailEntity);
+ }
+ }
+ }
+
+ }
+ }
+
+ PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>();
+ pageSimpleResponse.setTotal(thrInvResultResponses.size() + 0l);
+ pageSimpleResponse.setList(thrInvResultResponses);
+ return ResultVOUtils.success(pageSimpleResponse);
+ }
+ return baseResponse;
+ }
+
+ @Override
+ public BaseResponse getInvProducts(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse getWarehouse(UdiwmsWarehouseRequest udiwmsWarehouseRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse testConnect() {
+ UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest();
+ udiwmsUnitRequest.setPage(1);
+ udiwmsUnitRequest.setLimit(1);
+ BaseResponse baseResponse = getUnit(udiwmsUnitRequest);
+ if (baseResponse.getCode() == 20000) {
+ return ResultVOUtils.success("连接成功!");
+ }
+ return ResultVOUtils.error(500, "连接失败!");
+ }
+
+ @Override
+ public BaseResponse queryUdiInvProducts(UdiwmsQueryUdiInvProductsRequest queryUdiInvProductsRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse submitProducts(UdiwmsAddProductsRequest udiwmsAddProductsRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse submitUnit(UdiwmsAddUnitRequest udiwmsAddUnitRequest) {
+
+
+ CtqyyRequest ctqyyRequest = new CtqyyRequest();
+ ctqyyRequest.setMsgHeader(getMsgHeader("addSupplierDict"));
+ ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsAddUnitRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest);
+ response = parserResult(response);
+ try {
+ log.error("提交往来单位/生产厂家:" + ctqyyRequest.getMsgBody());
+ CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class);
+ if (baseResponse.getCode() != 20000) {
+ String errMsg = "提交往来单位/生产厂家,异常:{}" + response;
+ log.error(errMsg);
+ return ResultVOUtils.error(500, "提交往来单位/生产厂家失败!");
+ } else {
+ BasicCorpEntity basicCorpEntity = new BasicCorpEntity();
+ basicCorpEntity.setErpId(CustomUtil.getUnitId());
+ basicCorpEntity.setName(udiwmsAddUnitRequest.getSupplierName());
+ basicCorpEntity.setCorpType(2);
+ basicCorpEntity.setThirdId(baseResponse.getSupplierCode());
+ basicCorpDao.insert(basicCorpEntity);
+ log.error("提交往来单位/生产厂家,成功:{}", response);
+ return ResultVOUtils.success(baseResponse.getMaterialNo());
+ }
+ } catch (Exception e) {
+ String errMsg = "提交往来单位/生产厂家,异常:{}" + response;
+ log.error(errMsg);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, errMsg);
+
+ }
+ }
+
+ @Override
+ public BaseResponse postProducts(PostThrProductsRequest postThrProductsRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse postCorps(PostThrCorpRequest postThrCorpRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse postOrderDetail(PostFileThrOrderRequest postFileThrOrderRequest) {
+ return null;
+ }
+
+ @Override
+ public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest) {
+ return null;
+ }
+
+
+ /**
+ * 封装单据详情参数
+ *
+ * @param ioCodeEntities 单据码明细
+ * @param orderDetailRequests 单据详情参数
+ * @param detailBizEntities 单据业务详情
+ */
+ private String setOrderDetailList(List ioCodeEntities, List orderDetailRequests, List detailBizEntities) {
+ String errMsg = "";
+ for (IoOrderDetailBizEntity detailBizEntity : detailBizEntities) {
+
+ IoOrderDetailCodeEntity orderDetailCodeEntity = orderDetailCodeDao
+ .selectOne(new QueryWrapper()
+ .eq("orderIdFk", detailBizEntity.getOrderIdFk())
+ .eq("bindRlFk", detailBizEntity.getBindRlFk())
+ .eq(StrUtil.isNotEmpty(detailBizEntity.getBatchNo()), "batchNo", detailBizEntity.getBatchNo())
+ .isNull(StrUtil.isEmpty(detailBizEntity.getBatchNo()), "batchNo").last("LIMIT 1"));
+ if (orderDetailCodeEntity != null && IntUtil.value(orderDetailCodeEntity.getReCount()) > 0) {
+ detailBizEntity.setCount(orderDetailCodeEntity.getReCount());
+ UdiwmsOrderDetailRequest item = buildProductInfo(detailBizEntity);
+ if (item != null) {
+ //封装条码信息
+ submitOrderUtil.setCodeList(ioCodeEntities, detailBizEntity, item);
+ orderDetailRequests.add(item);
+ } else {
+ errMsg = detailBizEntity.getCoName() + "," + "第三方产品编码未关联";
+ }
+ }
+ }
+ return errMsg;
+ }
+
+
+ @Resource
+ private ThrProductsDao thrProductsDao;
+
+ public UdiwmsOrderDetailRequest buildProductInfo(IoOrderDetailBizEntity detailBizEntity) {
+ //查询产品信息
+ BasicUdirelEntity basicUdirel = basicUdirelDao.selectById(detailBizEntity.getBindRlFk());
+ BasicProductsEntity basicProducts = basicProductsDao.selectOne(new LambdaQueryWrapper().eq(BasicProductsEntity::getUuid, basicUdirel.getUuid()).last("limit 1"));
+
+ UdiwmsOrderDetailRequest item = new UdiwmsOrderDetailRequest();
+ BeanUtil.copyProperties(detailBizEntity, item);
+
+ item.setProductDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getProductDate()) ? null : "20" + detailBizEntity.getProductDate()));
+ item.setExpireDate(DateUtil.formatExpireTime(StrUtil.isBlank(detailBizEntity.getExpireDate()) ? null : "20" + detailBizEntity.getExpireDate()));
+
+ String thirdProductId = (String) ReflectUtil.getFieldValue(basicUdirel, thirdSysConfig.getThirdId());
+ item.setProductId(thirdProductId); //产品ID
+ //查询第三方产品名称
+ ThrProductsEntity thrProductsEntity = thrProductsDao.selectOne(new LambdaQueryWrapper()
+ .eq(ThrProductsEntity::getCode, thirdProductId).last("limit 1"));
+ if (thrProductsEntity == null) {
+ log.error("第三方产品编码未关联");
+ return null;
+ }
+ item.setProductName(thrProductsEntity.getName()); //产品名称
+ item.setBindRlFk(detailBizEntity.getBindRlFk());
+ item.setStandard(detailBizEntity.getSpec()); //规格型号
+ item.setBillNo(detailBizEntity.getOrderIdFk()); //单据号
+ item.setRegisterNo(detailBizEntity.getCertCode()); //注册/备案证号
+ item.setManufactory(basicProducts.getManufactory()); //生产厂家
+ item.setMeasname(thrProductsEntity.getMeasname()); //计量单位
+ item.setAllowNoBatch(IntUtil.value(basicProducts.getAllowNoBatch())); //是否允许无批次号
+ if (StrUtil.isNotEmpty(item.getManufactory())) {
+ ThrCorpEntity thrCorpEntity = thrCorpService.getThrCorpByName(item.getManufactory());
+ if (thrCorpEntity != null)
+ item.setManufactoryCode(thrCorpEntity.getUnitId());
+ }
+ item.setSupCode(thrProductsEntity.getSupCode());
+ item.setCplb(thrProductsEntity.getFlbm());
+ item.setHslb(thrProductsEntity.getCplb());
+ item.setCount(detailBizEntity.getCount());
+ return item;
+ }
+
+
+ /**
+ * 处理提交单据,记录日志,解析结果逻辑
+ *
+ * @param orderEntity
+ * @param zaZyRequest
+ * @return
+ */
+ private BaseResponse submitOrder(IoOrderEntity orderEntity, ZzzyyRequest zaZyRequest) {
+ //记录日志
+ IoOrderUploadLogEntity uploadLog = new IoOrderUploadLogEntity();
+ uploadLog.setBillDate(orderEntity.getCreateTime());
+ uploadLog.setBillType(orderEntity.getAction());
+ uploadLog.setSubmitTime(new Date());
+ uploadLog.setBillNo(orderEntity.getBillNo());
+ uploadLog.setFromType(Constants.THIRD_ORDER_UPLOAD);
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_ORDER_SUBMIT_URL), zaZyRequest);
+ response = parserResult(response);
+ if (StrUtil.isNotBlank(response)) {
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ if (baseResponse.getCode() == 20000) {
+ String thirdBillNo = String.valueOf(baseResponse.getData());
+ orderEntity.setThirdBillNo(thirdBillNo);
+ orderEntity.setExportStatus(1); //提交成功
+ uploadLog.setStatus(2);
+ uploadLog.setThrBillNo(thirdBillNo);
+ uploadLog.setResult("提交成功");
+ orderDao.updateById(orderEntity);
+ orderUploadLogDao.insert(uploadLog);
+ return ResultVOUtils.success("提交成功");
+ }
+ uploadLog.setStatus(3);
+ uploadLog.setResult("提交失败,错误信息:" + baseResponse.getMessage());
+ orderEntity.setExportStatus(2); //上传失败
+ orderDao.updateById(orderEntity);
+ orderUploadLogDao.insert(uploadLog);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析提交到智业单据返回结果异常,结果信息:{}", response);
+ log.error("异常信息:{}", e);
+ uploadLog.setStatus(3);
+ uploadLog.setResult("提交失败,错误信息:" + response);
+ orderEntity.setExportStatus(2); //上传失败
+ orderDao.updateById(orderEntity);
+ orderUploadLogDao.insert(uploadLog);
+ return ResultVOUtils.error(500, "提交失败");
+ }
+ } else {
+ uploadLog.setStatus(3);
+ uploadLog.setResult("提交失败,调用接口返回为空");
+ orderEntity.setExportStatus(2); //上传失败
+ orderDao.updateById(orderEntity);
+ orderUploadLogDao.insert(uploadLog);
+ return ResultVOUtils.error(500, "提交失败");
+ }
+ }
+
+
+ @Override
+ public BaseResponse submitPreInOrders(UdiwmsPreInOrderRequest udiwmsPreInOrderRequest) {
+ ZzzyyRequest zaZyRequest = new ZzzyyRequest();
+ zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
+ zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
+ String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRE_IN_ORDER_SUBMIT_URL), zaZyRequest);
+ response = parserResult(response);
+ try {
+ BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+ return baseResponse;
+ } catch (Exception e) {
+ log.error("解析云霄妇幼医院智业接口提交单据返回数据异常,返回结果:{}", response);
+ log.error("异常信息:{}", e);
+ return ResultVOUtils.error(500, "网络错误,或远程服务器异常无法返回正确结果(" + response + ")");
+ }
+ }
+
+
+ /**
+ * 转换提交单据参数
+ *
+ * @param udiwmsOrderRequest
+ * @param orderEntity
+ * @return
+ */
+ public UdiwmsPreInOrderRequest submitPreInOrderToThirdSys(ZaxzyyOrderRequest udiwmsOrderRequest, IoOrderEntity orderEntity) {
+ UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = new UdiwmsPreInOrderRequest();
+ if (udiwmsOrderRequest != null) {
+ BeanUtils.copyProperties(udiwmsOrderRequest, udiwmsPreInOrderRequest);
+ udiwmsPreInOrderRequest.setLocInvCode(udiwmsOrderRequest.getLocStorageCode());
+ udiwmsPreInOrderRequest.setLocInvName(udiwmsOrderRequest.getLocStorageName());
+ String deptCode = "70";
+ if (StrUtil.isNotEmpty(orderEntity.getOriginUllageSupNo())) {
+ IoOrderEntity temp = orderDao.selectOne(new QueryWrapper().eq("billNo", orderEntity.getOriginUllageSupNo()).last("limit 1"));
+ if (temp != null && StrUtil.isNotEmpty(temp.getFromInvCode())) {
+ AuthWarehouseEntity authWarehouseEntity =
+ authWarehouseDao.selectOne(new QueryWrapper().eq("code", temp.getFromInvCode()).last("limit 1"));
+ deptCode = authWarehouseEntity.getThirdId();
+ }
+ }
+ udiwmsPreInOrderRequest.setDeptCode(deptCode);
+ if (orderEntity.getReviewUser() != null) {
+ AuthUserEntity authUser = authUserDao.selectById(orderEntity.getReviewUser());
+ udiwmsPreInOrderRequest.setActor(authUser.getEmployeeName());
+ } else if (orderEntity.getCreateUser() != null) {
+ AuthUserEntity authUser = authUserDao.selectById(orderEntity.getCreateUser());
+ udiwmsPreInOrderRequest.setActor(authUser.getEmployeeName());
+ }
+ List itemDTOS = new ArrayList<>();
+ if (CollUtil.isNotEmpty(udiwmsOrderRequest.getItem())) {
+ for (UdiwmsOrderDetailRequest udiwmsOrderDetail : udiwmsOrderRequest.getItem()) {
+ if (CollUtil.isNotEmpty(udiwmsOrderDetail.getCodeList())) {
+ for (UdiwmsOrderDetailRequest.CodeDetailEntity codeDetaiEntity : udiwmsOrderDetail.getCodeList()) {
+ UdiwmsPreInOrderRequest.ItemDTO itemDTO = new UdiwmsPreInOrderRequest.ItemDTO();
+ BeanUtils.copyProperties(udiwmsOrderDetail, itemDTO);
+ if (StrUtil.isNotEmpty(itemDTO.getManufactory())) {
+ ThrCorpEntity thrCorpEntity = thrCorpService.getThrCorpByName(itemDTO.getManufactory());
+ if (thrCorpEntity != null)
+ itemDTO.setManufactoryCode(thrCorpEntity.getUnitId());
+ }
+ String code = codeDetaiEntity.getCode();
+ if (code.contains("\u001D")) {
+// code = code.replace("\u001D", "zysoft"); 智业无法识别GS1符号
+ code = code.replace("\u001D", "");
+ }
+ itemDTO.setCode(code);
+ itemDTO.setNameCode(codeDetaiEntity.getNameCode());
+
+ if (IntUtil.value(codeDetaiEntity.getCount()) > 1) {
+ for (int i = 0; i < codeDetaiEntity.getCount(); i++) {
+ itemDTO.setCount(1);
+ itemDTOS.add(itemDTO);
+ }
+ } else {
+ itemDTO.setCount(codeDetaiEntity.getCount());
+ itemDTOS.add(itemDTO);
+ }
+
+
+ }
+ }
+ }
+ }
+ udiwmsPreInOrderRequest.setItems(itemDTOS);
+ }
+ return udiwmsPreInOrderRequest;
+ }
+}
diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvCodeResultEntity.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvCodeResultEntity.java
new file mode 100644
index 0000000..9dcd0b5
--- /dev/null
+++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvCodeResultEntity.java
@@ -0,0 +1,41 @@
+package com.glxp.mipsdl.client.yxfuyy.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 高值耗材出入库明细
+ */
+@NoArgsConstructor
+@Data
+public class InvCodeResultEntity {
+
+
+ @JsonProperty("recordNo")
+ private Integer recordNo;
+ @JsonProperty("visitNo")
+ private String visitNo;
+ @JsonProperty("sickName")
+ private String sickName;
+ @JsonProperty("inDept")
+ private String inDept;
+ @JsonProperty("deptName")
+ private String deptName;
+ @JsonProperty("materialCode")
+ private String materialCode;
+ @JsonProperty("materialName")
+ private String materialName;
+ @JsonProperty("materialPrc")
+ private Integer materialPrc;
+ @JsonProperty("dictBarcode")
+ private String dictBarcode;
+ @JsonProperty("Barcode")
+ private String barcode;
+ @JsonProperty("feeTime")
+ private String feeTime;
+ @JsonProperty("feeOper")
+ private String feeOper;
+}
+
+
diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvProjectResultEntity.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvProjectResultEntity.java
new file mode 100644
index 0000000..8dea922
--- /dev/null
+++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvProjectResultEntity.java
@@ -0,0 +1,41 @@
+package com.glxp.mipsdl.client.yxfuyy.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 收费项目出入库明细
+ */
+@NoArgsConstructor
+@Data
+public class InvProjectResultEntity {
+
+
+ @JsonProperty("seqNo")
+ private String seqNo;
+ @JsonProperty("visitNo")
+ private String visitNo;
+ @JsonProperty("sickName")
+ private String sickName;
+ @JsonProperty("applyDept")
+ private String applyDept;
+ @JsonProperty("deptName")
+ private String deptName;
+ @JsonProperty("itemCode")
+ private String itemCode;
+ @JsonProperty("itemName")
+ private String itemName;
+ @JsonProperty("Price")
+ private Double price;
+ @JsonProperty("quantity")
+ private Integer quantity;
+ @JsonProperty("Cost")
+ private Double cost;
+ @JsonProperty("materialCode")
+ private String materialCode;
+ @JsonProperty("materialName")
+ private String materialName;
+ @JsonProperty("OperTime")
+ private String operTime;
+}
diff --git a/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvResultEntity.java b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvResultEntity.java
new file mode 100644
index 0000000..5767740
--- /dev/null
+++ b/src/main/java/com/glxp/mipsdl/client/yxfuyy/entity/InvResultEntity.java
@@ -0,0 +1,60 @@
+package com.glxp.mipsdl.client.yxfuyy.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 库存出入库明细
+ */
+@NoArgsConstructor
+@Data
+public class InvResultEntity {
+
+ @JsonProperty("applyNo")
+ private String applyNo;
+ @JsonProperty("ioFlag")
+ private String ioFlag;
+ @JsonProperty("ioType")
+ private String ioType;
+ @JsonProperty("ioTypeName")
+ private String ioTypeName;
+ @JsonProperty("Debit")
+ private String debit;
+ @JsonProperty("DebitName")
+ private String debitName;
+ @JsonProperty("Credit")
+ private String credit;
+ @JsonProperty("CreditName")
+ private String creditName;
+ @JsonProperty("AccoutDate")
+ private String accoutDate;
+ @JsonProperty("Accoutant")
+ private String accoutant;
+ @JsonProperty("receiveOper")
+ private String receiveOper;
+ @JsonProperty("materialCode")
+ private String materialCode;
+ @JsonProperty("materialName")
+ private String materialName;
+ @JsonProperty("materialSpec")
+ private String materialSpec;
+ @JsonProperty("materialUnit")
+ private String materialUnit;
+ @JsonProperty("batchNo")
+ private String batchNo;
+ @JsonProperty("invoiceNo")
+ private String invoiceNo;
+ @JsonProperty("invoiceDate")
+ private String invoiceDate;
+ @JsonProperty("quantity")
+ private Integer quantity;
+ @JsonProperty("importPrc")
+ private Double importPrc;
+ @JsonProperty("importMoney")
+ private Integer importMoney;
+ @JsonProperty("factoryCode")
+ private String factoryCode;
+ @JsonProperty("factoryName")
+ private String factoryName;
+}
diff --git a/src/main/resources/hosp_dict.json b/src/main/resources/hosp_dict.json
index 73bad25..5e13c8f 100644
--- a/src/main/resources/hosp_dict.json
+++ b/src/main/resources/hosp_dict.json
@@ -50,5 +50,9 @@
{
"code": "100012",
"name": "南靖县医院"
+ },
+ {
+ "code": "100013",
+ "name": "云霄妇幼医院"
}
]