代码备份

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) {

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.*;

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.setOutCount(IntUtil.value(splitFifoInv.getOutCount()) + IntUtil.value(splitFifoCodeEntity.getTotalCount()));
-                splitFifoInv.setLockCount(IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitCodeEntity.getTotalCount()));
+                int lockCount = IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoCodeEntity.getTotalCount());
-                splitFifoInv.setReCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getOutCount())));
+                splitFifoInv.setLockCount(lockCount > 0 ? lockCount : 0);
-                splitFifoInv.setAvailableCount(IntUtil.value(splitFifoInv.getInCount() - IntUtil.value(splitFifoInv.getLockCount()) - IntUtil.value(splitFifoInv.getOutCount())));
+                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) {