南靖UDI码有没有收费出库

src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java

@@ -25,35 +25,31 @@ import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
 import com.glxp.mipsdl.dao.inout.IoCodeDao;
 import com.glxp.mipsdl.dao.inout.IoOrderDao;
 import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao;
-import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity;
-import com.glxp.mipsdl.entity.njxyy.ProductEntity;
-import com.glxp.mipsdl.entity.njxyy.SickerEntity;
-import com.glxp.mipsdl.req.ctqyy.CtqyyRequest;
-import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
-import com.glxp.mipsdl.req.njxyy.PostThrProductRequest;
-import com.glxp.mipsdl.req.post.*;
-import com.glxp.mipsdl.res.ctqyy.CtBaseResponse;
-import com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper;
 import com.glxp.mipsdl.dao.thrsys.*;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.basic.BasicUdirelEntity;
 import com.glxp.mipsdl.entity.inout.*;
+import com.glxp.mipsdl.entity.njxyy.ProductEntity;
+import com.glxp.mipsdl.entity.njxyy.SickerEntity;
 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.*;
+import com.glxp.mipsdl.req.ctqyy.GetSickRequest;
+import com.glxp.mipsdl.req.njxyy.PostThrProductRequest;
 import com.glxp.mipsdl.req.phxyy.PhBusTypeRequest;
 import com.glxp.mipsdl.req.phxyy.PhOrderRequest;
-import com.glxp.mipsdl.req.phxyy.PhProductRequest;
 import com.glxp.mipsdl.req.phxyy.PhUnitRequest;
+import com.glxp.mipsdl.req.post.*;
 import com.glxp.mipsdl.res.BaseResponse;
 import com.glxp.mipsdl.res.PageSimpleResponse;
 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.thrsys.ThrSystemDetailService;
+import com.glxp.mipsdl.thirddao.njxyy.ThrCorpMapper;
 import com.glxp.mipsdl.thirddao.njxyy.ThrProductsMapper;
 import com.glxp.mipsdl.thirddao.njxyy.ThrSickerMapper;
 import com.glxp.mipsdl.util.*;
@@ -63,7 +59,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -149,9 +148,9 @@ public class NjxyyClient extends CommonHttpClient {
                 .lambda()
                 .like(StringUtils.isNotBlank(getSickRequest.getCode()), SickerEntity::getIdentityNo, getSickRequest.getCode())
                 .like(StringUtils.isNotBlank(getSickRequest.getName()), SickerEntity::getName, getSickRequest.getName()));
-
+        List<BasicSkSickerResponse> basicSkSickerResponses = new ArrayList<>();
         productEntityIPage.getRecords().forEach(sickerEntity -> {
-            BasicSkSickerResponse.builder()
+            basicSkSickerResponses.add(BasicSkSickerResponse.builder()
                     .sickerId(sickerEntity.getInpatientID())
                     .code(sickerEntity.getCurno())
                     .name(sickerEntity.getName())
@@ -161,13 +160,11 @@ public class NjxyyClient extends CommonHttpClient {
                     .gender(sickerEntity.getSex())
                     .bornDate(sickerEntity.getBirthDate())
                     .guardianName(sickerEntity.getOperName())
-                    .build();
+                    .build());
-
         });
-
+        PageSimpleResponse<BasicSkSickerResponse> pageSimpleResponse = new PageSimpleResponse<>();
-        PageSimpleResponse<SickerEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(productEntityIPage.getTotal());
-        pageSimpleResponse.setList(productEntityIPage.getRecords());
+        pageSimpleResponse.setList(basicSkSickerResponses);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
@@ -663,10 +660,22 @@ public class NjxyyClient extends CommonHttpClient {
                 return ResultVOUtils.error(500, "耗材数量不能为空！");
             }
             codeRequest.setCount(IntUtil.value(highvalue.getQuantity()));
-            if(codeRequest.getCount() > 0)
+            if (codeRequest.getCount() > 0) {
+                //收费入库
                 ioOrderRequest.setAction("SC20250702001");
-            else
+            } else {
+                //收费退库
                 ioOrderRequest.setAction("SC20250702002");
+                //判断库存
+                List<IoCodeEntity> codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002"));
+                if (CollUtil.isEmpty(codeEntities)) {
+                    codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002"));
+                    if (CollUtil.isEmpty(codeEntities)) {
+                        return ResultVOUtils.error(500, "该UDI码未出库！");
+                    }
+                }
+            }
+
             codeRequestList.add(codeRequest);
         }
         forInvOutScanCodeRequest.setCodeRequestList(codeRequestList);