src/main/java/com/th/demo/controller/home/HomeController.java

@@ -0,0 +1,85 @@
+package com.th.demo.controller.home;
+
+import com.th.demo.model.system.ResponseCodeMsg;
+import com.th.demo.model.system.Type;
+import com.th.demo.service.home.HomeService;
+import com.th.demo.service.ware.ChangeService;
+import com.th.demo.service.ware.CombineService;
+import com.th.demo.service.ware.StoreService;
+import com.th.demo.tools.JSONTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping(value = "/Home")
+public class HomeController {
+    @Autowired
+    public HomeService homeService;
+    String result = Type.FAIL;
+
+    @RequestMapping(value = "/querydrawLine1.do")//查询方法 前两个参数是分页参数
+    public String querydrawLine1(
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = homeService.querydrawLine1( userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
+    @RequestMapping(value = "/querydrawLine2.do")//查询方法 前两个参数是分页参数
+    public String querydrawLine2(
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = homeService.querydrawLine2( userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+    @RequestMapping(value = "/querydrawLine3.do")//查询方法 前两个参数是分页参数
+    public String querydrawLine3(
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = homeService.querydrawLine3( userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+    @RequestMapping(value = "/querydrawLine4.do")//查询方法 前两个参数是分页参数
+    public String querydrawLine4(
+            HttpServletRequest request) {
+
+        try {
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = homeService.querydrawLine4( userId, belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+}

src/main/java/com/th/demo/controller/ware/StoreController.java

@@ -143,6 +143,55 @@ public class StoreController {
         }
     }
 
+    @RequestMapping(value = "/queryTotal.do")
+    public String queryTotal(
+                             String wareName,
+                             String stackName,
+                             String model,
+                             String materialName,
+                             String standard,
+                             String customerName,
+                             String fkcustmerName,
+                             String plateNo,
+                             String ordNo,
+                             String contractNo,
+                             String packNo,
+                             String outFlag,
+                             String fromDate,
+                             String toDate,
+                             HttpServletRequest request) {
+
+        try {
+            Date fromDate2 = new Date();
+            Date toDate2 = new Date();
+            if (fromDate != null && fromDate!= ""){
+                fromDate2 = DateTools.StrToDate(fromDate, "yyyy-MM-dd HH:mm:ss");
+            }else {
+                fromDate2 =null;
+            }
+            if (toDate != null && toDate != ""){
+                toDate2 = DateTools.StrToDate(toDate, "yyyy-MM-dd HH:mm:ss");
+            }else {
+                toDate2 =null;
+            }
+            String userId = (String) request.getAttribute("userId");
+            String belongId = (String) request.getAttribute("belongId");
+            result = storeService.queryTotal(wareName,
+                    stackName,
+                    model,
+                    materialName,
+                    standard,
+                    customerName,
+                    userId,
+                    belongId,plateNo,ordNo,contractNo,fkcustmerName,packNo,outFlag,fromDate2,toDate2);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            result = JSONTools.toString(ResponseCodeMsg.CODE_EX, ex.getMessage());
+        } finally {
+            return result;
+        }
+    }
+
     @RequestMapping(value = "/modifyCustomer.do")
     public String modifyCustomer(String id,String customerNameOld,String customerNameNew,HttpServletRequest request) {
 

src/main/java/com/th/demo/mapping/home/HomeMapper.java

@@ -0,0 +1,16 @@
+package com.th.demo.mapping.home;
+
+import com.th.demo.model.finance.AccountDetail;
+import com.th.demo.model.finance.RcvMoney;
+import com.th.demo.model.home.HomeValue;
+
+import java.util.List;
+
+public interface HomeMapper {
+    List<HomeValue> selectdrawLine1();
+    List<HomeValue> selectdrawLine2();
+    List<HomeValue> selectdrawLine3();
+    HomeValue selectdrawLine4();
+
+
+}

src/main/java/com/th/demo/mapping/ware/StoreMapper.java

@@ -39,6 +39,13 @@ public interface StoreMapper {
                             String packNo, List<String> packNos,
                             String out_lag, String localFlag, String outBound, Date fromDate, Date toDate);
 
+    List<TotalRecord> selectStoreTotal(String wareName, String stackName, String model, String materialName, String standard,
+                            String customerName, String userId, String belongId,
+                            String fkcustmerName, String plateNo, String ordNo, String contractNo,
+                            List<String> plateNos, List<String> ordNos, List<String> contractNos,
+                            String packNo, List<String> packNos,
+                            String out_lag, String localFlag, String outBound, Date fromDate, Date toDate);
+
     int updateForUpDownByLayer(String wareName, String stackName, String userId, String belongId, int min, int max, int i);
 
     int updateForUpDownByStep(String wareName, String stackName, String userId, String belongId, int min, int max, int i);

src/main/java/com/th/demo/model/home/HomeValue.java

@@ -0,0 +1,31 @@
+package com.th.demo.model.home;
+
+public class HomeValue {
+    String value1;
+    String value2;
+    String value3;
+
+    public String getValue1() {
+        return value1;
+    }
+
+    public void setValue1(String value1) {
+        this.value1 = value1;
+    }
+
+    public String getValue2() {
+        return value2;
+    }
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
+    }
+
+    public String getValue3() {
+        return value3;
+    }
+
+    public void setValue3(String value3) {
+        this.value3 = value3;
+    }
+}

src/main/java/com/th/demo/service/home/HomeService.java

@@ -0,0 +1,9 @@
+package com.th.demo.service.home;
+
+public interface HomeService {
+    String querydrawLine1(String userId, String belongId);
+    String querydrawLine2(String userId, String belongId);
+    String querydrawLine3(String userId, String belongId);
+    String querydrawLine4(String userId, String belongId);
+
+}

src/main/java/com/th/demo/service/impl/home/HomeServiceImpl.java

@@ -0,0 +1,48 @@
+package com.th.demo.service.impl.home;
+
+import com.th.demo.mapping.home.HomeMapper;
+import com.th.demo.model.home.HomeValue;
+import com.th.demo.service.home.HomeService;
+import com.th.demo.tools.JSONTools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service("HomeService")
+public class HomeServiceImpl implements HomeService {
+
+    @Autowired
+    HomeMapper homeMapper;
+    String result = "";
+
+    int num = 0;
+
+
+    @Override
+    public String querydrawLine1(String userId, String belongId) {
+        List<HomeValue> homeValue = homeMapper.selectdrawLine1();
+        result = JSONTools.toString(homeValue);
+        return result;
+    }
+
+    @Override
+    public String querydrawLine2(String userId, String belongId) {
+        List<HomeValue> homeValue = homeMapper.selectdrawLine2();
+        result = JSONTools.toString(homeValue);
+        return result;
+    }
+
+    @Override
+    public String querydrawLine3(String userId, String belongId) {
+        List<HomeValue> homeValue = homeMapper.selectdrawLine3();
+        result = JSONTools.toString(homeValue);
+        return result;
+    }
+
+    @Override
+    public String querydrawLine4(String userId, String belongId) {
+        HomeValue homeValue = homeMapper.selectdrawLine4();
+        result = JSONTools.toString(homeValue);
+        return result;
+    }
+}

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";
@@ -459,6 +459,65 @@ public class StoreServiceImpl implements StoreService {
         return result;
     }
 
+    @Override
+    public String queryTotal(String wareName, String stackName, String model, String materialName, String standard, String customerName, String userId, String belongId, String plateNo, String ordNo, String contractNo, String fkcustmerName, String packNo, String outFlag, Date fromDate, Date toDate) {
+        List<String> pltNos =new ArrayList<>() ;
+        List<String> ordNos =new ArrayList<>() ;
+        List<String> contractNos =new ArrayList<>() ;
+        List<String> packNos =new ArrayList<>() ;
+        if (plateNo.indexOf(",") != -1){
+            pltNos = Arrays.asList(plateNo.split(","));
+        }
+        if (ordNo.indexOf(",") != -1){
+            ordNos = Arrays.asList(ordNo.split(","));
+        }
+        if (contractNo.indexOf(",") != -1){
+            contractNos = Arrays.asList(contractNo.split(","));
+        }
+        if (packNo.indexOf(",") != -1){
+            packNos = Arrays.asList(packNo.split(","));
+        }
+
+        String out_lag ="0";
+        String localFlag = "0";
+        String outBound = "";
+        // add by zhangqy 库存信息增加状态信息，
+        // 0: 正常在库
+        // 1: 已出库
+        // 2: 在库已锁定
+        // 3: 在库已标记入仓
+        // 4: 出库已标记入仓
+        if (outFlag.equals("0")){
+            out_lag = "0";
+            localFlag="";
+            outBound = "";
+        }else if (outFlag.equals("1")){
+            out_lag = "1";
+            localFlag="1";
+            outBound = "";
+        }else if (outFlag.equals("2")){
+            out_lag = "0";
+            localFlag="1";
+            outBound = "";
+        }else if (outFlag.equals("3")){
+            out_lag = "0";
+            localFlag="";
+            outBound = "已入仓";
+        }else if (outFlag.equals("4")){
+            out_lag = "1";
+            localFlag="1";
+            outBound = "已入仓";
+        }
+
+
+        List<TotalRecord> list =storeMapper.selectStoreTotal(wareName,stackName,model,materialName,standard,    customerName,   userId,belongId,
+                fkcustmerName,plateNo,ordNo,contractNo,pltNos,ordNos,contractNos,packNo,packNos,
+                out_lag,localFlag,outBound,fromDate,toDate);
+        result = JSONTools.toStringyyyyMMddHHmmss(list);
+
+        return result;
+    }
+
     private MoveRecord getMoveRecord(Store store, Stack fromStack, Stack toStack, int layerNew, int layerOld, String userId) {
         MoveRecord moveRecord = new MoveRecord();
         moveRecord.setWareNameOld(fromStack.getWare().getName());

src/main/java/com/th/demo/service/ware/StoreService.java

@@ -40,4 +40,9 @@ public interface StoreService {
     String lockAndUnlock(String json,String lockFlag,String userId,String belongId);
 
     String Outbound(String json,String outbound,String userId,String belongId);
+
+    String queryTotal(String wareName, String stackName, String model, String materialName, String standard,
+                      String customerName, String userId, String belongId,
+                      String plateNo, String ordNo, String contractNo, String fkcustmerName, String packNo,
+                      String outFlag, Date fromDate, Date toDate);
 }

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

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.th.demo.mapping.home.HomeMapper" >
+    <resultMap id="BaseResultMap" type="com.th.demo.model.home.HomeValue" >
+        <result column="value1" property="value1" jdbcType="VARCHAR" />
+        <result column="value2" property="value2" jdbcType="VARCHAR" />
+        <result column="value3" property="value3" jdbcType="VARCHAR" />
+    </resultMap>
+
+    <select id="selectdrawLine1" resultMap="BaseResultMap" >
+        SELECT CC.MONTH_NUM AS value1 , (CC.inweight + CC.outweight) AS value2
+        FROM (select SUBSTR(A.date_note,6) AS MONTH_NUM , A.weight as inweight , IFNULL(B.weight,0) as outweight,A.date_note
+              from (select sum(twir.weight) weight ,DATE_FORMAT(twir.add_time,'%Y-%m') as date_note
+                    from t_ware_in_record twir where twir.cancel_flag ='0' group by date_note) A
+                       LEFT JOIN (select sum(twor.weight) weight,DATE_FORMAT(twor.add_time,'%Y-%m') as date_note
+                                  from t_ware_out_record twor where twor.cancel_flag ='0' group by date_note) B
+                                 ON A.date_note = B.date_note ORDER BY A.date_note DESC LIMIT 12) CC ORDER BY date_note;
+    </select>
+
+    <select id="selectdrawLine2" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        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.code order by value2 desc
+    </select>
+
+    <select id="selectdrawLine3" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        SELECT CC.MONTH_NUM AS value1 , CC.inweight AS value2, CC.outweight AS value3
+        FROM (select SUBSTR(A.date_note,6) AS MONTH_NUM , A.weight as inweight , IFNULL(B.weight,0) as outweight,A.date_note
+              from (select sum(twir.weight) weight ,DATE_FORMAT(twir.add_time,'%Y-%m') as date_note
+                    from t_ware_in_record twir where twir.cancel_flag ='0' group by date_note) A
+                       LEFT JOIN (select sum(twor.weight) weight,DATE_FORMAT(twor.add_time,'%Y-%m') as date_note
+                                  from t_ware_out_record twor where twor.cancel_flag ='0' group by date_note) B
+                                 ON A.date_note = B.date_note ORDER BY A.date_note DESC LIMIT 12) CC ORDER BY date_note;
+    </select>
+
+    <select id="selectdrawLine4" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select (select count(A.stack_id) from
+            (select DISTINCT tws.stack_id from t_ware_store tws
+             where tws.cancel_flag ='0' and tws.out_flag ='0' and tws.lock_flag ='0') A)/count(*)*100 AS value1
+        from t_maint_stack tms where tms.cancel_flag ='0'
+    </select>
+
+</mapper>

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>
@@ -537,6 +540,67 @@ update t_ware_store t set t.layer =   #{param7,jdbcType=INTEGER}
      )
     order by b.code,t.layer desc
   </select>
+
+
+  <select id="selectStoreTotal" resultMap="TotalResultMap" >
+    select sum(t.count) as total_amount
+    ,sum(t.weight) as total_weight
+    from t_ware_store t, t_maint_ware a, t_maint_stack b, t_maint_material c,t_maint_customer d,t_maint_customer e
+    where t.ware_id = a.id
+    and t.stack_id = b.id
+    and t.material_id  = c.id
+    and t.customer_id = d.id
+    and t.fk_compony_id = e.id
+    and  a.name like concat('%',#{param1,jdbcType=VARCHAR},'%')
+    and  b.name like concat('%',#{param2,jdbcType=VARCHAR},'%')
+    and  t.model like concat('%',#{param3,jdbcType=VARCHAR},'%')
+    and  c.name like concat('%',#{param4,jdbcType=VARCHAR},'%')
+    and  c.standard like concat('%',#{param5,jdbcType=VARCHAR},'%')
+    and  d.name like concat('%',#{param6,jdbcType=VARCHAR},'%')
+    and  e.name like concat('%',#{param9,jdbcType=VARCHAR},'%')
+
+    and  (t.plate_no like concat('%',#{param10,jdbcType=VARCHAR},'%')
+    <if test="param13 != null and param13.size() !=0" >
+      or t.plate_no IN <foreach  item="item" collection="param13" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.ord_no like concat('%',#{param11,jdbcType=VARCHAR},'%')
+    <if test="param14 != null and param14.size() !=0" >
+      OR t.ord_no IN <foreach  item="item" collection="param14" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.contract_no like concat('%',#{param12,jdbcType=VARCHAR},'%')
+    <if test="param15 != null and param15.size() !=0" >
+      OR t.contract_no IN <foreach  item="item" collection="param15" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and  (t.pack_no like concat('%',#{param16,jdbcType=VARCHAR},'%')
+    <if test="param17 != null and param17.size() !=0" >
+      OR t.pack_no IN <foreach  item="item" collection="param17" index="index"  open="(" separator="," close=")">
+      #{item,jdbcType=VARCHAR}  </foreach>
+    </if>
+    )
+    and t.belong_id = #{param8,jdbcType=VARCHAR}
+    and t.cancel_flag = '0'
+    and t.out_flag = #{param18,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>
+    <if test="param21 != null and param22 != null">
+      and t.add_time between #{param21,jdbcType=TIMESTAMP} and #{param22,jdbcType=TIMESTAMP}
+    </if>
+    and t.ware_id in (
+    select m.ware_id from t_maint_userware m  where m.user_id = #{param7,jdbcType=VARCHAR}
+    )
+    order by b.code,t.layer desc
+  </select>
+
   <select id="selectWareStackByDistributionStore" resultMap="StoreOfWareStack" >
     select distinct  t.ware_id ,t.stack_id
     from t_ware_store t where t.id in