南靖接口重整

src/main/java/com/glxp/mipsdl/client/ptxhyy/PtxhyyClient.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -569,6 +570,8 @@ public class PtxhyyClient extends CommonHttpClient {
     public BaseResponse getBasicProject(DlThirdProjectRequest dlThirdProjectRequest) {
 
         dlThirdProjectRequest.setFygb("14");
+        dlThirdProjectRequest.setPage(1);
+        dlThirdProjectRequest.setLimit(10000);
         String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(null) + "/YLSF", dlThirdProjectRequest);
         BaseResponse<PageSimpleResponse<HisProductEntity>> baseResponse =
                 JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<HisProductEntity>>>() {
@@ -577,6 +580,9 @@ public class PtxhyyClient extends CommonHttpClient {
             PageSimpleResponse<HisProductEntity> pageSimpleResponse = baseResponse.getData();
             List<HisProductEntity> list = pageSimpleResponse.getList();
             List<BasicSkProjectEntity> basicSkProjectEntities = new ArrayList<>();
+            int index = 1;
+            int index2 = 1;
+            log.info("总数：" + list.size());
             for (HisProductEntity hisProductEntity : list) {
                 BasicSkProjectEntity basicSkProjectEntity = new BasicSkProjectEntity();
                 basicSkProjectEntity.setCode(hisProductEntity.getFyxh());
@@ -589,10 +595,15 @@ public class PtxhyyClient extends CommonHttpClient {
                 basicSkProjectEntity.setGgxh(hisProductEntity.getSm());
                 basicSkProjectEntity.setUnit(hisProductEntity.getFydw());
                 basicSkProjectEntity.setPrice(hisProductEntity.getFydj());
-                basicSkProjectEntities.add(basicSkProjectEntity);
+                if (hisProductEntity.getZfpb().equals("0")) {
+                    log.info("在用" + index++ + "");
+                    basicSkProjectEntities.add(basicSkProjectEntity);
+                } else {
+                    log.info("作废" + index2++ + "");
+                }
             }
             PageSimpleResponse<BasicSkProjectEntity> dataResponse = new PageSimpleResponse<>();
-            dataResponse.setTotal(basicSkProjectEntities.size() + 0l);
+            dataResponse.setTotal(-666l);
             dataResponse.setList(basicSkProjectEntities);
             return ResultVOUtils.success(dataResponse);
         }

src/main/java/com/glxp/mipsdl/client/ptxhyy/entity/HisProductEntity.java

@@ -18,4 +18,5 @@ public class HisProductEntity {
     private String fygb;
     private String fygbmc;
     private String RN;
+    private String zfpb;
 }

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

@@ -5,13 +5,16 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.mipsdl.client.ClientProcessor;
+import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
 import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
+import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
 import com.glxp.mipsdl.req.base.UdiwmsQueryUdiInvProductsRequest;
 import com.glxp.mipsdl.req.base.forthird.ForBasicProductsSearchFilter;
 import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeFilter;
 import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter;
 import com.glxp.mipsdl.res.BaseResponse;
+import com.glxp.mipsdl.service.auth.AuthWarehouseService;
 import com.glxp.mipsdl.util.ResultVOUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,6 +35,8 @@ public class ExNjxyyController {
 
     @Resource
     BasicUdirelDao basicUdirelDao;
+    @Resource
+    AuthWarehouseDao authWarehouseDao;
 
     /**
      * B001 查询指定科室高值/普耗库存
@@ -57,9 +62,19 @@ public class ExNjxyyController {
             forInvProductsFilter.setLimit(20);
         }
         ForInvProductsFilter newRequest = new ForInvProductsFilter();
+
+        if (StrUtil.isEmpty(forInvProductsFilter.getInvCode()))
+            return ResultVOUtils.error(500, "科室编码不能为空！");
+        AuthWarehouseEntity authWarehouseEntity = authWarehouseDao.selectOne(new QueryWrapper<AuthWarehouseEntity>().eq("thirdId", forInvProductsFilter.getInvCode()).last("limit 1"));
+        if (authWarehouseEntity == null)
+            return ResultVOUtils.error(500, "科室编码未对照！");
+        else
+            forInvProductsFilter.setInvCode(authWarehouseEntity.getCode());
+
         if (StrUtil.isNotEmpty(forInvProductsFilter.getUdiCode())) {
             newRequest.setPage(forInvProductsFilter.getPage());
             newRequest.setLimit(forInvProductsFilter.getLimit());
+            newRequest.setInvCode(forInvProductsFilter.getInvCode());
             newRequest.setUdiCode(forInvProductsFilter.getUdiCode());
             return ClientProcessor.getHttpClient().queryUdiHighInvProductsFilter(newRequest);
         } else {