From 736a7be6e65da86dccaf9506c9f0bf15ae9071ea Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 3 Feb 2023 16:35:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=B8=9C=E5=B1=B1=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=92=8C=E4=BA=91=E9=9C=84=E4=B8=AD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=202.=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mipsdl/admin/client/http/DsxyyClient.java | 455 ++++++++++++++++++ .../mipsdl/admin/client/http/PhxyyClient.java | 12 +- .../mipsdl/admin/client/http/TestClient.java | 6 +- .../mipsdl/admin/client/http/YxzyyClient.java | 451 +++++++++++++++++ .../mipsdl/admin/client/http/ZaxyyClient.java | 6 +- .../admin/controller/UdiWmsController.java | 60 ++- .../dao/basic/BasicThirdSysBusApiDao.java | 2 +- .../BasicThirdSysDetailDao.java | 4 +- .../BussinessOriginTypeDao.java | 6 +- .../mipsdl/admin/dao/test/TestBusTypeDao.java | 2 +- .../BasicThirdSysDetailEntity.java | 2 +- .../BussinessOriginTypeFilterRequest.java | 2 +- .../FilterBusTypeRequest.java | 2 +- .../admin/req/dsxyy/DsBusTypeRequest.java | 14 + .../admin/req/dsxyy/DsOrderRequest.java | 28 ++ .../admin/req/dsxyy/DsProductRequest.java | 33 ++ .../mipsdl/admin/req/dsxyy/DsUnitRequest.java | 20 + .../admin/req/dsxyy/DsWarehouseRequest.java | 15 + .../admin/req/yxzyy/YxBusTypeRequest.java | 14 + .../admin/req/yxzyy/YxOrderRequest.java | 28 ++ .../admin/req/yxzyy/YxProductRequest.java | 33 ++ .../mipsdl/admin/req/yxzyy/YxUnitRequest.java | 20 + .../admin/req/yxzyy/YxWarehouseRequest.java | 15 + .../BussinessOriginTypeResponse.java | 2 +- .../StockOrderUploadLogService.java | 2 +- .../BasicThirdSysBusApiService.java | 4 +- .../BussinessOriginTypeService.java | 6 +- .../impl/BasicThirdSysBusApiServiceImpl.java | 6 +- .../impl/BussinessOriginTypeServiceImpl.java | 10 +- .../main/resources/application-pro.properties | 2 +- .../mapper/phxyy/BasicThirdSysBusApiDao.xml | 2 +- .../mapper/phxyy/BasicThirdSysDetailDao.xml | 6 +- .../mapper/phxyy/BussinessOriginTypeDao.xml | 6 +- .../mybatis/mapper/test/TestBusTypeDao.xml | 2 +- 34 files changed, 1227 insertions(+), 51 deletions(-) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java rename api-sync/src/main/java/com/glxp/mipsdl/admin/dao/{phxyy => basic}/BasicThirdSysDetailDao.java (79%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/dao/{phxyy => basic}/BussinessOriginTypeDao.java (60%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/entity/{phxyy => basic}/BasicThirdSysDetailEntity.java (91%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/req/{phxyy => basic}/BussinessOriginTypeFilterRequest.java (91%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/req/{phxyy => basic}/FilterBusTypeRequest.java (86%) create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsBusTypeRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsOrderRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsProductRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsUnitRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsWarehouseRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxBusTypeRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxProductRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxUnitRequest.java create mode 100644 api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxWarehouseRequest.java rename api-sync/src/main/java/com/glxp/mipsdl/admin/res/{phxyy => basic}/BussinessOriginTypeResponse.java (91%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/service/{phxyy => }/StockOrderUploadLogService.java (94%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/service/{phxyy => basic}/BasicThirdSysBusApiService.java (82%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/service/{phxyy => basic}/BussinessOriginTypeService.java (62%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/service/{phxyy => basic}/impl/BasicThirdSysBusApiServiceImpl.java (90%) rename api-sync/src/main/java/com/glxp/mipsdl/admin/service/{phxyy => basic}/impl/BussinessOriginTypeServiceImpl.java (81%) diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java new file mode 100644 index 0000000..66f6ec4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/DsxyyClient.java @@ -0,0 +1,455 @@ +package com.glxp.mipsdl.admin.client.http; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.mipsdl.admin.config.ThirdSysConfig; +import com.glxp.mipsdl.admin.constant.ConstantStatus; +import com.glxp.mipsdl.admin.constant.ConstantType; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; +import com.glxp.mipsdl.admin.dao.basic.BussinessLocalTypeDao; +import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao; +import com.glxp.mipsdl.admin.dao.basic.UdiRelevanceDao; +import com.glxp.mipsdl.admin.dao.business.StockOrderDao; +import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; +import com.glxp.mipsdl.admin.dao.inout.CodesDao; +import com.glxp.mipsdl.admin.dao.inout.OrderDao; +import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDetailDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; +import com.glxp.mipsdl.admin.entity.inout.OrderEntity; +import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; +import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest; +import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail; +import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest; +import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.mipsdl.admin.req.dsxyy.*; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; +import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; +import com.glxp.mipsdl.admin.util.DateUtil; +import com.glxp.mipsdl.admin.util.HttpClient; +import com.glxp.mipsdl.admin.util.SubmitOrderUtils; +import com.glxp.mipsdl.common.res.BaseResponse; +import com.glxp.mipsdl.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 东山县医院接口对接 + */ +@Slf4j +@Service +public class DsxyyClient { + + @Resource + private ThirdSysConfig thirdSysConfig; + @Resource + private HttpClient httpClient; + + @Resource + private StockOrderDao stockOrderDao; + @Resource + private StockOrderDetailDao stockOrderDetailDao; + @Resource + private BussinessLocalTypeDao bussinessLocalTypeDao; + @Resource + private BasicThirdSysBusApiDao thirdSysBusApiDao; + @Resource + private InvWarehouseDao invWarehouseDao; + @Resource + private ThrInvWarehouseDao thrInvWarehouseDao; + @Resource + private BussinessTypeDao bussinessTypeDao; + @Resource + private BasicThirdSysDetailDao basicThirdSysDetailDao; + @Resource + private UdiRelevanceDao udiRelevanceDao; + @Resource + private OrderDao orderDao; + + @Resource + private BasicThirdSysBusApiService basicThirdSysBusApiService; + @Resource + private BussinessOriginTypeService bussinessOriginTypeService; + @Resource + private SubmitOrderUtils submitOrderUtils; + @Resource + private CodesDao codesDao; + @Resource + private StockOrderUploadLogService stockOrderUploadLogService; + + public String[] getHeaderArray() { + List headArray = new ArrayList<>(6); + headArray.add("Content-Type"); + headArray.add("application/json"); + if (StrUtil.isNotEmpty(thirdSysConfig.getThirdSysConfig().getApikey())) { + headArray.add("api_key"); + headArray.add(thirdSysConfig.getThirdSysConfig().getApikey()); + } + if (StrUtil.isNotEmpty(thirdSysConfig.getThirdSysConfig().getSecretkey())) { + headArray.add("secret_key"); + headArray.add(thirdSysConfig.getThirdSysConfig().getSecretkey()); + } + String[] strArray = new String[headArray.size()]; + headArray.toArray(strArray); + return strArray; + } + + public BaseResponse testConnect() { + DsUnitRequest dsUnitRequest = new DsUnitRequest(); + dsUnitRequest.setPage(1); + dsUnitRequest.setLimit(1); + BaseResponse baseResponse = getUnit(dsUnitRequest); + if (baseResponse.getCode() == 20000) { + return ResultVOUtils.success("连接成功！"); + } else { + return ResultVOUtils.error(500, "连接失败"); + } + } + + public BaseResponse getUnit(DsUnitRequest dsUnitRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("corpUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), dsUnitRequest, getHeaderArray()); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getProducts(DsProductRequest udiwmsProductRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("piQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsProductRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getOrderTypes(DsBusTypeRequest udiwmsBusTypeRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("busTypeQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsBusTypeRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getOrders(UdiwmsOrderRequest udiwmsOrderRequest) { + if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { + return ResultVOUtils.error(500, "单据类型不能未空"); + } + if (StrUtil.isEmpty(udiwmsOrderRequest.getThirdSys())) { + return ResultVOUtils.error(500, "第三方系统ID不能为空"); + } + BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), thirdSysConfig.getThirdSysConfig().getThirdId()); + udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction()); + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse submitOrders(DsOrderRequest udiwmsOrderRequest) { + + if (StrUtil.isEmpty(udiwmsOrderRequest.getId())) { + return ResultVOUtils.error(500, "单据ID不能为空！"); + } + //查询单据和详情信息，组装第三方系统接口参数所需数据 + StockOrderEntity stockOrderEntity = stockOrderDao.findById(udiwmsOrderRequest.getId()); + OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk()); + List stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId()); + udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate()); + udiwmsOrderRequest.setBillNo(stockOrderEntity.getBillNo()); + + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessLocalTypeFilterRequest.setAction(stockOrderEntity.getBillType()); + List bussinessLocalTypeEntities = bussinessLocalTypeDao.filterJoin(bussinessLocalTypeFilterRequest); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeEntities.get(0); + + //查询第三方系统的单据ID，及第三方系统标识 + BasicThirdSysBusApiEntity thirdSysBusApiEntity = thirdSysBusApiDao.selectByCode(stockOrderEntity.getBillType()); + if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) { + return ResultVOUtils.error(500, "接口未配置，无法提交！"); + } + String thirdId = getThirdId(thirdSysBusApiEntity); +// udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode()); + udiwmsOrderRequest.setBillType(submitOrderUtils.toBusType(stockOrderEntity.getBillType())); + if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { + udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(stockOrderEntity.getCorpName()); //往来单位名称，需转换为第三方系统的名称 + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) { + List invWarehouseEntities = invWarehouseDao.selectByCode(stockOrderEntity.getCorpId()); + InvWarehouseEntity invWarehouseEntity = invWarehouseEntities.get(0); + try { + //根据第三方系统标识，获取对应字段的值 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setCode(invWarehouseEntity.getThirdId()); + filterThrInvWarehouseRequest.setThirdSysFk(thirdId); + List thrInvWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest); + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseEntities.get(0); + udiwmsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } catch (Exception e) { + log.error("查询单据对应的第三方往来单位信息异常", e); + } + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + ThrCorpEntity thrCorpEntity = submitOrderUtils.toCorp(stockOrderEntity.getCorpId(), thirdId); + if (thrCorpEntity == null) + return ResultVOUtils.error(500, "上传失败，往来单位未关联对应第三方产品编码！"); + udiwmsOrderRequest.setCorpId(thrCorpEntity.getUnitId()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } + + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getInvStorageCode()); + try { + if (StrUtil.isNotEmpty(invWarehouseEntity.getThirdId())) { + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); + udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); + udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + } else { + return ResultVOUtils.error(500, "未绑定第三方仓库！"); + } + + } catch (Exception e) { + log.error("查询第三方系统仓库异常", e); + } + + if (StrUtil.nullToEmpty(thirdSysBusApiEntity.getUrl()).equals("useOut")) { + udiwmsOrderRequest.setCorpId(udiwmsOrderRequest.getLocStorageCode()); + udiwmsOrderRequest.setCorpName(udiwmsOrderRequest.getLocStorageName()); + ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId); + udiwmsOrderRequest.setLocStorageCode("29"); + udiwmsOrderRequest.setLocStorageName(deviceInv.getName()); + } + + + udiwmsOrderRequest.setBillFlag("1"); + //查询单据出入库类型 + String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType()); + if (ConstantType.TYPE_PUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(1); //出入库类型：入库 + } else if (ConstantType.TYPE_OUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(2); //出入库类型：出库 + } + +// //出库单转入库单 +// if (StrUtil.nullToEmpty(thirdSysBusApiEntity.getUrl()).equals("useOut")) { +// //使用部门 +// udiwmsOrderRequest.setUseDeptCode(udiwmsOrderRequest.getLocStorageCode()); +// udiwmsOrderRequest.setUseDeptName(udiwmsOrderRequest.getLocStorageName()); +// +// +// ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId); +// udiwmsOrderRequest.setLocStorageCode("29"); +// udiwmsOrderRequest.setLocStorageName(deviceInv.getName()); +// +// +// udiwmsOrderRequest.setInoutType(1); //出入库类型：入库 +// +// List warehouseEntities = codesDao.findByReceiptId(stockOrderEntity.getOrderIdFk()); +// if (CollUtil.isNotEmpty(warehouseEntities)) { +// UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(warehouseEntities.get(0).getSupId()); +// udiwmsOrderRequest.setCorpId(unitMaintainEntity.getThirdId()); +// udiwmsOrderRequest.setCorpName(unitMaintainEntity.getThirdName()); +// } +//// udiwmsOrderRequest.setCorpId(udiwmsOrderRequest.getLocStorageCode()); +//// udiwmsOrderRequest.setCorpName(udiwmsOrderRequest.getLocStorageName()); +// +// +// } + + + udiwmsOrderRequest.setRemark("udi管理系统提交单据"); //备注 + + //组装明细数据 + List items = new ArrayList<>(stockOrderDetailEntities.size()); + StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity(); + uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate())); + uploadLog.setBillType(stockOrderEntity.getBillType()); + uploadLog.setSubmitTime(new Date()); + uploadLog.setBillNo(udiwmsOrderRequest.getBillNo()); + uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD); + + if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) { + stockOrderDetailEntities = transferSerList(stockOrderDetailEntities, stockOrderEntity.getOrderIdFk()); + } + + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId()); + UdiwmsOrderDetail item = new UdiwmsOrderDetail(); + BeanUtil.copyProperties(stockOrderDetailEntity, item); + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) { +// item.setProductDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) { +// item.setExpireDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate())); + } + item.setMeasname(udiRelevanceEntity.getMeasname()); + item.setStandard(stockOrderDetailEntity.getSpec()); + item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); + try { + item.setPrice(stockOrderDetailEntity.getPrice() + ""); + item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); + item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); + item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); + item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo()); + ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId); + if (StrUtil.isEmpty(thrProductsEntity.getCode())) { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + "产品DI未关联第三方产品信息"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } else { + item.setProductId(thrProductsEntity.getCode()); + item.setProductName(thrProductsEntity.getName()); + } + + items.add(item); + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + e.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } + + udiwmsOrderRequest.setItem(items); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + //记录日志 + + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray()); + if (StrUtil.isNotBlank(response)) { + try { + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode().equals(20000)) { + String thirdBillNo = String.valueOf(baseResponse.getData()); + orderEntity.setExportStatus(1); + orderEntity.setThirdBillNo(thirdBillNo); + uploadLog.setStatus(2); + uploadLog.setThrBillNo(null); + uploadLog.setResult("提交成功"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + orderDao.updateOrder(orderEntity); + return ResultVOUtils.success("提交成功"); + } + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + baseResponse.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return baseResponse; + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + e.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } else { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，调用接口返回为空"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } + + + public List transferSerList(List stockOrderDetailEntities, String orderId) { + List resultList = new ArrayList<>(); + List codeList = codesDao.findByReceiptId(orderId); + if (CollUtil.isNotEmpty(stockOrderDetailEntities)) { + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + if (CollUtil.isNotEmpty(codeList)) { + for (WarehouseEntity codeDetaiEntity : codeList) { + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + StockOrderDetailEntity item = new StockOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, item); +// item.setCode(codeDetaiEntity.getCode()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); + item.setCount(codeDetaiEntity.getCount()); + item.setReCount(codeDetaiEntity.getCount()); + resultList.add(item); + } + } + } + } + } + + return resultList; + } + + + public BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("invPiUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOnhandRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getWarehouse(DsWarehouseRequest udiwmsWarehouseRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("warehouseQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsWarehouseRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + /** + * @param thirdSysBusApiEntity + * @return + */ + private String getThirdId(BasicThirdSysBusApiEntity thirdSysBusApiEntity) { + String thirdId = null; + switch (thirdSysBusApiEntity.getThirdSys()) { + case "thirdId": + thirdId = "thirdId"; + break; + case "third1": + thirdId = "thirdId1"; + break; + case "third2": + thirdId = "thirdId2"; + break; + case "third3": + thirdId = "thirdId3"; + break; + case "third4": + thirdId = "thirdId4"; + break; + default: + break; + } + return thirdId; + } + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java index adbf60b..ed70d82 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java @@ -17,7 +17,7 @@ import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; -import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; @@ -28,7 +28,7 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; import com.glxp.mipsdl.admin.entity.inout.OrderEntity; import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; @@ -38,10 +38,10 @@ import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest; import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; import com.glxp.mipsdl.admin.req.phxyy.*; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; -import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse; -import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; -import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService; -import com.glxp.mipsdl.admin.service.phxyy.StockOrderUploadLogService; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; +import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.util.DateUtil; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.admin.util.SubmitOrderUtils; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java index 6f1463c..c8bf3d7 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java @@ -18,7 +18,7 @@ import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao; import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; -import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.test.TestBusTypeDao; import com.glxp.mipsdl.admin.dao.test.TestCorpDao; import com.glxp.mipsdl.admin.dao.test.TestInvWarehouseDao; @@ -31,13 +31,13 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; import com.glxp.mipsdl.admin.entity.inout.OrderEntity; import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; import com.glxp.mipsdl.admin.req.*; -import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.req.basic.BussinessOriginTypeFilterRequest; import com.glxp.mipsdl.admin.req.thrsys.FilterThrCorpRequest; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; import com.glxp.mipsdl.admin.req.thrsys.FilterThrProductsRequest; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java new file mode 100644 index 0000000..5b1bf59 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/YxzyyClient.java @@ -0,0 +1,451 @@ +package com.glxp.mipsdl.admin.client.http; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; +import com.glxp.mipsdl.admin.config.ThirdSysConfig; +import com.glxp.mipsdl.admin.constant.ConstantStatus; +import com.glxp.mipsdl.admin.constant.ConstantType; +import com.glxp.mipsdl.admin.dao.basic.*; +import com.glxp.mipsdl.admin.dao.business.StockOrderDao; +import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao; +import com.glxp.mipsdl.admin.dao.inout.CodesDao; +import com.glxp.mipsdl.admin.dao.inout.OrderDao; +import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; +import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity; +import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderEntity; +import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; +import com.glxp.mipsdl.admin.entity.inout.OrderEntity; +import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; +import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; +import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest; +import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail; +import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest; +import com.glxp.mipsdl.admin.req.basic.BussinessLocalTypeFilterRequest; +import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; +import com.glxp.mipsdl.admin.req.yxzyy.*; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; +import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; +import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; +import com.glxp.mipsdl.admin.util.DateUtil; +import com.glxp.mipsdl.admin.util.HttpClient; +import com.glxp.mipsdl.admin.util.SubmitOrderUtils; +import com.glxp.mipsdl.common.res.BaseResponse; +import com.glxp.mipsdl.common.util.ResultVOUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 云霄中医院接口对接 + */ +@Slf4j +@Service +public class YxzyyClient { + + @Resource + private ThirdSysConfig thirdSysConfig; + @Resource + private HttpClient httpClient; + + @Resource + private StockOrderDao stockOrderDao; + @Resource + private StockOrderDetailDao stockOrderDetailDao; + @Resource + private BussinessLocalTypeDao bussinessLocalTypeDao; + @Resource + private BasicThirdSysBusApiDao thirdSysBusApiDao; + @Resource + private InvWarehouseDao invWarehouseDao; + @Resource + private ThrInvWarehouseDao thrInvWarehouseDao; + @Resource + private BussinessTypeDao bussinessTypeDao; + @Resource + private BasicThirdSysDetailDao basicThirdSysDetailDao; + @Resource + private UdiRelevanceDao udiRelevanceDao; + @Resource + private OrderDao orderDao; + + @Resource + private BasicThirdSysBusApiService basicThirdSysBusApiService; + @Resource + private BussinessOriginTypeService bussinessOriginTypeService; + @Resource + private SubmitOrderUtils submitOrderUtils; + @Resource + private CodesDao codesDao; + @Resource + private StockOrderUploadLogService stockOrderUploadLogService; + + public String[] getHeaderArray() { + List headArray = new ArrayList<>(6); + headArray.add("Content-Type"); + headArray.add("application/json"); + if (StrUtil.isNotEmpty(thirdSysConfig.getThirdSysConfig().getApikey())) { + headArray.add("api_key"); + headArray.add(thirdSysConfig.getThirdSysConfig().getApikey()); + } + if (StrUtil.isNotEmpty(thirdSysConfig.getThirdSysConfig().getSecretkey())) { + headArray.add("secret_key"); + headArray.add(thirdSysConfig.getThirdSysConfig().getSecretkey()); + } + String[] strArray = new String[headArray.size()]; + headArray.toArray(strArray); + return strArray; + } + + public BaseResponse testConnect() { + YxUnitRequest yxUnitRequest = new YxUnitRequest(); + yxUnitRequest.setPage(1); + yxUnitRequest.setLimit(1); + BaseResponse baseResponse = getUnit(yxUnitRequest); + if (baseResponse.getCode() == 20000) { + return ResultVOUtils.success("连接成功！"); + } else { + return ResultVOUtils.error(500, "连接失败"); + } + } + + public BaseResponse getUnit(YxUnitRequest YxUnitRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("corpUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), YxUnitRequest, getHeaderArray()); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getProducts(YxProductRequest udiwmsProductRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("piQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsProductRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getOrderTypes(YxBusTypeRequest udiwmsBusTypeRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("busTypeQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsBusTypeRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getOrders(UdiwmsOrderRequest udiwmsOrderRequest) { + if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { + return ResultVOUtils.error(500, "单据类型不能未空"); + } + if (StrUtil.isEmpty(udiwmsOrderRequest.getThirdSys())) { + return ResultVOUtils.error(500, "第三方系统ID不能为空"); + } + BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), thirdSysConfig.getThirdSysConfig().getThirdId()); + udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction()); + BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysBusApiEntity.getUrl(), udiwmsOrderRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse submitOrders(YxOrderRequest udiwmsOrderRequest) { + + if (StrUtil.isEmpty(udiwmsOrderRequest.getId())) { + return ResultVOUtils.error(500, "单据ID不能为空！"); + } + //查询单据和详情信息，组装第三方系统接口参数所需数据 + StockOrderEntity stockOrderEntity = stockOrderDao.findById(udiwmsOrderRequest.getId()); + OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk()); + List stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId()); + udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate()); + udiwmsOrderRequest.setBillNo(stockOrderEntity.getBillNo()); + + BussinessLocalTypeFilterRequest bussinessLocalTypeFilterRequest = new BussinessLocalTypeFilterRequest(); + bussinessLocalTypeFilterRequest.setAction(stockOrderEntity.getBillType()); + List bussinessLocalTypeEntities = bussinessLocalTypeDao.filterJoin(bussinessLocalTypeFilterRequest); + BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeEntities.get(0); + + //查询第三方系统的单据ID，及第三方系统标识 + BasicThirdSysBusApiEntity thirdSysBusApiEntity = thirdSysBusApiDao.selectByCode(stockOrderEntity.getBillType()); + if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) { + return ResultVOUtils.error(500, "接口未配置，无法提交！"); + } + String thirdId = getThirdId(thirdSysBusApiEntity); +// udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode()); + udiwmsOrderRequest.setBillType(submitOrderUtils.toBusType(stockOrderEntity.getBillType())); + if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) { + udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(stockOrderEntity.getCorpName()); //往来单位名称，需转换为第三方系统的名称 + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) { + List invWarehouseEntities = invWarehouseDao.selectByCode(stockOrderEntity.getCorpId()); + InvWarehouseEntity invWarehouseEntity = invWarehouseEntities.get(0); + try { + //根据第三方系统标识，获取对应字段的值 + FilterThrInvWarehouseRequest filterThrInvWarehouseRequest = new FilterThrInvWarehouseRequest(); + filterThrInvWarehouseRequest.setCode(invWarehouseEntity.getThirdId()); + filterThrInvWarehouseRequest.setThirdSysFk(thirdId); + List thrInvWarehouseEntities = thrInvWarehouseDao.filterThrInvWarehouse(filterThrInvWarehouseRequest); + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseEntities.get(0); + udiwmsOrderRequest.setCorpId(thrInvWarehouseEntity.getCode()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(thrInvWarehouseEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } catch (Exception e) { + log.error("查询单据对应的第三方往来单位信息异常", e); + } + } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { + ThrCorpEntity thrCorpEntity = submitOrderUtils.toCorp(stockOrderEntity.getCorpId(), thirdId); + if (thrCorpEntity == null) + return ResultVOUtils.error(500, "上传失败，往来单位未关联对应第三方产品编码！"); + udiwmsOrderRequest.setCorpId(thrCorpEntity.getUnitId()); //往来单位编码，需转换为第三方系统的ID + udiwmsOrderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称 + } + + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getInvStorageCode()); + try { + if (StrUtil.isNotEmpty(invWarehouseEntity.getThirdId())) { + ThrInvWarehouseEntity thrInvWarehouseEntity = thrInvWarehouseDao.selectByCode(invWarehouseEntity.getThirdId(), thirdId); + udiwmsOrderRequest.setLocStorageCode(thrInvWarehouseEntity.getCode()); + udiwmsOrderRequest.setLocStorageName(thrInvWarehouseEntity.getName()); + } else { + return ResultVOUtils.error(500, "未绑定第三方仓库！"); + } + + } catch (Exception e) { + log.error("查询第三方系统仓库异常", e); + } + + if (StrUtil.nullToEmpty(thirdSysBusApiEntity.getUrl()).equals("useOut")) { + udiwmsOrderRequest.setCorpId(udiwmsOrderRequest.getLocStorageCode()); + udiwmsOrderRequest.setCorpName(udiwmsOrderRequest.getLocStorageName()); + ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId); + udiwmsOrderRequest.setLocStorageCode("29"); + udiwmsOrderRequest.setLocStorageName(deviceInv.getName()); + } + + + udiwmsOrderRequest.setBillFlag("1"); + //查询单据出入库类型 + String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType()); + if (ConstantType.TYPE_PUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(1); //出入库类型：入库 + } else if (ConstantType.TYPE_OUT.equals(mainAction)) { + udiwmsOrderRequest.setInoutType(2); //出入库类型：出库 + } + +// //出库单转入库单 +// if (StrUtil.nullToEmpty(thirdSysBusApiEntity.getUrl()).equals("useOut")) { +// //使用部门 +// udiwmsOrderRequest.setUseDeptCode(udiwmsOrderRequest.getLocStorageCode()); +// udiwmsOrderRequest.setUseDeptName(udiwmsOrderRequest.getLocStorageName()); +// +// +// ThrInvWarehouseEntity deviceInv = thrInvWarehouseDao.selectByCode("29", thirdId); +// udiwmsOrderRequest.setLocStorageCode("29"); +// udiwmsOrderRequest.setLocStorageName(deviceInv.getName()); +// +// +// udiwmsOrderRequest.setInoutType(1); //出入库类型：入库 +// +// List warehouseEntities = codesDao.findByReceiptId(stockOrderEntity.getOrderIdFk()); +// if (CollUtil.isNotEmpty(warehouseEntities)) { +// UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(warehouseEntities.get(0).getSupId()); +// udiwmsOrderRequest.setCorpId(unitMaintainEntity.getThirdId()); +// udiwmsOrderRequest.setCorpName(unitMaintainEntity.getThirdName()); +// } +//// udiwmsOrderRequest.setCorpId(udiwmsOrderRequest.getLocStorageCode()); +//// udiwmsOrderRequest.setCorpName(udiwmsOrderRequest.getLocStorageName()); +// +// +// } + + + udiwmsOrderRequest.setRemark("udi管理系统提交单据"); //备注 + + //组装明细数据 + List items = new ArrayList<>(stockOrderDetailEntities.size()); + StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity(); + uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate())); + uploadLog.setBillType(stockOrderEntity.getBillType()); + uploadLog.setSubmitTime(new Date()); + uploadLog.setBillNo(udiwmsOrderRequest.getBillNo()); + uploadLog.setFromType(ConstantStatus.THIRD_ORDER_UPLOAD); + + if (bussinessLocalTypeEntity.getOrderVisibleType() == 1 && (stockOrderEntity.getStatus().equals("4") || stockOrderEntity.getStatus().equals("5"))) { + stockOrderDetailEntities = transferSerList(stockOrderDetailEntities, stockOrderEntity.getOrderIdFk()); + } + + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(stockOrderDetailEntity.getRelId()); + UdiwmsOrderDetail item = new UdiwmsOrderDetail(); + BeanUtil.copyProperties(stockOrderDetailEntity, item); + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) { +// item.setProductDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate())); + } + if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) { +// item.setExpireDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate())); + } + item.setMeasname(udiRelevanceEntity.getMeasname()); + item.setStandard(stockOrderDetailEntity.getSpec()); + item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh()); + try { + item.setPrice(stockOrderDetailEntity.getPrice() + ""); + item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo()); + item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo()); + item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate()); + item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo()); + ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId); + if (StrUtil.isEmpty(thrProductsEntity.getCode())) { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + "产品DI未关联第三方产品信息"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } else { + item.setProductId(thrProductsEntity.getCode()); + item.setProductName(thrProductsEntity.getName()); + } + + items.add(item); + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + e.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } + + udiwmsOrderRequest.setItem(items); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + //记录日志 + + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray()); + if (StrUtil.isNotBlank(response)) { + try { + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + if (baseResponse.getCode().equals(20000)) { + String thirdBillNo = String.valueOf(baseResponse.getData()); + orderEntity.setExportStatus(1); + orderEntity.setThirdBillNo(thirdBillNo); + uploadLog.setStatus(2); + uploadLog.setThrBillNo(null); + uploadLog.setResult("提交成功"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + orderDao.updateOrder(orderEntity); + return ResultVOUtils.success("提交成功"); + } + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + baseResponse.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return baseResponse; + } catch (Exception e) { + log.error(e.getMessage(), e); + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，错误信息：" + e.getMessage()); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } else { + uploadLog.setStatus(3); + uploadLog.setResult("提交失败，调用接口返回为空"); + stockOrderUploadLogService.insertOrUpdate(uploadLog); + return ResultVOUtils.error(500, "提交失败"); + } + } + + + public List transferSerList(List stockOrderDetailEntities, String orderId) { + List resultList = new ArrayList<>(); + List codeList = codesDao.findByReceiptId(orderId); + if (CollUtil.isNotEmpty(stockOrderDetailEntities)) { + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntities) { + if (CollUtil.isNotEmpty(codeList)) { + for (WarehouseEntity codeDetaiEntity : codeList) { + if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId())) + && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())) + ) { + StockOrderDetailEntity item = new StockOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailEntity, item); +// item.setCode(codeDetaiEntity.getCode()); + item.setSerialNo(codeDetaiEntity.getSerialNo()); + item.setCount(codeDetaiEntity.getCount()); + item.setReCount(codeDetaiEntity.getCount()); + resultList.add(item); + } + } + } + } + } + + return resultList; + } + + + public BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("invPiUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOnhandRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + public BaseResponse getWarehouse(YxWarehouseRequest udiwmsWarehouseRequest) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("warehouseQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsWarehouseRequest, getHeaderArray()); + BaseResponse baseResponse = + JSONObject.parseObject(response, new TypeReference() { + }); + return baseResponse; + } + + /** + * @param thirdSysBusApiEntity + * @return + */ + private String getThirdId(BasicThirdSysBusApiEntity thirdSysBusApiEntity) { + String thirdId = null; + switch (thirdSysBusApiEntity.getThirdSys()) { + case "thirdId": + thirdId = "thirdId"; + break; + case "third1": + thirdId = "thirdId1"; + break; + case "third2": + thirdId = "thirdId2"; + break; + case "third3": + thirdId = "thirdId3"; + break; + case "third4": + thirdId = "thirdId4"; + break; + default: + break; + } + return thirdId; + } + + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java index 4087ed3..b5fabb6 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java @@ -18,7 +18,7 @@ import com.glxp.mipsdl.admin.dao.inout.CodesDao; import com.glxp.mipsdl.admin.dao.inout.OrderDao; import com.glxp.mipsdl.admin.dao.inventory.InvSubWarehouseDao; import com.glxp.mipsdl.admin.dao.inventory.InvWarehouseDao; -import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; +import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysDetailDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao; import com.glxp.mipsdl.admin.dao.thrsys.ThrSubInvWarehouseDao; import com.glxp.mipsdl.admin.entity.auth.AuthAdmin; @@ -33,7 +33,7 @@ import com.glxp.mipsdl.admin.entity.inout.OrderEntity; import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity; import com.glxp.mipsdl.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrSubInvWarehouseEntity; import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest; @@ -46,7 +46,7 @@ import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest; import com.glxp.mipsdl.admin.req.thrsys.FilterThrInvWarehouseRequest; import com.glxp.mipsdl.admin.res.system.PageSimpleResponse; import com.glxp.mipsdl.admin.res.system.UdiwmsWarehouseDetail; -import com.glxp.mipsdl.admin.service.phxyy.StockOrderUploadLogService; +import com.glxp.mipsdl.admin.service.StockOrderUploadLogService; import com.glxp.mipsdl.admin.util.DateUtil; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.admin.util.ThirdUtils; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java index 7617fbe..571090b 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java @@ -7,7 +7,9 @@ import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity; import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity; import com.glxp.mipsdl.admin.http.request.USignRequest; import com.glxp.mipsdl.admin.req.*; +import com.glxp.mipsdl.admin.req.dsxyy.*; import com.glxp.mipsdl.admin.req.phxyy.*; +import com.glxp.mipsdl.admin.req.yxzyy.*; import com.glxp.mipsdl.common.enums.ResultEnum; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; @@ -36,27 +38,39 @@ public class UdiWmsController { private PhxyyClient phxyyClient; @Resource private ZaxyyClient zaxyyClient; + @Resource + private DsxyyClient dsxyyClient; + @Resource + private YxzyyClient yxzyyClient; //获取erp往来单位信息接口 @AuthRuleAnnotation("") @PostMapping("/udiwms/erp/getUnits") - public BaseResponse getUnits(@RequestBody UdiwmsUnitRequest testUnitRequest, + public BaseResponse getUnits(@RequestBody UdiwmsUnitRequest udiwmsUnitRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (curFlag.equals("YONGYOU_U8_V3.1")) { - return pzhzdClient.getUnit(testUnitRequest); + return pzhzdClient.getUnit(udiwmsUnitRequest); } else if (curFlag.equals("TEST")) { - return testClient.getUnit(testUnitRequest); + return testClient.getUnit(udiwmsUnitRequest); } else if (curFlag.equals("PHXYY")) { PhUnitRequest phUnitRequest = new PhUnitRequest(); - BeanUtil.copyProperties(testUnitRequest, phUnitRequest); + BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest); return phxyyClient.getUnit(phUnitRequest); } else if (curFlag.equals("ZAXZYY")) { PhUnitRequest phUnitRequest = new PhUnitRequest(); - BeanUtil.copyProperties(testUnitRequest, phUnitRequest); + BeanUtil.copyProperties(udiwmsUnitRequest, phUnitRequest); return zaxyyClient.getUnit(phUnitRequest); + } else if (curFlag.equals("DSXYY")) { + DsUnitRequest dsUnitRequest = new DsUnitRequest(); + BeanUtil.copyProperties(udiwmsUnitRequest, dsUnitRequest); + return dsxyyClient.getUnit(dsUnitRequest); + } else if (curFlag.equals("YXZYY")) { + YxUnitRequest yxUnitRequest = new YxUnitRequest(); + BeanUtil.copyProperties(udiwmsUnitRequest, yxUnitRequest); + return yxzyyClient.getUnit(yxUnitRequest); } else return ResultVOUtils.error(500, "当前第三方系统不支持往来单位信息查询！"); } @@ -79,6 +93,14 @@ public class UdiWmsController { PhProductRequest phProductRequest = new PhProductRequest(); BeanUtil.copyProperties(udiwmsProductRequest, phProductRequest); return zaxyyClient.getProducts(phProductRequest); + } else if (curFlag.equals("DSXYY")) { + DsProductRequest dsProductRequest = new DsProductRequest(); + BeanUtil.copyProperties(udiwmsProductRequest, dsProductRequest); + return dsxyyClient.getProducts(dsProductRequest); + } else if (curFlag.equals("YXZYY")) { + YxProductRequest yxProductRequest = new YxProductRequest(); + BeanUtil.copyProperties(udiwmsProductRequest, yxProductRequest); + return yxzyyClient.getProducts(yxProductRequest); } return ResultVOUtils.error(500, "当前第三方系统不支持产品信息查询！"); } @@ -104,6 +126,14 @@ public class UdiWmsController { PhWarehouseRequest phWarehouseRequest = new PhWarehouseRequest(); BeanUtil.copyProperties(udiwmsWarehouseRequest, phWarehouseRequest); return zaxyyClient.getWarehouse(phWarehouseRequest); + } else if (curFlag.equals("DSXYY")) { + DsWarehouseRequest dsWarehouseRequest = new DsWarehouseRequest(); + BeanUtil.copyProperties(udiwmsWarehouseRequest, dsWarehouseRequest); + return dsxyyClient.getWarehouse(dsWarehouseRequest); + } else if (curFlag.equals("YXZYY")) { + YxWarehouseRequest yxWarehouseRequest = new YxWarehouseRequest(); + BeanUtil.copyProperties(udiwmsWarehouseRequest, yxWarehouseRequest); + return yxzyyClient.getWarehouse(yxWarehouseRequest); } else return ResultVOUtils.error(500, "当前第三方系统不支持仓库货位号查询！"); } @@ -139,6 +169,14 @@ public class UdiWmsController { PhBusTypeRequest phBusTypeRequest = new PhBusTypeRequest(); BeanUtil.copyProperties(udiwmsBusTypeRequest, phBusTypeRequest); return zaxyyClient.getOrderTypes(phBusTypeRequest); + } else if (curFlag.equals("DSXYY")) { + DsBusTypeRequest dsBusTypeRequest = new DsBusTypeRequest(); + BeanUtil.copyProperties(udiwmsBusTypeRequest, dsBusTypeRequest); + return dsxyyClient.getOrderTypes(dsBusTypeRequest); + } else if (curFlag.equals("YXZYY")) { + YxBusTypeRequest yxBusTypeRequest = new YxBusTypeRequest(); + BeanUtil.copyProperties(udiwmsBusTypeRequest, yxBusTypeRequest); + return yxzyyClient.getOrderTypes(yxBusTypeRequest); } else if (curFlag.equals("YONGYOU_U8_V3.1")) { return pzhzdClient.getOrderTypes(null); } else @@ -162,6 +200,14 @@ public class UdiWmsController { ZaxzyyOrderRequest zaxzyyOrderRequest = new ZaxzyyOrderRequest(); BeanUtil.copyProperties(udiwmsOrderRequest, zaxzyyOrderRequest); return zaxyyClient.submitOrders(zaxzyyOrderRequest); + } else if (curFlag.equals("DSXYY")) { + DsOrderRequest dsOrderRequest = new DsOrderRequest(); + BeanUtil.copyProperties(udiwmsOrderRequest, dsOrderRequest); + return dsxyyClient.submitOrders(dsOrderRequest); + } else if (curFlag.equals("YXZYY")) { + YxOrderRequest yxOrderRequest = new YxOrderRequest(); + BeanUtil.copyProperties(udiwmsOrderRequest, yxOrderRequest); + return yxzyyClient.submitOrders(yxOrderRequest); } return ResultVOUtils.error(500, "当前第三方系统不支持提交单据！"); } @@ -291,6 +337,10 @@ public class UdiWmsController { return phxyyClient.testConnect(); } else if (curFlag.equals("ZAXZYY")) { return zaxyyClient.testConnect(); + } else if (curFlag.equals("DSXYY")) { + return dsxyyClient.testConnect(); + } else if (curFlag.equals("YXZYY")) { + return yxzyyClient.testConnect(); } if (curFlag.equals("YONGYOU_U8_V3.1")) { UdiwmsUnitRequest udiwmsUnitRequest = new UdiwmsUnitRequest(); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysBusApiDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysBusApiDao.java index 5366b3d..e46b662 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysBusApiDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysBusApiDao.java @@ -1,7 +1,7 @@ package com.glxp.mipsdl.admin.dao.basic; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; +import com.glxp.mipsdl.admin.req.basic.FilterBusTypeRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysDetailDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysDetailDao.java similarity index 79% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysDetailDao.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysDetailDao.java index a92dcb9..75dca43 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BasicThirdSysDetailDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BasicThirdSysDetailDao.java @@ -1,6 +1,6 @@ -package com.glxp.mipsdl.admin.dao.phxyy; +package com.glxp.mipsdl.admin.dao.basic; -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; +import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BussinessOriginTypeDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessOriginTypeDao.java similarity index 60% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BussinessOriginTypeDao.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessOriginTypeDao.java index 260ad82..95bc2d7 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/phxyy/BussinessOriginTypeDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/basic/BussinessOriginTypeDao.java @@ -1,7 +1,7 @@ -package com.glxp.mipsdl.admin.dao.phxyy; +package com.glxp.mipsdl.admin.dao.basic; -import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; -import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java index aa3f7b2..5c94fba 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/dao/test/TestBusTypeDao.java @@ -1,7 +1,7 @@ package com.glxp.mipsdl.admin.dao.test; import com.glxp.mipsdl.admin.entity.basic.BussinessOriginTypeEntity; -import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.req.basic.BussinessOriginTypeFilterRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/phxyy/BasicThirdSysDetailEntity.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysDetailEntity.java similarity index 91% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/entity/phxyy/BasicThirdSysDetailEntity.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysDetailEntity.java index 2f124e0..33b515a 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/phxyy/BasicThirdSysDetailEntity.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/entity/basic/BasicThirdSysDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.admin.entity.phxyy; +package com.glxp.mipsdl.admin.entity.basic; import lombok.Data; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/BussinessOriginTypeFilterRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessOriginTypeFilterRequest.java similarity index 91% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/BussinessOriginTypeFilterRequest.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessOriginTypeFilterRequest.java index 3dd5a2e..43271e2 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/BussinessOriginTypeFilterRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/BussinessOriginTypeFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.admin.req.phxyy; +package com.glxp.mipsdl.admin.req.basic; import com.glxp.mipsdl.admin.req.ListPageRequest; import lombok.Data; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/FilterBusTypeRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterBusTypeRequest.java similarity index 86% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/FilterBusTypeRequest.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterBusTypeRequest.java index 6f30584..997da18 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/phxyy/FilterBusTypeRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/basic/FilterBusTypeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.admin.req.phxyy; +package com.glxp.mipsdl.admin.req.basic; import com.glxp.mipsdl.admin.req.ListPageRequest; import lombok.Data; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsBusTypeRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsBusTypeRequest.java new file mode 100644 index 0000000..6196626 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsBusTypeRequest.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.admin.req.dsxyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class DsBusTypeRequest extends ListPageRequest { + + //单据类型编码 + private String code; + + //单据类型名称 + private String name; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsOrderRequest.java new file mode 100644 index 0000000..1da804d --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsOrderRequest.java @@ -0,0 +1,28 @@ +package com.glxp.mipsdl.admin.req.dsxyy; + +import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail; +import lombok.Data; + +import java.util.List; + +@Data +public class DsOrderRequest { + + private String id; + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private Integer inoutType; //出入库类型 1.入库 2.出库 + private String billDate; //单据日期 + private String billType; //单据类型 + private String remark; //备注 + private String corpId; //第三方单据往来单位ID + private String corpName; //往来单位 + private String locStorageCode; //当前仓库 + private String locStorageName; //当前仓库名称 + + + private String useDeptCode; + private String useDeptName; + private List item; //单据详情数组 + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsProductRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsProductRequest.java new file mode 100644 index 0000000..b38a47a --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsProductRequest.java @@ -0,0 +1,33 @@ +package com.glxp.mipsdl.admin.req.dsxyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class DsProductRequest extends ListPageRequest { + + private String code; //产品编码 + private String name; //产品名称 + + //计量单位 + private String measname; + + + //注册/备案号 + private String registerNo; + + //生产厂家 + private String manufactory; + + //医保编码 + private String ybbm; + + //型号 + private String standard; + + /** + * 最后更新时间 + */ + private String lastUpdateTime; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsUnitRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsUnitRequest.java new file mode 100644 index 0000000..d5e2dfb --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsUnitRequest.java @@ -0,0 +1,20 @@ +package com.glxp.mipsdl.admin.req.dsxyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +/** + * 东山 查询往来单位接口参数 + */ +@Data +public class DsUnitRequest extends ListPageRequest { + + private String unitId; //往来单位编码 + private String name; //往来单位名称 + + /** + * 最后更新时间 + */ + private String lastUpdateTime; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsWarehouseRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsWarehouseRequest.java new file mode 100644 index 0000000..fae7612 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/dsxyy/DsWarehouseRequest.java @@ -0,0 +1,15 @@ +package com.glxp.mipsdl.admin.req.dsxyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class DsWarehouseRequest extends ListPageRequest { + + //仓库号，支持模糊查询 + private String inventoryCode; + + //货位号，支持模糊查询 + private String warehouseCode; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxBusTypeRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxBusTypeRequest.java new file mode 100644 index 0000000..9f25dd4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxBusTypeRequest.java @@ -0,0 +1,14 @@ +package com.glxp.mipsdl.admin.req.yxzyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class YxBusTypeRequest extends ListPageRequest { + + //单据类型编码 + private String code; + + //单据类型名称 + private String name; +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java new file mode 100644 index 0000000..aec8031 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxOrderRequest.java @@ -0,0 +1,28 @@ +package com.glxp.mipsdl.admin.req.yxzyy; + +import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail; +import lombok.Data; + +import java.util.List; + +@Data +public class YxOrderRequest { + + private String id; + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private Integer inoutType; //出入库类型 1.入库 2.出库 + private String billDate; //单据日期 + private String billType; //单据类型 + private String remark; //备注 + private String corpId; //第三方单据往来单位ID + private String corpName; //往来单位 + private String locStorageCode; //当前仓库 + private String locStorageName; //当前仓库名称 + + + private String useDeptCode; + private String useDeptName; + private List item; //单据详情数组 + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxProductRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxProductRequest.java new file mode 100644 index 0000000..c15bae5 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxProductRequest.java @@ -0,0 +1,33 @@ +package com.glxp.mipsdl.admin.req.yxzyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class YxProductRequest extends ListPageRequest { + + private String code; //产品编码 + private String name; //产品名称 + + //计量单位 + private String measname; + + + //注册/备案号 + private String registerNo; + + //生产厂家 + private String manufactory; + + //医保编码 + private String ybbm; + + //型号 + private String standard; + + /** + * 最后更新时间 + */ + private String lastUpdateTime; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxUnitRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxUnitRequest.java new file mode 100644 index 0000000..a65b9e4 --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxUnitRequest.java @@ -0,0 +1,20 @@ +package com.glxp.mipsdl.admin.req.yxzyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +/** + * 东山 查询往来单位接口参数 + */ +@Data +public class YxUnitRequest extends ListPageRequest { + + private String unitId; //往来单位编码 + private String name; //往来单位名称 + + /** + * 最后更新时间 + */ + private String lastUpdateTime; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxWarehouseRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxWarehouseRequest.java new file mode 100644 index 0000000..318c47c --- /dev/null +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/yxzyy/YxWarehouseRequest.java @@ -0,0 +1,15 @@ +package com.glxp.mipsdl.admin.req.yxzyy; + +import com.glxp.mipsdl.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class YxWarehouseRequest extends ListPageRequest { + + //仓库号，支持模糊查询 + private String inventoryCode; + + //货位号，支持模糊查询 + private String warehouseCode; + +} diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/res/phxyy/BussinessOriginTypeResponse.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/BussinessOriginTypeResponse.java similarity index 91% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/res/phxyy/BussinessOriginTypeResponse.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/BussinessOriginTypeResponse.java index e4e70a8..045a7ed 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/res/phxyy/BussinessOriginTypeResponse.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/res/basic/BussinessOriginTypeResponse.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.admin.res.phxyy; +package com.glxp.mipsdl.admin.res.basic; import lombok.Data; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/StockOrderUploadLogService.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/StockOrderUploadLogService.java similarity index 94% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/StockOrderUploadLogService.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/service/StockOrderUploadLogService.java index a07a930..5a48373 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/StockOrderUploadLogService.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/StockOrderUploadLogService.java @@ -1,4 +1,4 @@ -package com.glxp.mipsdl.admin.service.phxyy; +package com.glxp.mipsdl.admin.service; import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao; import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BasicThirdSysBusApiService.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicThirdSysBusApiService.java similarity index 82% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BasicThirdSysBusApiService.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicThirdSysBusApiService.java index 7aadac2..3803244 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BasicThirdSysBusApiService.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BasicThirdSysBusApiService.java @@ -1,8 +1,8 @@ -package com.glxp.mipsdl.admin.service.phxyy; +package com.glxp.mipsdl.admin.service.basic; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; +import com.glxp.mipsdl.admin.req.basic.FilterBusTypeRequest; import java.util.List; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BussinessOriginTypeService.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BussinessOriginTypeService.java similarity index 62% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BussinessOriginTypeService.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BussinessOriginTypeService.java index 44a41ad..a0659c3 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/BussinessOriginTypeService.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/BussinessOriginTypeService.java @@ -1,7 +1,7 @@ -package com.glxp.mipsdl.admin.service.phxyy; +package com.glxp.mipsdl.admin.service.basic; -import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; -import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; import java.util.List; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java similarity index 90% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java index 2340de0..dfff8a6 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BasicThirdSysBusApiServiceImpl.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BasicThirdSysBusApiServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.mipsdl.admin.service.phxyy.impl; +package com.glxp.mipsdl.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.glxp.mipsdl.admin.dao.basic.BasicThirdSysBusApiDao; import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity; -import com.glxp.mipsdl.admin.req.phxyy.FilterBusTypeRequest; -import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; +import com.glxp.mipsdl.admin.req.basic.FilterBusTypeRequest; +import com.glxp.mipsdl.admin.service.basic.BasicThirdSysBusApiService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BussinessOriginTypeServiceImpl.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java similarity index 81% rename from api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BussinessOriginTypeServiceImpl.java rename to api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java index e34caeb..2eedc26 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/service/phxyy/impl/BussinessOriginTypeServiceImpl.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.glxp.mipsdl.admin.service.phxyy.impl; +package com.glxp.mipsdl.admin.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.glxp.mipsdl.admin.dao.phxyy.BussinessOriginTypeDao; -import com.glxp.mipsdl.admin.req.phxyy.BussinessOriginTypeFilterRequest; -import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse; -import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService; +import com.glxp.mipsdl.admin.dao.basic.BussinessOriginTypeDao; +import com.glxp.mipsdl.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.mipsdl.admin.res.basic.BussinessOriginTypeResponse; +import com.glxp.mipsdl.admin.service.basic.BussinessOriginTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/api-sync/src/main/resources/application-pro.properties b/api-sync/src/main/resources/application-pro.properties index af47a69..fb1f969 100644 --- a/api-sync/src/main/resources/application-pro.properties +++ b/api-sync/src/main/resources/application-pro.properties @@ -28,7 +28,7 @@ UDIWMS_IP=http://127.0.0.1:9991 API_KEY=1102 API_SECRET=4dc07484afd34e8083ba96e8fe564224 #\u6587\u4EF6\u5BFC\u5165 -#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.YXZYY(\u5E73\u548C\u53BF\u533B\u9662) +#0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09\uFF0C1.GLXP(\u81EA\u5B9A\u4E49\u89C4\u8303\u6807\u51C6\uFF09\uFF0C2.ZHIYE_V1(\u667A\u4E1AV1,\u8BCF\u5B89\u533B\u9662),3.YG_UDPLAT_V1(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0\uFF09,4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662), 5.DSXYY(\u4E1C\u5C71\u53BF\u533B\u9662), 6.YXZXYY(\u4E91\u9704\u4E2D\u533B\u9662) FILE_VERSION_FLAG=YXZYY #\u63A5\u53E3\u5B9E\u65F6\u83B7\u53D6 #0.NULL(\u7A7A\uFF0C\u672A\u914D\u7F6E\uFF09,1.YONGYOU_U8_V3.1(\u7528\u53CB3.1\u7248\u672C\uFF0C\u7247\u4ED4\u7640\u8BCA\u65AD\uFF09 2.YG_UDPLAT_V1.0(\u9633\u5149\u91C7\u8D2D\u5E73\u53F0) 3.TEST(\u6807\u51C6\u63A5\u53E3\uFF0C\u6D4B\u8BD5\u7528),4.PHXYY(\u5E73\u548C\u53BF\u533B\u9662) diff --git a/api-sync/src/main/resources/mybatis/mapper/phxyy/BasicThirdSysBusApiDao.xml b/api-sync/src/main/resources/mybatis/mapper/phxyy/BasicThirdSysBusApiDao.xml index 6c0b8fd..8b71937 100644 --- a/api-sync/src/main/resources/mybatis/mapper/phxyy/BasicThirdSysBusApiDao.xml +++ b/api-sync/src/main/resources/mybatis/mapper/phxyy/BasicThirdSysBusApiDao.xml @@ -16,7 +16,7 @@ WHERE id=#{id} - + resultType="com.glxp.mipsdl.admin.entity.basic.BasicThirdSysDetailEntity"> select basic_third_sys_detail.*, basic_third_sys.thridUrl FROM basic_third_sys_detail inner join basic_third_sys on basic_third_sys_detail.thirdSysFk = basic_third_sys.thirdId @@ -13,7 +13,7 @@ and basic_third_sys.enabled = 1 + SELECT * FROM test_bustype