From ede6b0244ae9724c3fcd87da20acb0201d94a4f3 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 14 Feb 2025 15:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=BD=AC=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E8=A1=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/auth/LoginController.java  | 14 +++++-----
 .../inout/IoCodeTempController.java           | 26 +++++++++----------
 .../service/collect/RelCodeBatchService.java  |  2 --
 .../api/service/inout/IoSplitCodeService.java |  3 ++-
 4 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java
index 03fe98040..2f2ffa05a 100644
--- a/src/main/java/com/glxp/api/controller/auth/LoginController.java
+++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java
@@ -467,14 +467,14 @@ public class LoginController extends BaseController {
 
         OutputStream os = null;
         try {
-                // 读取图片
-                BufferedImage image = ImageIO.read(new FileInputStream(file));
-                response.setContentType("image/png");
-                os = response.getOutputStream();
+            // 读取图片
+            BufferedImage image = ImageIO.read(new FileInputStream(file));
+            response.setContentType("image/png");
+            os = response.getOutputStream();
 
-                if (image != null) {
-                    ImageIO.write(image, "png", os);
-                }
+            if (image != null) {
+                ImageIO.write(image, "png", os);
+            }
         } catch (IOException e) {
             e.printStackTrace();
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
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 3b3404515..d56f10fbd 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -185,20 +185,20 @@ public class IoCodeTempController extends BaseController {
         String code = addEnterCodeRequest.getCode();
         //先判断是否已完成
         IoCollectOrderBackup byBillNo = ioCollectOrderBackupService.getByBillNo(code);
-        if (byBillNo != null){
+        if (byBillNo != null) {
             return ResultVOUtils.error(500, "该单据已处理完成，请勿重复处理！");
         }
 
         //取药确认
-        if (addEnterCodeRequest.getSelectType() != null){
-                List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
-                        .or()
-                        .eq(SysOrderLed::getOrderId, "")
-                        .orderByAsc(SysOrderLed::getLedNum));
-                //如果为null 当前灯组已满
-                if (orderLeds == null || orderLeds.size() == 0){
-                    return ResultVOUtils.error(500, "灯组已满!");
-                }
+        if (addEnterCodeRequest.getSelectType() != null) {
+            List<SysOrderLed> orderLeds = sysOrderLedService.list(new LambdaQueryWrapper<SysOrderLed>().isNull(SysOrderLed::getOrderId)
+                    .or()
+                    .eq(SysOrderLed::getOrderId, "")
+                    .orderByAsc(SysOrderLed::getLedNum));
+            //如果为null 当前灯组已满
+            if (orderLeds == null || orderLeds.size() == 0) {
+                return ResultVOUtils.error(500, "灯组已满!");
+            }
         }
 
         IoCollectOrderResponse collectOrder = collectOrderService.unionSearch(null, addEnterCodeRequest.getBusType(), code);
@@ -1357,7 +1357,7 @@ public class IoCodeTempController extends BaseController {
     }
 
 
-     @Autowired
+    @Autowired
     RelCodeBatchService relCodeBatchService;
 
 //    @Transactional(rollbackFor = Exception.class)
@@ -1649,7 +1649,7 @@ public class IoCodeTempController extends BaseController {
 
             //如果是阿里拉的单据会有批次号
             IoCollectOrderCodeMan codeMan = ioCollectOrderCodeManService.getOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>().eq(IoCollectOrderCodeMan::getUdiCode, code));
-            if (codeMan != null){
+            if (codeMan != null) {
                 codeEnttity.setBatchNo(codeMan.getBatchNo());
                 codeEnttity.setProduceDate(codeMan.getProductDate());
                 codeEnttity.setExpireDate(codeMan.getExpireDate());
@@ -1941,7 +1941,7 @@ public class IoCodeTempController extends BaseController {
             relCodeBatchService.threadUpdateIoCodeTempEntity(code);
     }
 
-     @Autowired
+    @Autowired
     RelCodeDetailService relCodeDetailService;
 
     //前端扫码提交(药品）
diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
index a5c17173a..8d84b00c3 100644
--- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
+++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
@@ -397,8 +397,6 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
                 }
             }
         });
-
-
     }
 
 
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 15e9fc36d..68e4cfd28 100644
--- a/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
@@ -406,6 +406,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
         for (IoCollectOrderBiz ioCollectOrderBiz : collectOrderBizs) {
             IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
             BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
+            ioCollectOrderBizBackup.setId(IdUtil.getSnowflake().nextId());
             ioCollectOrderBizBackups.add(ioCollectOrderBizBackup);
         }
         ioCollectOrderBizBackupService.saveBatch(ioCollectOrderBizBackups);
@@ -650,7 +651,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
                 collectOrderBiz.setAutoTagStatus(1);
         }
         ThreadUtil.execAsync(() -> {
-            ioCollectLedGroupService.openLed(collectOrderBizs);
+                    ioCollectLedGroupService.openLed(collectOrderBizs);
                 }
         );
         collectOrderBizService.updateBatchById(collectOrderBizs);