From 41fb2ae361f2a94805eea73b107641cb09edc830 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Sat, 16 Nov 2024 15:34:40 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bases/controller/PartInputController.java   |  5 +++++
 .../business/bases/entity/PartCheckVo.java      |  2 +-
 .../business/bases/entity/PartInputVo.java      |  7 +++----
 src/main/resources/application.yml              | 17 ++++++++++++-----
 .../resources/mappers/bases/PartCheckMapper.xml | 10 +++++-----
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
index 90efd9b..a74cfb8 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartInputController.java
@@ -68,6 +68,11 @@ public class PartInputController {
             List<PartInputVo> list = service.findByPage(dto);
             final int[] num = {1};
             list.forEach(vo->{
+                if("0".equals(vo.equals(vo.getIsFlag()))){
+                    vo.setIsFlag("否");
+                }else{
+                    vo.setIsFlag("是");
+                }
                 vo.setXh(num[0]);
                 num[0]++;
             });
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartCheckVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartCheckVo.java
index d8220a2..3ba4e1e 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartCheckVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartCheckVo.java
@@ -36,7 +36,7 @@ public class PartCheckVo {
     /**
      * 开始时间
      */
-    @Excel(name = "盘点起止时间", width = 10.0, orderNum = "3")
+    @Excel(name = "盘点起止时间", width = 20.0, orderNum = "3")
     private String times;
 
     private String startTime;
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java
index bffd0c1..db793e1 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartInputVo.java
@@ -3,7 +3,6 @@ package com.bonus.gzgqj.business.bases.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.bonus.gzgqj.business.plan.entity.FileUploadVo;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 
 import java.util.List;
 
@@ -23,7 +22,7 @@ public class PartInputVo {
     /**
      * 编码
      */
-    @Excel(name = "入库编号", width = 10.0, orderNum = "1")
+    @Excel(name = "入库编号", width = 12.0, orderNum = "1")
     private String code;
     /**
      * 入库人
@@ -38,12 +37,12 @@ public class PartInputVo {
     /**
      * 备注
      */
-    @Excel(name = "备注", width = 10.0, orderNum = "5")
+    @Excel(name = "备注", width = 20.0, orderNum = "5")
     private String remark;
     /**
      * 单价是否录入
      */
-    @Excel(name = "备注", width = 10.0, orderNum = "6",dict = "isFlag=0_否,1_是")
+    @Excel(name = "单价是否录入", width = 15.0, dict = "0_否,1_是",orderNum = "6")
     private String isFlag;
 
     /**
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6c33e7f..f4604ef 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,12 +11,19 @@ spring:
     url: jdbc:mysql://192.168.0.14:1109/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     username: root
     password: zhzadmin@gzimtcs14!
+#    url: jdbc:mysql://127.0.0.1:3306/gzimtcs?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+#    username: mroot
+#    password: bonus@admin123
     type: com.alibaba.druid.pool.DruidDataSource
-  redis:
-    host: 192.168.0.14
-    port: 2003
-    password: Fyzbns@Redis123!
-    database: 7
+#  redis:
+#    host: 192.168.0.14
+#    port: 2003
+#    password: Fyzbns@Redis123!
+#    database: 7
+    redis:
+      host: 127.0.0.1
+      port: 6379
+      database: 7
   servlet:
     multipart:
       max-file-size: -1
diff --git a/src/main/resources/mappers/bases/PartCheckMapper.xml b/src/main/resources/mappers/bases/PartCheckMapper.xml
index 2be1e7e..106ac89 100644
--- a/src/main/resources/mappers/bases/PartCheckMapper.xml
+++ b/src/main/resources/mappers/bases/PartCheckMapper.xml
@@ -87,15 +87,15 @@
 
     </select>
     <select id="getAddMsg" resultType="java.lang.String">
-        select   ANY_VALUE(  CONCAT(part_name,":",num,"=>",SUM(check_num))) detail
+        select  ANY_VALUE(CONCAT(part_name,'-',part_model,":",SUM(num),"=>",SUM(check_num))) detail
         from  t_part_inventory_details
-        where inv_id=#{id} and add_num>=0
-        GROUP BY part_name
+        where inv_id=#{id} and add_num>0
+        GROUP BY part_name,part_model
     </select>
     <select id="getSubMsg" resultType="java.lang.String">
-        select   ANY_VALUE(  CONCAT(part_name,":",num,"=>",SUM(check_num))) detail
+        select   ANY_VALUE(CONCAT(part_name,'-',part_model,":",SUM(num),"=>",SUM(check_num))) detail
         from  t_part_inventory_details
         where inv_id=#{id}  and sub_num>0
-        GROUP BY part_name
+        GROUP BY part_name,part_model
     </select>
 </mapper>
\ No newline at end of file