From f42eaebbb66336c30a7bf76390f86c6d90e94fbb Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Mon, 21 Oct 2024 14:10:17 +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

---
 .../collect/IoCollectCodeBackupController.java     | 14 ++++++++------
 .../api/res/collect/CollectOrderBizResponse.java   |  3 +++
 src/main/resources/application-dev.yml             |  4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
index 4b38d2a25..5dbecbe93 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java
@@ -45,13 +45,13 @@ public class IoCollectCodeBackupController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         List<IoCollectCodeResponse> collectOrderCodeManResponses = ioCollectCodeBackService.filterList(IoCollectCodeRequest);
-        for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){
+        for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses) {
             if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
                 ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
             }
             IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo());
             ioCollectCodeResponse.setBillTime(byBillNo.getBillTime());
-            if (byBillNo.getRemark() != null){
+            if (byBillNo.getRemark() != null) {
                 ioCollectCodeResponse.setRemark(byBillNo.getRemark());
             }
         }
@@ -65,14 +65,15 @@ public class IoCollectCodeBackupController extends BaseController {
 
     /**
      * 根据id删除追溯码表
+     *
      * @param IoCollectCodeBackup
      * @return
      */
     @PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/deleteCollectCode")
     public BaseResponse deleteCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup) {
         boolean b = ioCollectCodeBackService.removeById(IoCollectCodeBackup);
-        if (!b){
-            return ResultVOUtils.error(500,"删除失败");
+        if (!b) {
+            return ResultVOUtils.error(500, "删除失败");
         }
         return ResultVOUtils.success("删除成功");
     }
@@ -80,6 +81,7 @@ public class IoCollectCodeBackupController extends BaseController {
 
     /**
      * 根据id删除追溯码表
+     *
      * @param IoCollectCodeBackup
      * @param bindingResult
      * @return
@@ -91,8 +93,8 @@ public class IoCollectCodeBackupController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         boolean b = ioCollectCodeBackService.updateById(IoCollectCodeBackup);
-        if (!b){
-            return ResultVOUtils.error(500,"更新失败");
+        if (!b) {
+            return ResultVOUtils.error(500, "更新失败");
         }
         return ResultVOUtils.success("更新成功");
     }
diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
index 4221ce66c..f533c6b7d 100644
--- a/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
+++ b/src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java
@@ -6,6 +6,9 @@ import lombok.Data;
 
 import java.util.Date;
 
+/**
+ * 业务详情
+ */
 @Data
 public class CollectOrderBizResponse {
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 550f24925..794856e96 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.206:3306/udiwms81?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: 123456
+    password: Glxp@6066
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20