From 0ffa77d1e0cc64b531e3c55fc450253d11499598 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 6 Sep 2024 19:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/inout/IoCodeTempController.java   | 12 ++++++------
 .../api/service/collect/IoCollectOriginService.java  |  2 ++
 .../glxp/api/service/inout/IoSplitCodeService.java   |  9 +++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index dc07e2d68..82c5e82e4 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -225,9 +225,9 @@ public class IoCodeTempController extends BaseController {
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         if (udiEntity == null) {
             String viewType = addEnterCodeRequest.getViewType();
-            if (viewType.equals("tagCode")){
+            if (viewType.equals("tagCode")) {
                 IoCollectOrder collectOrder = collectOrderService.getByBillNo(code);
-                if (collectOrder == null ){
+                if (collectOrder == null) {
                     //=============================================//
                     //本地数据库 无此单据时 触发 用billNo 到 处方下载方法 进行下载
                     CollectOrderRequest collectOrderRequest = new CollectOrderRequest();
@@ -235,23 +235,23 @@ public class IoCodeTempController extends BaseController {
                     collectOrderRequest.setWorkPlaceCode(collectOrderRequest.getWorkPlaceCode());
                     collectOrderRequest.setBillNo(code);
                     BaseResponse baseResponse = collectOriginService.downloadOrderV2(collectOrderRequest);
-                    if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()){
+                    if (ResultEnum.SUCCESS.getCode() == baseResponse.getCode()) {
                         collectOrder = collectOrderService.getByBillNo(code);
                         //=============================================//
                         BaseResponse response = ResultVOUtils.error(601, code);
                         response.setData(collectOrder);
                         return response;
-                    }else {
+                    } else {
                         BaseResponse response = ResultVOUtils.error(501, "UDI码格式错误");
                         response.setData(originCode);
                         return response;
                     }
-                }else {
+                } else {
                     BaseResponse response = ResultVOUtils.error(601, code);
                     response.setData(collectOrder);
                     return response;
                 }
-            } else{
+            } else {
                 String sptmtodi = systemParamConfigService.selectValueByParamKey(Constant.SPTM_TO_DI);
                 if (sptmtodi.equals("1")) {
                     if (code.length() == 13) {
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
index 7795b7c41..daf0994b8 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOriginService.java
@@ -2,6 +2,7 @@ package com.glxp.api.service.collect;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -16,6 +17,7 @@ import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.req.basic.GetSickPrescribeRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.BasicSkPrescribeResponse;
 import com.glxp.api.service.basic.*;
diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
index eefb8743d..46bfe88d7 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -587,10 +587,11 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
             removeIds.add(splitFifoCodeEntity.getId());
             IoSplitFifoInv splitFifoInv = splitFifoInvService.findByFifoCode(splitFifoCodeEntity);
             if (splitFifoInv != null) {
-                splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitCodeEntity.getTotalCount()));
-                splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitCodeEntity.getTotalCount()));
-                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
-                splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())));
+                splitFifoInv.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
+                int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
+                splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
+                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getOutCount()));
+                splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount()) - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount()));
                 splitFifoInvService.updateById(splitFifoInv);
             }
             if (count >= needCount) {