Merge remote-tracking branch 'origin/datasource' into datasource

src/main/java/com/glxp/mipsdl/client/BaseHttpClient.java

@@ -265,4 +265,19 @@ public interface BaseHttpClient {
      * @return
      */
     BaseResponse queryUdiInvOutScanCode(ForInvOutScanCodeFilter forInvOutScanCodeFilter);
+
+    /**
+     * 处方
+     * @param udiwmsBasicSkPrescribeRequest
+     * @return
+     */
+    BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest);
+
+    /**
+     * 采购计划
+     * @param udiwmsThrOrderRequest
+     * @return
+     */
+    BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest);
+
 }

src/main/java/com/glxp/mipsdl/client/CommonHttpClient.java

@@ -295,4 +295,14 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     public BaseResponse getInvFeeResult(UdiwmsInvProductsRequest udiwmsInvProductsRequest) {
         return null;
     }
+
+    @Override
+    public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
+        return null;
+    }
 }

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -12,7 +12,9 @@ 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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.glxp.mipsdl.client.CommonHttpClient;
 import com.glxp.mipsdl.client.ctqyy.entity.InvCodeResultEntity;
 import com.glxp.mipsdl.client.ctqyy.entity.InvProjectResultEntity;
@@ -31,15 +33,9 @@ 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.ctqyy.*;
 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.entity.thrsys.*;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
 import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter;
@@ -50,12 +46,16 @@ 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.ctqyy.ThrOrderResponse;
 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.thirddao.ctqyy.PhysicDictMapper;
+import com.glxp.mipsdl.thirddao.ctqyy.PlanInfoMapper;
+import com.glxp.mipsdl.thirddao.ctqyy.PresInfoMapper;
 import com.glxp.mipsdl.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.dom4j.Document;
@@ -116,6 +116,13 @@ public class CtqyyClient extends CommonHttpClient {
     BasicProductsDao basicProductsDao;
     @Resource
     private OrderUploadLogService orderUploadLogService;
+    @Resource
+    private PhysicDictMapper physicDictMapper;
+    @Resource
+    private PresInfoMapper presInfoMapper;
+    @Resource
+    private PlanInfoMapper planInfoMapper;
+
 
     /**
      * 拼接xml请求头
@@ -185,9 +192,15 @@ public class CtqyyClient extends CommonHttpClient {
         }
     }
 
-
+    /**
+     * 器械从三方拉取
+     * 药品从视图拉取
+     * @param udiwmsProductRequest
+     * @return
+     */
     @Override
     public BaseResponse getProducts(UdiwmsProductRequest udiwmsProductRequest) {
+        if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DEVICE)){
             CtqyyRequest ctqyyRequest = new CtqyyRequest();
             ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict"));
             ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest));
@@ -218,6 +231,34 @@ public class CtqyyClient extends CommonHttpClient {
                 log.error("异常信息：{}", e);
                 return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
             }
+        }else if(udiwmsProductRequest.getProductType().equals(Constants.PRODUCT_TYPE_DRUG)){
+            LambdaQueryWrapper<PhysicDictEntity> wrapper = new LambdaQueryWrapper();
+            //补充其他查询条件
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getCode()),PhysicDictEntity::getPhysicCode,udiwmsProductRequest.getCode());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getName()),PhysicDictEntity::getPhysicName,udiwmsProductRequest.getName());
+            wrapper.eq(StrUtil.isNotBlank(udiwmsProductRequest.getRegisterNo()),PhysicDictEntity::getPhysicNo,udiwmsProductRequest.getRegisterNo());
+            IPage<PhysicDictEntity> page = physicDictMapper.selectPage(new Page<PhysicDictEntity>(udiwmsProductRequest.getPage(),udiwmsProductRequest.getLimit()),wrapper);
+            List<PhysicDictEntity> physicDictEntities = page.getRecords();
+            List<ThrProductsEntity> thrProductsEntityList = null;
+            if(CollUtil.isNotEmpty(physicDictEntities)){
+                //数据处理以thr_products 返回
+                thrProductsEntityList = physicDictEntities.stream().map(dict -> {
+                    ThrProductsEntity products = new ThrProductsEntity();
+                    products.setCode(dict.getPhysicCode());
+                    products.setName(dict.getPhysicName());
+                    products.setMeasname(dict.getPhysicUnit());
+                    products.setSpec(dict.getPhysicSpec());
+                    products.setRegisterNo(dict.getPhysicNo());
+                    return products;
+                }).collect(Collectors.toList());
+            }
+            PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
+            pageSimpleResponse.setTotal(page.getTotal());
+            pageSimpleResponse.setList(thrProductsEntityList);
+            return ResultVOUtils.success(pageSimpleResponse);
+        }
+        log.error("解析长泰区医院医疗类型，返回结果：{}", udiwmsProductRequest.getProductType());
+        return ResultVOUtils.error(500,"医疗类型不正确，medicalType："+udiwmsProductRequest.getProductType());
     }
 
     @Override
@@ -1305,4 +1346,71 @@ public class CtqyyClient extends CommonHttpClient {
         }
         return udiwmsPreInOrderRequest;
     }
+
+
+    /**
+     * 处方拉取视图
+     * @param udiwmsBasicSkPrescribeRequest
+     * @return
+     */
+    @Override
+    public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
+        LambdaQueryWrapper<PresInfoEntity> wrapper = new LambdaQueryWrapper();
+        //补充其他查询条件
+        IPage<PresInfoEntity> page = presInfoMapper.selectPage(new Page<PresInfoEntity>(udiwmsBasicSkPrescribeRequest.getPage(),udiwmsBasicSkPrescribeRequest.getLimit()),wrapper);
+        List<PresInfoEntity> presInfoEntities = page.getRecords();
+        List<BasicSkPrescribeResponse> basicSkPrescribeResponses = null;
+        if(CollUtil.isNotEmpty(presInfoEntities)){
+            //数据处理以basic_sk_prescribe，basic_sk_prescribe_item 主子返回
+            basicSkPrescribeResponses = presInfoEntities.stream().map(pres -> {
+                BasicSkPrescribeResponse basicSkPrescribeResponse = new BasicSkPrescribeResponse();
+                List<BasicSkPrescribeItemEntity> itemList = new ArrayList<>();
+                BasicSkPrescribeItemEntity item = new BasicSkPrescribeItemEntity();
+                //TODO 封装数据
+
+
+                itemList.add(item);
+                basicSkPrescribeResponse.setItemList(itemList);
+                return basicSkPrescribeResponse;
+            }).collect(Collectors.toList());
+        }
+        PageSimpleResponse<BasicSkPrescribeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(basicSkPrescribeResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    /**
+     * 采购计划拉取视图
+     * @param udiwmsThrOrderRequest
+     * @return
+     */
+    @Override
+    public BaseResponse getThrOrders(UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
+        LambdaQueryWrapper<PlanInfoEntity> wrapper = new LambdaQueryWrapper<>();
+        //补充其他查询条件
+        IPage<PlanInfoEntity> page = planInfoMapper.selectPage(new Page<PlanInfoEntity>(udiwmsThrOrderRequest.getPage(),udiwmsThrOrderRequest.getLimit()),wrapper);
+        List<PlanInfoEntity> planInfoEntities = page.getRecords();
+        List<ThrOrderResponse> thrOrderResponses = null;
+        if(CollUtil.isNotEmpty(planInfoEntities)){
+            //数据处理以thr_order，thr_order_detail 主子返回
+            thrOrderResponses = planInfoEntities.stream().map(plan->{
+                ThrOrderResponse thrOrderResponse = new ThrOrderResponse();
+                List<ThrOrderDetailEntity> detailList = new ArrayList<>();
+                ThrOrderDetailEntity detail = new ThrOrderDetailEntity();
+                //TODO 封装数据
+
+
+                detailList.add(detail);
+                thrOrderResponse.setDetailList(detailList);
+                return thrOrderResponse;
+            }).collect(Collectors.toList());
+        }
+        PageSimpleResponse<ThrOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(page.getTotal());
+        pageSimpleResponse.setList(thrOrderResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 }

src/main/java/com/glxp/mipsdl/constant/Constants.java

@@ -177,4 +177,14 @@ public interface Constants {
      */
     int THIRD_ORDER_RECEIVE = 2;
 
+    //产品类型
+    /**
+     * 器械
+     */
+    int PRODUCT_TYPE_DEVICE = 1;
+    /**
+     * 药品
+     */
+    int PRODUCT_TYPE_DRUG = 2;
+
 }

src/main/java/com/glxp/mipsdl/controller/UdiWmsController.java

@@ -310,4 +310,25 @@ public class UdiWmsController {
         return ClientProcessor.getHttpClient().postRelProduct(postRelProductRequest);
     }
 
+
+    /**
+     * 处方入库
+     * @param udiwmsBasicSkPrescribeRequest
+     * @return
+     */
+    @PostMapping("/udiwms/erp/getPrescribes")
+    public BaseResponse getPrescribes(@RequestBody UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
+        return ClientProcessor.getHttpClient().getPrescribes(udiwmsBasicSkPrescribeRequest);
+    }
+
+    /**
+     * 采购计划入库
+     * @param udiwmsThrOrderRequest
+     * @return
+     */
+    @PostMapping("/udiwms/erp/getThrOrders")
+    public BaseResponse getThrOrders(@RequestBody UdiwmsThrOrderRequest udiwmsThrOrderRequest) {
+        return ClientProcessor.getHttpClient().getThrOrders(udiwmsThrOrderRequest);
+    }
+
 }

src/main/java/com/glxp/mipsdl/entity/ctqyy/PhysicDictEntity.java

@@ -0,0 +1,33 @@
+package com.glxp.mipsdl.entity.ctqyy;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "V_YPZS_PHYSIC_DICT")
+public class PhysicDictEntity {
+
+    @TableField("PHYSIC_CODE")
+    private String physicCode;
+    @TableField("PHYSIC_NO")
+    private String physicNo;
+    @TableField("PHYSIC_NAME")
+    private String physicName;
+    @TableField("PHYSIC_SPEC")
+    private String physicSpec;
+    @TableField("PHYSIC_UNIT")
+    private String physicUnit;
+    @TableField("PACK_UNIT")
+    private String packUnit;
+    @TableField("PACK_SPEC")
+    private String packSpec;
+    @TableField("PACK_UNTUCK")
+    private String packUntuck;
+    @TableField("PACK_UNTUCK_RESI")
+    private String packUntuckResi;
+    @TableField("COUNTRY_CODE")
+    private String countryCode;
+
+}

src/main/java/com/glxp/mipsdl/entity/ctqyy/PlanInfoEntity.java

@@ -0,0 +1,52 @@
+package com.glxp.mipsdl.entity.ctqyy;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "V_YPZS_PLAN_INFO")
+public class PlanInfoEntity {
+
+    @TableField("CGDBH")
+    private String cgdbh;
+    @TableField("YPBM")
+    private String ypbm;
+    @TableField("YPMC")
+    private String ypmc;
+    @TableField("JXMC")
+    private String jxmc;
+    @TableField("GGMC")
+    private String ggmc;
+    @TableField("BZDW")
+    private String bzdw;
+    @TableField("ZXSYDW")
+    private String zxsydw;
+    @TableField("ZHB")
+    private String zhb;
+    @TableField("SCQYBM")
+    private String scqybm;
+    @TableField("SCQYMC")
+    private String scqymc;
+    @TableField("YKBM")
+    private String ykbm;
+    @TableField("YKMC")
+    private String ykmc;
+    @TableField("ZBJ")
+    private String zbj;
+    @TableField("GJJ")
+    private String gjj;
+    @TableField("GMSL")
+    private String gmsl;
+    @TableField("PSQYBM")
+    private String psqybm;
+    @TableField("PSQYMC")
+    private String psqymc;
+    @TableField("BZ")
+    private String bz;
+    @TableField("TPJG")
+    private String tpjg;
+
+
+}

src/main/java/com/glxp/mipsdl/entity/ctqyy/PresInfoEntity.java

@@ -0,0 +1,41 @@
+package com.glxp.mipsdl.entity.ctqyy;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "V_YPZS_PRES_INFO")
+public class PresInfoEntity {
+
+    @TableField("TABLE_TYPE")
+    private String tableType;
+    @TableField("LAYPHYSIC_NO")
+    private String layphysicNo;
+    @TableField("PRESCRIBE_NUMBER")
+    private String prescribeNumber;
+    @TableField("PRESCRIBE_SUB_NUMBER")
+    private String prescribeSubNumber;
+    @TableField("LAY_PHYSIC_TIME")
+    private String layPhysicTime;
+    @TableField("STORAGE_CODE")
+    private String storageCode;
+    @TableField("STORAGE_NAME")
+    private String storageName;
+    @TableField("SICK_ID")
+    private String sickId;
+    @TableField("RESIDENCE_NO")
+    private String residenceNo;
+    @TableField("PHYSIC_CODE")
+    private String physicCode;
+    @TableField("PHYSIC_NAME")
+    private String physicName;
+    @TableField("LAY_PHYSIC_QUANTITY")
+    private String layPhysicQuantity;
+    @TableField("PHYSIC_UNIT")
+    private String physicUnit;
+    @TableField("COST")
+    private String cost;
+
+}

src/main/java/com/glxp/mipsdl/entity/thrsys/ThrOrderDetailEntity.java

@@ -0,0 +1,130 @@
+package com.glxp.mipsdl.entity.thrsys;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@Data
+@TableName(value = "thr_order_detail")
+public class ThrOrderDetailEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String productId;
+
+    /**
+     *
+     */
+    private String productName;
+
+    /**
+     *
+     */
+    private String spec;
+
+    /**
+     *
+     */
+    private String batchNo;
+
+    /**
+     *
+     */
+    private String expireDate;
+
+    /**
+     *
+     */
+    private String productDate;
+
+    /**
+     *
+     */
+    private String count;
+
+    /**
+     *
+     */
+    private String reCount;
+
+    /**
+     *
+     */
+    private String orderIdFk;
+
+    /**
+     *
+     */
+    private String thirdSysFk;
+
+    /**
+     * 单价
+     */
+    private BigDecimal price;
+
+    /**
+     * 往来单位
+     */
+    private String corpName;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 注册证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     *
+     */
+    private String supId;
+
+    /**
+     *
+     */
+    private String supName;
+}
+

src/main/java/com/glxp/mipsdl/req/base/UdiwmsBasicSkPrescribeRequest.java

@@ -0,0 +1,116 @@
+package com.glxp.mipsdl.req.base;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class UdiwmsBasicSkPrescribeRequest extends ListPageRequest{
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 处方编码
+     */
+    private String code;
+
+    /**
+     * 病人编码
+     */
+    private String sickerCode;
+
+    /**
+     * 开方时间
+     */
+    private Date prescribeDate;
+
+    /**
+     * 开方医生
+     */
+    private String createDr;
+
+    /**
+     * 处方费用
+     */
+    private BigDecimal amount;
+
+    /**
+     * 就诊科室编码
+     */
+    private String deptCode;
+
+    /**
+     * 就诊科室名称
+     */
+    private String deptName;
+
+    /**
+     * 诊断内容
+     */
+    private String diagnosis;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private String adNum;
+
+    /**
+     * 就诊卡号
+     */
+    private String clinicNumber;
+
+    /**
+     * 处方赋码状态  1:未赋码；2：赋码中；3：已赋码
+     */
+    private Byte tagStatus;
+
+    /**
+     * 处方下载转换状态  1:未转换；2：部分转换；3：已转换
+     */
+    private Byte trDiStatus;
+
+    /**
+     * 处方赋码错误信息
+     */
+    private String tagMsg;
+
+    /**
+     * 工位
+     */
+    private String workPlaceCode;
+
+    /**
+     *
+     */
+    private String addr;
+
+}
+

src/main/java/com/glxp/mipsdl/req/base/UdiwmsProductRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.mipsdl.req.base;
 
+import com.glxp.mipsdl.constant.Constants;
 import lombok.Data;
 
 /**
@@ -63,4 +64,20 @@ public class UdiwmsProductRequest extends ListPageRequest {
      */
     private String remark3;
 
+    /**
+     * 产品类型 器械 1  药品 2
+     */
+    private Integer productType;
+
+    /**
+     * 为空默认 器械 1
+     * @return
+     */
+    public Integer getProductType() {
+        if(productType == null){
+            return Constants.PRODUCT_TYPE_DEVICE;
+        }
+        return productType;
+    }
+
 }

src/main/java/com/glxp/mipsdl/req/base/UdiwmsThrOrderRequest.java

@@ -0,0 +1,193 @@
+package com.glxp.mipsdl.req.base;
+
+import java.util.Date;
+import lombok.Data;
+
+@Data
+public class UdiwmsThrOrderRequest extends ListPageRequest{
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String billNo;
+
+    /**
+     *
+     */
+    private String billdate;
+
+    /**
+     *
+     */
+    private String corpId;
+
+    /**
+     *
+     */
+    private String corpName;
+
+    /**
+     *
+     */
+    private String billType;
+
+    /**
+     *
+     */
+    private String billFlag;
+
+    /**
+     *
+     */
+    private String thirdSysFk;
+
+    /**
+     * 原始单据类型
+     */
+    private String originType;
+
+    /**
+     * 起始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+    /**
+     * 审核人
+     */
+    private String reviewUser;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkMan;
+
+    /**
+     * 联系电话
+     */
+    private String linkTel;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 备注1
+     */
+    private String remark1;
+
+    /**
+     * 备注2
+     */
+    private String remark2;
+
+    /**
+     * 备注3
+     */
+    private String remark3;
+
+    /**
+     *
+     */
+    private Byte type;
+
+    /**
+     *
+     */
+    private String locStorageCode;
+
+    /**
+     *
+     */
+    private Byte editStatus;
+
+    /**
+     * 分库
+     */
+    private String invWarehouseCode;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 注册证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 判断来源至哪里1：第三方 2：自己创建
+     */
+    private Byte thirdPartyDate;
+
+    /**
+     *
+     */
+    private String unitIdFk;
+
+    /**
+     * 往来分库
+     */
+    private String fromSubInvCode;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Byte inoutType;
+
+    /**
+     *
+     */
+    private String deptCode;
+
+    /**
+     *
+     */
+    private String invCode;
+
+    /**
+     *
+     */
+    private Date reviewTime;
+}
+

src/main/java/com/glxp/mipsdl/res/ctqyy/ThrOrderResponse.java

@@ -0,0 +1,199 @@
+package com.glxp.mipsdl.res.ctqyy;
+
+import java.util.Date;
+import java.util.List;
+
+import com.glxp.mipsdl.entity.thrsys.ThrOrderDetailEntity;
+import lombok.Data;
+
+@Data
+public class ThrOrderResponse {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String billNo;
+
+    /**
+     *
+     */
+    private String billdate;
+
+    /**
+     *
+     */
+    private String corpId;
+
+    /**
+     *
+     */
+    private String corpName;
+
+    /**
+     *
+     */
+    private String billType;
+
+    /**
+     *
+     */
+    private String billFlag;
+
+    /**
+     *
+     */
+    private String thirdSysFk;
+
+    /**
+     * 原始单据类型
+     */
+    private String originType;
+
+    /**
+     * 起始日期
+     */
+    private String startDate;
+
+    /**
+     * 结束日期
+     */
+    private String endDate;
+
+    /**
+     * 审核人
+     */
+    private String reviewUser;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 联系人
+     */
+    private String linkMan;
+
+    /**
+     * 联系电话
+     */
+    private String linkTel;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 备注1
+     */
+    private String remark1;
+
+    /**
+     * 备注2
+     */
+    private String remark2;
+
+    /**
+     * 备注3
+     */
+    private String remark3;
+
+    /**
+     *
+     */
+    private Byte type;
+
+    /**
+     *
+     */
+    private String locStorageCode;
+
+    /**
+     *
+     */
+    private Byte editStatus;
+
+    /**
+     * 分库
+     */
+    private String invWarehouseCode;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 注册证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产企业
+     */
+    private String manufactory;
+
+    /**
+     * 判断来源至哪里1：第三方 2：自己创建
+     */
+    private Byte thirdPartyDate;
+
+    /**
+     *
+     */
+    private String unitIdFk;
+
+    /**
+     * 往来分库
+     */
+    private String fromSubInvCode;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     *
+     */
+    private Byte inoutType;
+
+    /**
+     *
+     */
+    private String deptCode;
+
+    /**
+     *
+     */
+    private String invCode;
+
+    /**
+     *
+     */
+    private Date reviewTime;
+
+    private List<ThrOrderDetailEntity> detailList;
+
+}
+

src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PhysicDictMapper.java

@@ -0,0 +1,16 @@
+package com.glxp.mipsdl.thirddao.ctqyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.ctqyy.PhysicDictEntity;
+import com.glxp.mipsdl.req.base.UdiwmsProductRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+@Mapper
+@DS("ctqyySql")
+public interface PhysicDictMapper extends BaseMapper<PhysicDictEntity> {
+
+}

src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PlanInfoMapper.java

@@ -0,0 +1,13 @@
+package com.glxp.mipsdl.thirddao.ctqyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.ctqyy.PlanInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+@DS("ctqyySql")
+public interface PlanInfoMapper extends BaseMapper<PlanInfoEntity> {
+
+}

src/main/java/com/glxp/mipsdl/thirddao/ctqyy/PresInfoMapper.java

@@ -0,0 +1,13 @@
+package com.glxp.mipsdl.thirddao.ctqyy;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.mipsdl.entity.ctqyy.PresInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+@DS("ctqyySql")
+public interface PresInfoMapper extends BaseMapper<PresInfoEntity> {
+
+}

src/main/resources/application-dev.yml

@@ -32,6 +32,15 @@ spring:
           username: root
           password: 123456
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver
+        ctqyySql:
+          #          jdbc-url: jdbc:oracle:thin:@192.168.10.8:1521/njxyy
+          #          username: SD_UDIJK
+          #          password: SD_UDIJK
+          #          driver-class-name: oracle.jdbc.driver.OracleDrive
+          url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ct?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: 123456
+          driver-class-name: com.p6spy.engine.spy.P6SpyDriver
       hikari:
         connection-timeout: 60000
         maximum-pool-size: 60

src/main/resources/mybatis/mapper/other/ctqyy/PhysicDictMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.PhysicDictMapper">
+
+</mapper>

src/main/resources/mybatis/mapper/other/ctqyy/PlanInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.PlanInfoMapper">
+
+</mapper>

src/main/resources/mybatis/mapper/other/ctqyy/PresInfoMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.glxp.mipsdl.thirddao.ctqyy.PresInfoMapper">
+
+</mapper>