1111

src/main/java/com/th/demo/service/impl/ware/StoreServiceImpl.java

@@ -126,7 +126,7 @@ public class StoreServiceImpl implements StoreService {
         // 4: 出库已标记入仓
         if (outFlag.equals("0")){
             out_lag = "0";
-            localFlag="0";
+            localFlag="";
             outBound = "";
         }else if (outFlag.equals("1")){
             out_lag = "1";
@@ -138,7 +138,7 @@ public class StoreServiceImpl implements StoreService {
             outBound = "";
         }else if (outFlag.equals("3")){
             out_lag = "0";
-            localFlag="0";
+            localFlag="";
             outBound = "已入仓";
         }else if (outFlag.equals("4")){
             out_lag = "1";
@@ -489,7 +489,7 @@ public class StoreServiceImpl implements StoreService {
         // 4: 出库已标记入仓
         if (outFlag.equals("0")){
             out_lag = "0";
-            localFlag="0";
+            localFlag="";
             outBound = "";
         }else if (outFlag.equals("1")){
             out_lag = "1";
@@ -501,7 +501,7 @@ public class StoreServiceImpl implements StoreService {
             outBound = "";
         }else if (outFlag.equals("3")){
             out_lag = "0";
-            localFlag="0";
+            localFlag="";
             outBound = "已入仓";
         }else if (outFlag.equals("4")){
             out_lag = "1";

src/main/resource/localhost/db.properties

@@ -1,13 +1,13 @@
-jdbc.driverClass=com.mysql.jdbc.Driver
-jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
-jdbc.user=root
-jdbc.password=root
-
 #jdbc.driverClass=com.mysql.jdbc.Driver
-#jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
+#jdbc.jdbcUrl=jdbc:mysql://172.18.200.32:3306/ware_zg?characterEncoding=utf8
 #jdbc.user=root
 #jdbc.password=root
 
+jdbc.driverClass=com.mysql.jdbc.Driver
+jdbc.jdbcUrl=jdbc:mysql://localhost:3306/ware_zg?characterEncoding=utf8
+jdbc.user=root
+jdbc.password=root
+
 #jdbc.driverClass=com.mysql.jdbc.Driver
 #jdbc.jdbcUrl=jdbc:mysql://60.205.9.174:3309/ware_zg?useUnicode=true&characterEncoding=utf8
 #jdbc.user=root

src/main/resource/mapper/home/HomeMapper.xml

@@ -18,9 +18,9 @@
     </select>
 
     <select id="selectdrawLine2" resultMap="BaseResultMap" parameterType="java.lang.String" >
-        SELECT tmm.name AS value1,sum(tws.weight) as value2 FROM t_ware_store tws, t_maint_material tmm
+        SELECT tmm.code AS value1,sum(tws.weight) as value2 FROM t_ware_store tws, t_maint_material tmm
         where 1=1 AND tws.material_id = tmm.id
-          AND tws.cancel_flag ='0' and tws.out_flag ='0' and tws.lock_flag ='0' group by tmm.name order by value2 desc
+          AND tws.cancel_flag ='0' and tws.out_flag ='0' and tws.lock_flag ='0' group by tmm.code order by value2 desc
     </select>
 
     <select id="selectdrawLine3" resultMap="BaseResultMap" parameterType="java.lang.String" >

src/main/resource/mapper/ware/StoreMapper.xml

@@ -525,7 +525,10 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = #{param18,jdbcType=VARCHAR}
-    and t.lock_flag = #{param19,jdbcType=VARCHAR}
+      <if test="param19 != null and param19 !=''">
+        and t.lock_flag = #{param19,jdbcType=VARCHAR}
+      </if>
+
       <if test="param20 != null and param20 !=''">
         and t.out_bound = #{param20,jdbcType=VARCHAR}
       </if>
@@ -583,7 +586,9 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
     and t.belong_id = #{param8,jdbcType=VARCHAR}
     and t.cancel_flag = '0'
     and t.out_flag = #{param18,jdbcType=VARCHAR}
-    and t.lock_flag = #{param19,jdbcType=VARCHAR}
+      <if test="param19 != null and param19 != ''">
+        and t.lock_flag = #{param19,jdbcType=VARCHAR}
+      </if>
     <if test="param20 != null and param20 !=''">
       and t.out_bound = #{param20,jdbcType=VARCHAR}
     </if>