修改班结打印小票

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/controller/StationClassStructureController.java

@@ -439,24 +439,27 @@ public class StationClassStructureController extends BaseController
             StationClassStructure classStructure= new StationClassStructure();
             classStructure.setClassStructureNo(no);
             List<StationClassStructure>  list= stationClassStructureService.listOilStructure(classStructure);
+            //支付方式汇总数据
+            List<StationClassStructure>  paylist= stationClassStructureService.listPayStructure(classStructure);
             //查询出小票数据
             String content;
             content = "<CB>班结小票</CB><BR>";
             content += "--------------------------------<BR>";
-            if(list!=null && list.size()>0){
+            if(list!=null && list.size()>0 && paylist !=null && paylist.size()>0){
                 if(list.get(0).getClassStartDate()!=null){
                     content += "开始时间："+dateFormat.format(list.get(0).getClassStartDate())+"  <BR>";
                 }else{
                     content += "开始时间： <BR>";
                 }
                 content += "班结时间："+dateFormat.format(list.get(0).getClassStructureDate())+" <BR>";
-                content += "油品  升数  金额  单数  优惠  <BR>";
+                content += "油品     笔    升数   金额<BR>";
                 content += "--------------------------------<BR>";
 
                 BigDecimal sumAmt = new BigDecimal(0);
                 BigDecimal liters = new BigDecimal(0);
                 BigDecimal coupon = new BigDecimal(0);
                 BigDecimal ysAmt =  new BigDecimal(0);
+                BigDecimal dzAmt =  new BigDecimal(0);
                 int num = 0;
                 int pageNum=0;
                 for(StationClassStructure str : list){
@@ -471,13 +474,17 @@ public class StationClassStructureController extends BaseController
                     if( str.getReceivableAmt()==null){
                         str.setReceivableAmt(BigDecimal.valueOf(0));
                     }
+                    //到款金额
+                    if( str.getReceivedAmt()==null){
+                        str.setReceivedAmt(BigDecimal.valueOf(0));
+                    }
                     if( str.getDiscountAmt()==null){
                         str.setDiscountAmt(BigDecimal.valueOf(0));
                     }
                     if( str.getOrderNo()==null){
                         str.setOrderNo(String.valueOf(0));
                     }
-                    content += str.getOilName()+"  "+str.getOrderLiters()+"  "+str.getAmt()+"  "+str.getOrderNo()+"  "+str.getDiscountAmt()+ " <BR>";
+                    content += str.getOilName()+"    "+str.getOrderNo()+"    "+str.getOrderLiters()+"    "+str.getReceivableAmt()+"<BR>";
                     if(str.getAmt()!=null){
                         sumAmt=sumAmt.add(str.getAmt());
                     }
@@ -496,24 +503,37 @@ public class StationClassStructureController extends BaseController
                     if(str.getPrintNum()!=null){
                         pageNum += str.getPrintNum();
                     }
+                    if(str.getReceivedAmt()!=null){
+                        dzAmt = dzAmt.add(str.getReceivedAmt());
+                    }
                 }
                 content += "--------------------------------<BR>";
-                content += "合计  "+liters+"  "+sumAmt+"  "+num+"  "+coupon+"<BR>";
+                content += "合计  "+num +"  "+liters +"  "+sumAmt+"<BR>";
+                content += " <BR>";
+                //按支付方式
+                content += "支付方式  笔  升数  金额 <BR>";
+                for(StationClassStructure sc : paylist){
+                    content += sc.getPayType()+"  "+sc.getOrderNo()+"  "+sc.getOrderLiters()+"  "+sc.getReceivableAmt()+"<BR>";
+                }
                 content += "小票张数： "+pageNum+" 张<BR>";
                 content += "班结金额： "+ysAmt+" 元<BR>";
                 content += "优惠总额： "+coupon+" 元<BR>";
                 content += "实际支付： "+sumAmt+" 元<BR>";
+                content += "到款金额： "+dzAmt+"元<BR>";
                 content += "班结人： "+list.get(0).getClassStructureMan()+"<BR>";
             }else{
                 content += "开始时间： <BR>";
                 content += "班结时间： <BR>";
-                content += "油站  升数  金额  单数  优惠  <BR>";
+                content += "油站   笔   升数   金额 <BR>";
                 content += "--------------------------------<BR>";
                 content += "合计  <BR>";
+                content += " <BR>";
+                content += "支付方式  笔  升数  金额<BR>";
                 content += "小票张数：<BR>";
                 content += "班结金额：<BR>";
                 content += "优惠总额：<BR>";
                 content += "实际支付： <BR>";
+                content += "到款金额： <BR>";
                 content += "班结人：<BR>";
             }
             content += "<BR>";

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/mapper/StationClassStructureMapper.java

@@ -85,29 +85,36 @@ public interface StationClassStructureMapper
      * @param classesStructure
      * @return
      */
-    StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
+    public StationClassStructure selectDistnctClassStructure(StationClassStructure classesStructure);
 
     /**
      * 根据班次号汇总班结数据
      * @param scs
      * @return
      */
-    StationClassStructure selectSummyClassStructure(StationClassStructure scs);
+    public StationClassStructure selectSummyClassStructure(StationClassStructure scs);
 
     /**
      * 按员工支付方式汇总班结数据
      * @param stationClassStructure
      * @return
      */
-    List<StationClassStructure> listPersonnelPayStructure(StationClassStructure stationClassStructure);
+    public List<StationClassStructure> listPersonnelPayStructure(StationClassStructure stationClassStructure);
 /*获取当前人班结信息
  */
-    StationClassStructure listClass(StationClassStructure stationClassStructure);
+    public  StationClassStructure listClass(StationClassStructure stationClassStructure);
 
     /**
      * 导出数据
      * @param stationClassStructure
      * @return
      */
-    List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure);
+    public List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure);
+
+    /***
+     * 根据支付方式汇总数据
+     * @param classStructure
+     * @return
+     */
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/IStationClassStructureService.java

@@ -112,5 +112,11 @@ public interface IStationClassStructureService
      */
     public List<StationClassStructure> selectStationClassStructureExport(StationClassStructure stationClassStructure);
 
+    /**
+     * 根据支付方式汇总班结数据
+     * @param classStructure
+     * @return
+     */
 
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure);
 }

Yijia-SaaS/yijia-station/src/main/java/com/yijia/station/service/impl/StationClassStructureServiceImpl.java

@@ -161,4 +161,14 @@ public class StationClassStructureServiceImpl implements IStationClassStructureS
         return stationClassStructureMapper.selectStationClassStructureExport(stationClassStructure);
     }
 
+    /**
+     * 根据支付方式汇总数据
+     * @param classStructure
+     * @return
+     */
+    @Override
+    public List<StationClassStructure> listPayStructure(StationClassStructure classStructure) {
+        return stationClassStructureMapper.listPayStructure(classStructure);
+    }
+
 }

Yijia-SaaS/yijia-station/src/main/resources/mapper/station/StationClassStructureMapper.xml

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="listOilStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
-       	SELECT a.station_id, a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(a.receivable_amt),2) as receivable_amt,ROUND(SUM(order_liters),2) as order_liters,ROUND(SUM(a.discount_amt),2) as discount_amt ,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man,sum(a.print_num) print_num
+       	SELECT a.station_id, a.oil_name,GROUP_CONCAT(DISTINCT oil_gun) as oil_gun,ROUND(SUM(a.amt),2) as amt,ROUND(SUM(a.receivable_amt),2) as receivable_amt,ROUND(SUM(a.received_amt),2) as received_amt,ROUND(SUM(order_liters),2) as order_liters,ROUND(SUM(a.discount_amt),2) as discount_amt ,COUNT(order_no) as order_no,a.class_start_date,a.class_structure_date,a.class_structure_man,sum(a.print_num) print_num
         from station_class_structure a
         <where>
             <if test="stationId != null "> and a.station_id = #{stationId}</if>
@@ -180,6 +180,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </where>
         )
     </select>
+    <!--根据支付方式汇总数据-->
+    <select id="listPayStructure" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
+      	SELECT dict_label as pay_type,sum(order_liters) as order_liters,sum(discount_amt) as discount_amt,count(order_no) order_no,sum(amt) as amt,sum(receivable_amt) as receivable_amt,sum(received_amt) as received_amt
+		from   station_class_structure left JOIN sys_dict_data on dict_value = pay_type and dict_type ='pay_type'
+        <where>
+            <if test="stationId != null and stationId != ''"> and station_id = #{stationId}</if>
+            <if test="classStructureNo != null and classStructureNo != ''"> and class_structure_no = #{classStructureNo}</if>
+        </where>
+		GROUP BY pay_type,dict_label
+    </select>
 <!--  导出数据-->
     <select id="selectStationClassStructureExport" parameterType="StationClassStructure" resultMap="StationClassStructureResult">
         <include refid="selectStationClassStructureVo"/>