新增项目组套接口

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

@@ -1,6 +1,7 @@
 package com.glxp.mipsdl.client;
 
 import com.glxp.mipsdl.req.base.*;
+import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.post.*;
@@ -172,4 +173,8 @@ public interface BaseHttpClient {
     BaseResponse getSickPescribe(GetSickPrescribeRequest getSickPrescribeRequest);
 
 
+    /**
+     * 获取项目组套字典
+     */
+    BaseResponse getBasicProject(DlThirdProjectRequest dlThirdProjectRequest);
 }

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

@@ -25,6 +25,7 @@ import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
+import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.post.*;
@@ -244,4 +245,11 @@ public abstract class CommonHttpClient implements BaseHttpClient {
     }
 
 
+    /**
+     * 获取项目组套字典
+     */
+    @Override
+    public BaseResponse getBasicProject(DlThirdProjectRequest dlThirdProjectRequest) {
+        return null;
+    }
 }

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

@@ -20,17 +20,11 @@ import com.glxp.mipsdl.dao.thrsys.ThrInvWarehouseDao;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.mipsdl.http.HttpClient;
 import com.glxp.mipsdl.req.base.*;
-import com.glxp.mipsdl.req.ctqyy.CtqPostRelProductRequest;
+import com.glxp.mipsdl.req.ctqyy.*;
-import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
-import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest;
-import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.req.zzzyy.ZzzyyRequest;
 import com.glxp.mipsdl.res.BaseResponse;
-import com.glxp.mipsdl.res.udiwms.BasicSkPrescribeResponse;
+import com.glxp.mipsdl.res.udiwms.*;
-import com.glxp.mipsdl.res.udiwms.BasicSkSickerResponse;
-import com.glxp.mipsdl.res.udiwms.UdiRelevanceResponse;
-import com.glxp.mipsdl.res.udiwms.ZzzyyProductsResponse;
 import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.service.thrsys.ThrCorpService;
 import com.glxp.mipsdl.service.thrsys.ThrSystemDetailService;
@@ -274,6 +268,38 @@ public class CtqyyClient extends CommonHttpClient {
     }
 
 
+    /**
+     * 获取项目组套字典
+     *
+     * @param dlThirdProjectRequest
+     * @return
+     */
+    @Override
+    public BaseResponse getBasicProject(DlThirdProjectRequest dlThirdProjectRequest) {
+        CtqyyRequest ctqyyRequest = new CtqyyRequest();
+        ctqyyRequest.setMsgHeader(getMsgHeader("getMaterialDict"));
+        ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(dlThirdProjectRequest));
+        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URI_GET_PROJECT), ctqyyRequest);
+        response = parserResult(response);
+        try {
+            BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
+            Map map = (Map) baseResponse.getData();
+            List<BasicSkProjectResponse> basicSkProjectResponses = JSON.parseArray(map.get("list") + "", BasicSkProjectResponse.class);
+            for (BasicSkProjectResponse basicSkProjectResponse : basicSkProjectResponses) {
+
+            }
+            map.put("list", JSON.toJSON(basicSkProjectResponses));
+            baseResponse.setData("");
+            baseResponse.setData(map);
+            return baseResponse;
+        } catch (Exception e) {
+            log.error("解析长泰医院智业返回项目信息数据异常，返回结果：{}", response);
+            log.error("异常信息：{}", e);
+            return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
+        }
+    }
+
+
     @Override
     public BaseResponse getOrders(UdiwmsOrderQueryRequest udiwmsOrderQueryRequest) {
         return null;

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

@@ -69,6 +69,12 @@ public interface Constants {
      */
     String URI_GET_SICKER_PRESCIRBE = "sickPrescribeUrl";
 
+
+    /**
+     * 获取组套项目
+     */
+    String URI_GET_PROJECT = "basicProjectUrl";
+
     //上传数据到UDI管理系统URL名称合集
 
     /**

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

@@ -3,6 +3,7 @@ package com.glxp.mipsdl.controller;
 import com.glxp.mipsdl.client.ClientProcessor;
 import com.glxp.mipsdl.client.pzh.PzhzdClient;
 import com.glxp.mipsdl.req.base.*;
+import com.glxp.mipsdl.req.ctqyy.DlThirdProjectRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickPrescribeRequest;
 import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
 import com.glxp.mipsdl.req.post.PostRelProductRequest;
@@ -149,6 +150,17 @@ public class UdiWmsController {
     }
 
 
+    /**
+     * 获取项目组套字典
+     *
+     * @return
+     */
+    @PostMapping("/udiwms/erp/basic/getProject")
+    public BaseResponse getBasicProject(@RequestBody DlThirdProjectRequest dlThirdProjectRequest) {
+        return ClientProcessor.getHttpClient().getBasicProject(dlThirdProjectRequest);
+    }
+
+
     @PostMapping("/udiwms/erp/testThirdSys")
     public BaseResponse testThirdSys() {
         return ClientProcessor.getHttpClient().testConnect();

src/main/java/com/glxp/mipsdl/req/ctqyy/DlThirdProjectRequest.java

@@ -0,0 +1,13 @@
+package com.glxp.mipsdl.req.ctqyy;
+
+import com.glxp.mipsdl.req.base.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class DlThirdProjectRequest extends ListPageRequest {
+
+
+    private String lastUpdateTime;
+    private String thirdSys;
+
+}

src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkProjectDetailResponse.java

@@ -0,0 +1,40 @@
+package com.glxp.mipsdl.res.udiwms;
+
+import lombok.Data;
+
+@Data
+public class BasicSkProjectDetailResponse {
+
+
+    private Long id;
+
+    /**
+     * 耗材产品id
+     */
+    private Long relId;
+
+    /**
+     * 定数包模板id
+     */
+    private Long pId;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+
+    private String thrName;
+    private String thrCode;
+    private String measureCount;
+    private String measureUnit;
+    private String category;
+    private String frequency;
+    private String price;
+    private String ggxh;
+    private String remark;
+    private String createTime;
+    private String createUser;
+    private String updateTime;
+    private String updateUser;
+
+}

src/main/java/com/glxp/mipsdl/res/udiwms/BasicSkProjectResponse.java

@@ -0,0 +1,60 @@
+package com.glxp.mipsdl.res.udiwms;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class BasicSkProjectResponse {
+
+
+    private Long id;
+
+    /**
+     * 自定义编码
+     */
+    private String idCode;
+
+    /**
+     * 项目编码
+     */
+    private String code;
+
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    /**
+     * 类别
+     */
+    private String category;
+
+    /**
+     * 规格
+     */
+    private String ggxh;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Date createTime;
+
+    private String createUser;
+
+    private Date updateTime;
+
+    private String updateUser;
+
+    private String createByName;
+    /**
+     * 类型：1：定数包，内部使用；2：项目、组套外部关联
+     */
+    private Integer type;
+
+
+    private List<BasicSkProjectDetailResponse> basicSkProjectDetailResponses;
+}