Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-common-tool/src/main/java/com/iamberry/wechat/tools/ResponseJson.java

@@ -33,19 +33,19 @@ public class ResponseJson implements Serializable {
 	/**
 	 * 成功时返回
 	 */
-	public static ResponseJson SUCCESS = new ResponseJson(200, "SUCCESS", 200);
+	//public static ResponseJson SUCCESS = new ResponseJson(200, "SUCCESS", 200);
 
 	/**
 	 * 失败时返回
 	 */
-	public static ResponseJson FAILURE = new ResponseJson(200, "FAILURE", 500);
+	//public static ResponseJson FAILURE = new ResponseJson(200, "FAILURE", 500);
 
 
-	public final static ResponseJson getSUCCESS(){
+	public static ResponseJson getSUCCESS(){
 		return  new ResponseJson(200, "SUCCESS", 200);
 	}
 
-	public final static ResponseJson getFAILURE(){
+	public static ResponseJson getFAILURE(){
 		return  new ResponseJson(200, "FAILURE", 500);
 	}
 

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -98,6 +98,8 @@ public class SalesOrder implements Serializable {
     private Integer itemNum;                //产品数量
     private String itemColorBar;            //产品69码
     private Integer colorId;            //颜色id
+    private Integer itemTotal;//小结
+    private Integer itemCostTotal;//成本小结
     private List<String> listColorBar;      //产品69码集合
 
     private String[] salesIds;              //传入mybatis的订单编号
@@ -152,7 +154,7 @@ public class SalesOrder implements Serializable {
     private Integer outbound;//待出库数量
     private String salesPostFirmName;//快递公司名称
 
-    private Integer dealerId;//待打单数量
+    private Integer dealerId;//客户id
 
     private List<ComplaintDetectInfo> complaintDetectInfoList;
     public Integer getSalesOldOrderStatus() {
@@ -913,4 +915,20 @@ public class SalesOrder implements Serializable {
     public void setDealerId(Integer dealerId) {
         this.dealerId = dealerId;
     }
+
+    public Integer getItemTotal() {
+        return itemTotal;
+    }
+
+    public void setItemTotal(Integer itemTotal) {
+        this.itemTotal = itemTotal;
+    }
+
+    public Integer getItemCostTotal() {
+        return itemCostTotal;
+    }
+
+    public void setItemCostTotal(Integer itemCostTotal) {
+        this.itemCostTotal = itemCostTotal;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/fm/DetectStatistics.java

@@ -28,10 +28,10 @@ public class DetectStatistics implements Serializable {
     private String beginTime;                 //开始时间
     private String endTime;                   //结束时间
 
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;                 //开始时间
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date endDate;                   //结束时间
 

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/postOrderNumMapper.xml

@@ -226,6 +226,17 @@
                     AND sales_deliver_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="dealerId != null">
+                AND  sales_store_id IN (
+                select
+                distinct xx.store_id
+                from
+                tb_rst_store_info xx
+                LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON xx.store_id = dcs.store_id
+                LEFT JOIN tb_rst_dm_dealer_channel dc ON dcs.deal_channel_id = dc.deal_channel_id
+                WHERE dc.dealer_id = #{dealerId}
+                )
+            </if>
         </where>
     </select>
 
@@ -337,6 +348,17 @@
                     AND sales_deliver_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="dealerId != null">
+                AND  sales_store_id IN (
+                select
+                distinct xx.store_id
+                from
+                tb_rst_store_info xx
+                LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON xx.store_id = dcs.store_id
+                LEFT JOIN tb_rst_dm_dealer_channel dc ON dcs.deal_channel_id = dc.deal_channel_id
+                WHERE dc.dealer_id = #{dealerId}
+                )
+            </if>
         </where>
         ORDER BY t.sales_id DESC
     </select>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1462,11 +1462,16 @@
           tb_rst_sales_order_info.*,
           si.store_name,
           sc.company_name,
-          sa.admin_name AS  salesAdminName
+          sa.admin_name AS  salesAdminName,
+          pt.proc_type_name procTypeName,
+          pt.proc_type_id procTypeId
         from tb_rst_sales_order_info
         LEFT JOIN tb_rst_store_info si ON  tb_rst_sales_order_info.sales_store_id = si.store_id
         LEFT JOIN  tb_rst_sales_company sc ON  tb_rst_sales_order_info.sales_company_id = sc.company_id
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
+        LEFT JOIN tb_rst_cm_relation cr ON tb_rst_sales_order_info.sales_customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
         LEFT JOIN tb_rst_sys_admin sa ON tb_rst_sales_order_info.sales_admin_id = sa.admin_id
         <where>
             <if test="isCustmerAddOrder !=null and isCustmerAddOrder == 2">

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -77,10 +77,9 @@
             SELECT ca2.dealer_id,MAX(ca2.coop_agree_end_date) AS coop_agree_end_date FROM tb_rst_dm_cooperation_agree ca2 GROUP BY ca2.dealer_id
         )cax2 ON cax2.dealer_id = t.dealer_id
         LEFT JOIN tb_rst_dm_financial_receipt fr ON t.dealer_id = fr.dealer_id
-
-      /*  LEFT JOIN tb_rst_dm_dealer_channel dc ON t.dealer_id = dc.dealer_id
-        LEFT JOIN tb_rst_store_info si ON t.dealer_id = si.dealer_id
-*/
+        LEFT JOIN tb_rst_dm_dealer_channel dc ON t.dealer_id = dc.dealer_id
+        LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON dcs.deal_channel_id = dc.deal_channel_id
+        LEFT JOIN tb_rst_store_info si ON si.store_id = dcs.store_id
         LEFT JOIN tb_rst_sys_admin sa ON t.create_id = sa.admin_id
         <where>
             <if test="dealerId != null ">
@@ -92,6 +91,9 @@
             <if test="dealerIndustry != null and dealerIndustry != ''">
                 AND t.dealer_industry  like  CONCAT ('%',#{dealerIndustry},'%')
             </if >
+            <if test="storeName != null and storeName != ''">
+                AND si.store_name  like  CONCAT ('%',#{storeName},'%')
+            </if >
             <if test="dealerType != null ">
                 AND t.dealer_type = #{dealerType}
             </if >

watero-rst-service/src/main/java/com/iamberry/rst/service/fm/mapper/detectStatisticMapper.xml

@@ -17,12 +17,13 @@
     <select id="getDetectProductionList" resultType="DetectStatistics"   parameterType="DetectionConfig">
         SELECT
             t.detect_id,
-            IF(t.detect_production = '','未知',ifnull(t.detect_production,'未知')) AS detect_production,
+            t.detect_production,
             t.detect_create_time,
             cdc.config_id,
             cdc.config_detect_content,
             cdc.config_type
-        FROM tb_rst_complaint_detect t
+        FROM
+        (SELECT cc.detect_id,IF (cc.detect_production = '','未知',ifnull(cc.detect_production,'未知')) AS detect_production, cc.detect_create_time FROM	tb_rst_complaint_detect cc) t
         LEFT JOIN tb_rst_complaint_detection_item cdi ON t.detect_id = cdi.detect_id
         LEFT JOIN tb_rst_complaint_detection_config cdc ON cdi.item_config_id = cdc.config_id
         <where>
@@ -38,6 +39,16 @@
             <if test="endTime != null and endTime != ''">
                 AND t.detect_production &lt;= #{endTime}
             </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time <= #{endDate}
+                ]]>
+            </if >
         </where>
         GROUP BY t.detect_production
         ORDER BY t.detect_production
@@ -68,6 +79,16 @@
             <if test="endTime != null and endTime != ''">
                 AND t.detect_production &lt;= #{endTime}
             </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time <= #{endDate}
+                ]]>
+            </if >
         </where>
         GROUP BY cdc.config_id
         ORDER BY configNumber DESC
@@ -98,6 +119,16 @@
             <if test="endTime != null and endTime != ''">
                 AND t.detect_production &lt;= #{endTime}
             </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time <= #{endDate}
+                ]]>
+            </if >
         </where>
         GROUP BY t.detect_production,cdc.config_id
         ORDER BY t.detect_production
@@ -122,25 +153,34 @@
     <select id="getCreatTimeByConfigIdList" resultType="DetectStatistics"  parameterType="DetectStatistics">
         SELECT
             t.detect_id,
-            IF (
-            t.detect_production = '',
-            '未知',
-            ifnull(
             t.detect_production,
-            '未知'
-            )
-            ) AS detect_production,
             t.detect_create_time,
             cdc.config_id,
             cdc.config_detect_content,
             cdc.config_type
         FROM
-            tb_rst_complaint_detect t
+        (SELECT cc.detect_id,IF (cc.detect_production = '','未知',ifnull(cc.detect_production,'未知')) AS detect_production, cc.detect_create_time FROM	tb_rst_complaint_detect cc) t
         LEFT JOIN tb_rst_complaint_detection_item cdi ON t.detect_id = cdi.detect_id
         LEFT JOIN tb_rst_complaint_detection_config cdc ON cdi.item_config_id = cdc.config_id
         <where>
             <if test="configId != null ">
-                AND  t.config_id = #{configId}
+                AND  cdi.item_config_id = #{configId}
+            </if >
+            <if test="beginTime != null and beginTime != ''">
+                AND t.detect_production &gt;= #{beginTime}
+            </if >
+            <if test="endTime != null and endTime != ''">
+                AND t.detect_production &lt;= #{endTime}
+            </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time <= #{endDate}
+                ]]>
             </if >
         </where>
         GROUP BY
@@ -154,24 +194,34 @@
         FROM (
         SELECT
         t.detect_id,
-        COUNT(distinct t.detect_id),
+        COUNT(distinct t.detect_id) AS configNumber,
         t.detect_production,
         t.detect_create_time,
         cdi.item_config_id,
         cdi.item_detect_content
         FROM
-        (SELECT cc.detect_id,IF (cc.detect_production = '','未知',ifnull(cc.detect_production,'未知')) AS detect_production, cc.detect_create_time FROM	tb_rst_complaint_detect cc
-        ) t
+        (SELECT cc.detect_id,IF (cc.detect_production = '','未知',ifnull(cc.detect_production,'未知')) AS detect_production, cc.detect_create_time FROM	tb_rst_complaint_detect cc) t
         LEFT JOIN tb_rst_complaint_detection_item cdi ON t.detect_id = cdi.detect_id
         <where>
             <if test="configId != null ">
                 AND  cdi.item_config_id = #{configId}
             </if >
-         <!--   <if test="configId != null ">
-                AND	t.detect_create_time 大于 '2019-09-02 00:00:00'
-                AND t.detect_create_time 小于 '2019-09-04 00:00:00'
-            </if >-->
-
+            <if test="beginTime != null and beginTime != ''">
+                AND t.detect_production &gt;= #{beginTime}
+            </if >
+            <if test="endTime != null and endTime != ''">
+                AND t.detect_production &lt;= #{endTime}
+            </if >
+            <if test="startDate != null and startDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time >= #{startDate}
+                ]]>
+            </if >
+            <if test="endDate != null and endDate != ''">
+                <![CDATA[
+                    AND t.detect_create_time <= #{endDate}
+                ]]>
+            </if >
         </where>
             GROUP BY t.detect_production,date_format(t.detect_create_time, '%Y-%m-%d')
         ) xx

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminDetectController.java

@@ -1528,9 +1528,6 @@ public class AdminDetectController {
         return mv;
     }
 
-
-
-
     /**
      * 报表 - 按照各个检测类型分类统计固定生产时间内，机器损坏数量
      * @param request
@@ -1545,12 +1542,52 @@ public class AdminDetectController {
 
         //生产年份
         List<DetectStatistics> detectProductionList = detectStatisticService.getDetectProductionList(detectStatistics);
-//        for (:) {
-//
-//        }
 
+        //所有的创建时间
         List<DetectStatistics> creatTimeList = detectStatisticService.getCreatTimeByConfigIdList(detectStatistics);
 
+        //生产年份与创建时间的笛卡尔积的数量
+        List<DetectStatistics> detectAllList = detectStatisticService.getDetectAllByConfigIdList(detectStatistics);
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+
+        int[] allNum = new int[creatTimeList.size()];
+        for (int i = 0; i < allNum.length; i++) {
+            allNum[i] = 0;
+        }
+
+        List<Map> list = new ArrayList<>();
+        for (int i = 0; i < detectProductionList.size(); i++) {
+            Map map = new HashMap();
+            int[] num = new int[creatTimeList.size()];
+
+            for (int k = 0; k < creatTimeList.size(); k++) {
+                boolean flag = false;
+                String creatTime =  sdf.format(creatTimeList.get(k).getDetectCreateTime());
+                for (int j = 0; j <detectAllList.size() ; j++) {
+                    String dataCreatTime =  sdf.format(detectAllList.get(j).getDetectCreateTime());
+                    if( creatTime.equals(dataCreatTime)
+                        && detectProductionList.get(i).getDetectProduction().equals(detectAllList.get(j).getDetectProduction())){
+                        num[k] = detectAllList.get(j).getConfigNumber();
+                        allNum[k] = allNum[k] + detectAllList.get(j).getConfigNumber();
+                        flag = true;
+                    }
+                }
+                if(!flag){
+                    num[k] = 0;
+                }
+            }
+            map.put(detectProductionList.get(i).getDetectProduction(),num);
+            list.add(map);
+        }
+
+        Map map = new HashMap();
+        map.put("全部",allNum);
+        list.add(map);
+
+        msg.addResponseKeyValue("detectProductionList",detectProductionList);
+        msg.addResponseKeyValue("creatTimeList",creatTimeList);
+        msg.addResponseKeyValue("list",list);
         return msg;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/FinanciaReceController.java

@@ -6,6 +6,7 @@ import com.iamberry.rst.core.cm.StoreInfo;
 import com.iamberry.rst.core.dm.ClaimOrder;
 import com.iamberry.rst.core.dm.DmDealer;
 import com.iamberry.rst.core.dm.FinancialReceipt;
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.sys.Admin;
@@ -13,6 +14,7 @@ import com.iamberry.rst.faces.cm.CompanyInfoService;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.dm.*;
+import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.StitchAttrUtil;
@@ -57,6 +59,8 @@ public class FinanciaReceController {
     private CompanyInfoService companyInfoService;
     @Autowired
     private StoreInfoService storeInfoService;
+    @Autowired
+    private ProductService productService;
 
 
     /**
@@ -434,6 +438,8 @@ public class FinanciaReceController {
     public ModelAndView toSelectOrder(HttpServletRequest request){
         ModelAndView mv = new ModelAndView("dm/financialReceipt/select_order_list");
 
+        List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
+
         SalesOrder salesOrder = new SalesOrder();
         String salesStatusStr = request.getParameter("salesStatus");
         if(salesStatusStr != null && !"".equals(salesStatusStr)){
@@ -448,7 +454,7 @@ public class FinanciaReceController {
         dmDealer.setDealerStatus(1);
         List<DmDealer>  dmDealerList = dmDealerService.getDmDealerList(dmDealer);
         mv.addObject("dmDealerList", dmDealerList);
-
+        mv.addObject("productColorList", productColorList);
         mv.addObject("salesOrder", salesOrder);
         return mv;
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -1033,7 +1033,7 @@ public class AdminOrderController {
         try{
            mapsalesOrderList = mergeOrder(orderEfasts,postType);
         }catch (Exception e){
-            return ResponseJson.FAILURE;
+            return ResponseJson.getFAILURE();
         }
 
         Integer orderBatchNum = orderBatchService.getOrderBatchNum(new OrderBatch());
@@ -1048,7 +1048,7 @@ public class AdminOrderController {
             ob.setBatchTxtPath(dateString);
             Integer flag = orderBatchService.save(ob);
             if(flag < 1){
-                return ResponseJson.FAILURE;
+                return ResponseJson.getFAILURE();
             }
         }else{
             batchId = orderBatch;

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -1462,7 +1462,7 @@ public class AdminSalesOrderController {
     @ResponseBody
     public ResponseJson correct_order(HttpServletRequest request,OrderCorrectInfo orderCorrectInfo,String arrayItem){
         if(orderCorrectInfo == null){
-            return ResponseJson.FAILURE;
+            return ResponseJson.getFAILURE();
         }
         Admin admin = AdminUtils.getLoginAdmin();
         if(!salesOrderService.addCorrectInfo(orderCorrectInfo,arrayItem,admin)){
@@ -1947,7 +1947,7 @@ public class AdminSalesOrderController {
         //分页获取订单信息
         PagedResult<SalesOrder> pagedResult = salesOrderService.salesOrderListAndItemPage(pageNO, pageSize, salesOrder, totalNum == 0);
 
-        ResponseJson rj = new ResponseJson(200, "查询成功", 200);
+        ResponseJson rj = new ResponseJson(200,  "查询成功", 200);
         rj.addResponseKeyValue("pagedResult", pagedResult);
         return rj;
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -1,7 +1,11 @@
 package com.iamberry.rst.controllers.order;
 
 import com.alibaba.fastjson.JSONObject;
-import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
+import com.iamberry.rst.core.cm.StoreInfo;
+import com.iamberry.rst.core.cm.StoreShip;
+import com.iamberry.rst.core.dm.DmDealer;
 import com.iamberry.rst.core.fm.ComplaintDetectInfo;
 import com.iamberry.rst.core.fm.InventoryInfo;
 import com.iamberry.rst.core.fm.InventoryLog;
@@ -11,6 +15,7 @@ import com.iamberry.rst.core.pts.PtsBatch;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.*;
+import com.iamberry.rst.faces.dm.DmDealerService;
 import com.iamberry.rst.faces.fm.ComplaintDetectInfoService;
 import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.product.ProductService;
@@ -68,6 +73,8 @@ public class AwaitSendController {
     @Autowired
     private InventoryLogService inventoryLogService;
     @Autowired
+    private DmDealerService dmDealerService;
+    @Autowired
     private ComplaintDetectInfoService complaintDetectInfoService;
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);
 
@@ -908,6 +915,8 @@ public class AwaitSendController {
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
         List<OrderWarehouse> listOrderWarehouse = salesOrderService.listOrderWarehouse();
+
+        List<DmDealer> dmDealerList = dmDealerService.getDmDealerList(new DmDealer());
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .addNoPro("salesOrderItemList")
@@ -917,6 +926,7 @@ public class AwaitSendController {
         mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("productColorList",productColorList);
+        mv.addObject("dmDealerList",dmDealerList);
 
         return mv;
     }
@@ -978,6 +988,7 @@ public class AwaitSendController {
         titles.add("商品名称");
         titles.add("商品颜色");
         titles.add("商品数量");
+        titles.add("商品小结");
         titles.add("销售公司名称");
         titles.add("店铺名称");
         titles.add("打单状态");
@@ -1042,6 +1053,7 @@ public class AwaitSendController {
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
                 row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
                 row.add(salesOrder.getItemNum() == null ? null:salesOrder.getItemNum());
+                row.add(salesOrder.getItemTotal() == null ? null:salesOrder.getItemTotal()/100);
                 row.add(salesOrder.getCompanyName() == null ? null:salesOrder.getCompanyName());
                 row.add(salesOrder.getStoreName() == null ? null:salesOrder.getStoreName());
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics.ftl

@@ -168,7 +168,7 @@
                                 trigger: 'axis'
                             },
                             legend: {
-                                data:['本月故障机器']
+                                data:['返厂日期']
                             },
                             toolbox: {
                                 show : true,
@@ -192,16 +192,16 @@
                                 }
                             ],
                             series : {
-                                name:'本月故障机器',
+                                name:'返厂日期',
                                 type:'bar',
-                                data:newNumArray,
+                                data:newNumArray
 //								barWidth : 10%,
-                                markPoint : {
-                                    data : [
-                                        {type : 'max', name: '最大值'},
-                                        {type : 'min', name: '最小值'}
-                                    ]
-                                }
+//                                markPoint : {
+//                                    data : [
+//                                        {type : 'max', name: '最大值'},
+//                                        {type : 'min', name: '最小值'}
+//                                    ]
+//                                }
 //                                ,markLine : {
 //                                    data : [
 //                                        {type : 'average', name: '平均值'}
@@ -342,7 +342,7 @@
                         echartsObj.setOption(option,true);
 
                         echartsObj.on('click', function (params) {
-                            toSelectConfigStatistic(data);
+                            toSelectConfigStatistic(params.data);
 
                             // alert("单击了"+params.componentType+"x轴标签");
 
@@ -405,7 +405,7 @@
          */
         function toSelectConfigStatistic(data) {
             var configId = data.configId;
-            window.location.href= "${path}/admin/dealer/to_select_config_statistic?configId="+configId;
+            window.location.href= "${path}/admin/detect/to_select_config_statistic?configId="+configId;
         }
 
         $('.chosen').chosen({

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_statistics_config.ftl

@@ -31,7 +31,25 @@
         </style>
 	</head>
 	<body>
-    	<div id="main" style="width: 1400px;height:500px;"></div>
+
+        <div class="input-box" style="height: 45px;" class="dataTableStatis" seachType="2">
+            <label class="form-label col-2 col-sm-2 huanhang" style="text-align: right;margin: 10px 0px;font-weight: bold;font-size: 23px;">${detectionConfig.configDetectContent!''}: </label>
+            <div class="formControls col-2 col-sm-2 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -19px;">
+                <input class="my-input beginTime" style="width: 90%;" type="text" value="" name="beginTime_2" id="beginTime_2" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M',dateFmt: 'yyyy-MM',onpicked: getResetDateByTime,oncleared :getResetDateByTime })" placeholder="生产日期(开始)" readonly="readonly"/>
+            </div>
+            <div class="formControls col-2 col-sm-2 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -19px;">
+                <input class="my-input endTime" style="width: 90%;" type="text" value="" name="endTime_2" id="endTime_2" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M',dateFmt: 'yyyy-MM',minDate:beginTime_2.value,onpicked: getResetDateByTime,oncleared :getResetDateByTime })" placeholder="生产日期(结束)" readonly="readonly"/>
+            </div>
+
+            <div class="formControls col-2 col-sm-2 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -19px;">
+                <input class="my-input startDate" style="width: 90%;" type="text" value="" name="startDate" id="startDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d',dateFmt: 'yyyy-MM-dd',onpicked: getResetDateByTime,oncleared :getResetDateByTime })" placeholder="返厂日期(开始)" readonly="readonly"/>
+            </div>
+            <div class="formControls col-2 col-sm-2 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -19px;">
+                <input class="my-input endDate" style="width: 90%;" type="text" value="" name="endDate" id="endDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d',dateFmt: 'yyyy-MM-dd',minDate:startDate.value,onpicked: getResetDateByTime,oncleared :getResetDateByTime })" placeholder="返厂日期(结束)" readonly="readonly"/>
+            </div>
+        </div>
+
+    	<div id="main" style="width: 1400px;height:550px;"></div>
 
 	</body>
     <script type="text/javascript" src="${path}/common/lib/echarts/3.8/echarts.common.min.js"></script>
@@ -41,103 +59,93 @@
 	<script>
         var myChart = echarts.init(document.getElementById('main'));
 		$(function () {
-            detectStatisticsData();
-        })
+            detectStatisticsDataCinfig();
+        });
 
         /**
          * 当月统计
          * @param state
          */
-        function detectStatisticsData() {
+        function detectStatisticsDataCinfig(beginTime,endTime,startDate,endDate) {
             $.ajax({
                 type: "POST",
-                data: {},
-                url: "${path}/admin/detect/detect_statistics_data",
+                data: {
+                    configId : ${detectionConfig.configId},
+                    beginTime:beginTime,
+                    endTime:endTime,
+                    startDate:startDate,
+                    endDate:endDate
+                },
+                url: "${path}/admin/detect/select_config_statistic",
                 success: function(data){
                     if (data.returnCode == 200) {
 
-                        var numArray = new Array();
-                        var monthArray = new Array();
-                        for (var i=0;i<data.returnMsg.complaintDetectInfoList.length;i++){
-                            var countNum = data.returnMsg.complaintDetectInfoList[i].countNum;
-                            numArray.push(countNum);
+                        var detectProductionArray = new Array();
+                        for (var k=0;k<data.returnMsg.detectProductionList.length;k++) {
+                            var detectProduction = data.returnMsg.detectProductionList[k].detectProduction;
+                            detectProductionArray.push(detectProduction);
+                        }
+                        detectProductionArray.push("全部");
 
-                            var detectProduction = data.returnMsg.complaintDetectInfoList[i].detectProduction;
-                            if(detectProduction == "未知"){
-                                var flag = false;
-                                for (var k=0;k<monthArray.length;k++){
-                                    if(monthArray[k] == '未知'){
-                                        var otherMonthNum = numArray[k];
-                                        numArray[k] = numArray[k]+countNum;
-                                        flag = true;
-                                    }
-                                }
-                                if(!flag){
-                                    monthArray.push('未知');
-                                }
-                            }else{
-                                var newDate = formatDate(detectProduction,"yyyy年MM月");
-                                monthArray.push(newDate.substring(2,newDate.length))
+                        var creatTimeArray = new Array();
+                        for (var k=0;k<data.returnMsg.creatTimeList.length;k++) {
+                            var creatTime = data.returnMsg.creatTimeList[k].detectCreateTime;
+                            creatTime = formatDate(creatTime,"yyyy-MM-dd");
+                            creatTimeArray.push(creatTime);
+                        }
+                        var seriesArray = new Array();
+                        for (var k=0;k<data.returnMsg.list.length;k++) {
+                            var newDate = data.returnMsg.list[k];
+                            var dateName,dateAttr;
+                            for(var m in newDate) {
+                                dateName = m;
+                                dateAttr = newDate[m];
                             }
-						}
-
-                        var newNumArray = new Array();
-                        for (var i=0;i<monthArray.length;i++){
-                            newNumArray.push(numArray[i]);
+                            var series = {
+                                name:dateName,
+                                type:'line',
+                                data:dateAttr
+                            };
+                            seriesArray.push(series);
                         }
+
                         var option = {
-                            title : {
-                                text: '本月故障机器',
-                                subtext: ''
+                            title: {
+                                text: ''
                             },
-                            tooltip : {
+                            tooltip: {
                                 trigger: 'axis'
                             },
                             legend: {
-                                data:['本月故障机器']
+                                data:detectProductionArray
+                            },
+                            grid: {
+                                left: '3%',
+                                right: '4%',
+                                bottom: '3%',
+                                containLabel: true
                             },
                             toolbox: {
-                                show : true,
-                                feature : {
-//                                    dataView : {show: true, readOnly: false},
-//                                    magicType : {show: true, type: ['line', 'bar']},
-//                                    restore : {show: true},
-//                                    saveAsImage : {show: true}
-                                }
+
                             },
-                            calculable : true,
-                            xAxis : [
-                                {
-                                    type : 'category',
-                                    data : monthArray
-                                }
-                            ],
-                            yAxis : [
-                                {
-                                    type : 'value'
-                                }
-                            ],
-                            series : {
-                                name:'本月故障机器',
-                                type:'bar',
-                                data:newNumArray,
-//								barWidth : 10%,
-                                markPoint : {
-                                    data : [
-                                        {type : 'max', name: '最大值'},
-                                        {type : 'min', name: '最小值'}
-                                    ]
-                                }
-//                                ,markLine : {
-//                                    data : [
-//                                        {type : 'average', name: '平均值'}
-//                                    ]
-//                                }
-                            }
+                            xAxis: {
+                                type: 'category',
+                                boundaryGap: false,
+                                data: creatTimeArray
+                            },
+                            yAxis: {
+                                type: 'value'
+                            },
+                            dataZoom: [{
+                                startValue: '2019-05-01'
+                            }, {
+                                type: 'inside'
+                            }],
+                            series: seriesArray
                         };
 
                         // 使用刚指定的配置项和数据显示图表。
-                        myChart.setOption(option);
+                        myChart.setOption(option,true);
                     }else{
                         layer.msg("获取信息失败！", {icon: 5, time: 3000});
                     }
@@ -147,69 +155,18 @@
             });
         }
 
-        $('.configSelect').change(function() {
-            getResetDate($(this));
-        });
-
-        $('.beginTime').change(function() {
-            getResetDate($(this));
-        });
-        $('.endTime').change(function() {
-            getResetDate($(this));
-        });
-
         /**
          * 选择数据后重置数据
          */
         function getResetDateByTime() {
             var id = this.id;
             var $node = $("#"+id);
-//            var $thisDiv = $node.parents(".dataTableStatis");
-            var $thisDiv = $node.parent().parent();
-            var type = $thisDiv.attr("seachType");
-            var beginTime = $thisDiv.find(".beginTime").val();
-            var endTime = $thisDiv.find(".endTime").val();
-            var configName = $thisDiv.find(".configSelect").find("option:selected").text();
-            var configId = $thisDiv.find(".configSelect").val();
-            detectStatisticsJudgement(type,beginTime,endTime,configId);
-        }
-        /**
-         * 选择数据后重置数据
-         */
-        function getResetDate($node) {
-//            var $thisDiv = $node.parents(".dataTableStatis");
             var $thisDiv = $node.parent().parent();
-            var type = $thisDiv.attr("seachType");
             var beginTime = $thisDiv.find(".beginTime").val();
             var endTime = $thisDiv.find(".endTime").val();
-            var configName = $thisDiv.find(".configSelect").find("option:selected").text();
-            var configId = $thisDiv.find(".configSelect").val();
-            detectStatisticsJudgement(type,beginTime,endTime,configId);
-        }
-
-        /**
-         * 到单独配置页面
-         */
-        function toSelectConfigStatistic(data) {
-            var configId = data.configId;
-            window.location.href= "${path}/admin/dealer/to_select_config_statistic?configId="+configId;
+            var startDate = $thisDiv.find(".startDate").val();
+            var endDate = $thisDiv.find(".endDate").val();
+            detectStatisticsDataCinfig(beginTime,endTime,startDate,endDate);
         }
-
-        $('.chosen').chosen({
-            no_results_text: "没有找到结果！",//搜索无结果时显示的提示
-            search_contains:true,   //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
-            allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许，选中选项会有一个x号可以删除选项
-            disable_search: false, //禁用搜索。设置为true，则无法搜索选项。
-            disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
-            inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
-            placeholder_text_single: '', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
-            width: '200px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
-            max_shown_results: 1000, //下拉框最大显示选项数量
-            display_disabled_options: false,
-            single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除
-            case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
-            group_search: false, //选项组是否可搜。此处搜索不可搜
-            include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示，true显示。默认false。
-        });
 	</script>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/add_dealer_product.ftl

@@ -226,7 +226,7 @@
                 {type:'checkbox',field:'left', width:'5%', align:'center',style:"font-size:12px;"}
                 ,{field:'colorId',width:'7%', title: 'ID', sort: true,style:"font-size:12px;"}
                 ,{field:'productName', width:'',   title: '产品名称', sort: false,style:"font-size:12px;"}
-                ,{field:'colorName', width:'15%',   title: '颜色', sort: false,style:"font-size:12px;"}
+                ,{field:'colorName', width:'25%',   title: '颜色', sort: false,style:"font-size:12px;"}
                 ,{field:'colorBar', width:'20%', title: '69码', sort: false,align:'center',style:"font-size:12px;"}
 //                ,{field:'right', width:'13%', title: '操作',sort: false, toolbar: '#barDemo',style:"font-size:12px;"}
             ]]

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -63,7 +63,7 @@
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerName!}" placeholder="客户名称" id="dealerName" name="dealerName">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerIndustry!}" placeholder="客户行业" id="dealerIndustry" name="dealerIndustry">
-            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerIndustry!}" placeholder="店铺名称" id="dealerIndustry" name="dealerIndustry">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.storeName!}" placeholder="店铺名称" id="storeName" name="storeName">
 
             <button type="submit" class="btn" style="background: #50a2ea;border: 1px solid #50a2ea;color: #fff;height: 35px;margin-top: -8px;"><i class="Hui-iconfont">&#xe665;</i> 查询</button>
 

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/order_desc.ftl

@@ -348,7 +348,7 @@
      */
     function selectOrder(type) {
         isAddOrderType=type;
-        layer_show("搜索订单",url_path + "/admin/financial_receipt/to_select_order?salesStatus="+1,"1200","500");
+        layer_show("搜索订单",url_path + "/admin/financial_receipt/to_select_order?salesStatus="+1,"1300","550");
     }
     
     function showSelectOrder(orderIds) {

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -61,21 +61,22 @@
     <div class="order-list">
         <div class="text-c">
             <form action="" method="post">
-                <div class="row cl" style="margin-left: 0px;">
+                <div class="row cl" style="margin-left: 0px;margin-bottom: 10px;">
 
-                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
-                        <select name="dealerId" class="select" id="dealerId">
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 280px;line-height: 29px;" >
+                        <select class="chosenDealerId select" name="dealerId" id="dealerId">
                              <option value="">选择客户</option>
-                        <#if dmDealerList?? &&  (dmDealerList?size > 0) >
-                            <#list dmDealerList as dmDealer>
-                                <option value ="${dmDealer.dealerId!""}">${dmDealer.dealerName!""}</option>
-                            </#list>
-                        </#if>
+                            <#if dmDealerList?? &&  (dmDealerList?size > 0) >
+                                <#list dmDealerList as dmDealer>
+                                    <option value ="${dmDealer.dealerId!""}">${dmDealer.dealerName!""}</option>
+                                </#list>
+                            </#if>
                         </select>
-                        </span>
                     </div>
+
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;"> <span class="select-box">
                         <select name="storeId" class="select" id="storeId">
+                            <option value="">选择店铺</option>
                         </select>
                         </span>
                     </div>
@@ -91,27 +92,42 @@
                         </span>
                      </div>
 
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 180px;line-height: 29px;" >
+                        <select class="chosenColorId select" name="colorId" id="colorId"  style="width: 1000px;">
+                            <option value="">产品名称(颜色)</option>
+                            <#if productColorList?? &&  (productColorList?size > 0) >
+                                <#list productColorList as productColor>
+                                    <option value="${productColor.colorId}">${productColor.productName}(${productColor.colorName})</option>
+                                </#list>
+                            </#if>
+                        </select>
+                    </div>
+                </div>
+
+
+                <div class="row cl" style="margin-left: 0px;">
                     <div class="formControls col-2 col-sm-2"  style="padding: 0px 10px 0px 0px; width: 110px;">
                         <input type="text" class="input-text" value="" placeholder="订单号" id="salesOrderId" name="">
                     </div>
 
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
-                         <input type="text" class="input-text" value="" placeholder="收货人姓名" id="salesAddressName" name="">
-                     </div>
-                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;">
-                         <input type="text" class="input-text" value="" placeholder="收货人电话" id="salesAddressTel" name="">
-                     </div>
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" >
+                        <input type="text" class="input-text" value="" placeholder="收货人姓名" id="salesAddressName" name="">
+                    </div>
+
+                    <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;">
+                        <input type="text" class="input-text" value="" placeholder="收货人电话" id="salesAddressTel" name="">
+                    </div>
 
-                     <div class="formControls col-4 col-sm-4" style="padding: 0px 10px 0px 0px; width: 125px;">
-                         <input type="text" style="width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly"/>
-                     </div>
+                    <div class="formControls col-4 col-sm-4" style="padding: 0px 10px 0px 0px; width: 125px;">
+                        <input type="text" style="width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly"/>
+                    </div>
                     <div class="formControls col-4 col-sm-4" style="padding: 0px 10px 0px 0px; width: 125px;">
                         <input type="text" style="width:120px;height:30px;margin-right: 0px;font-size: 9px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss'})"  readonly="readonly"/>
-                     </div>
+                    </div>
 
-                     <div class="formControls col-1 col-sm-1" >
-                         <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="searchOrder" name="">搜索</button>
-                     </div>
+                    <div class="formControls col-1 col-sm-1" >
+                        <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="searchOrder" name="">搜索</button>
+                    </div>
                 </div>
             </form>
         </div>
@@ -196,6 +212,7 @@
         var salesAddressName =cufte($("#salesAddressName").val());
         var salesAddressTel = cufte($("#salesAddressTel").val());
         var salesOrderId = cufte($("#salesOrderId").val());
+        var colorId = cufte($("#colorId").val());
         var startDate = cufte($("#startDate").val());
         var endDate = cufte($("#endDate").val());
         $.ajax({
@@ -209,6 +226,7 @@
                 salesOrderId : salesOrderId,
                 salesAddressName : salesAddressName,
                 salesAddressTel : salesAddressTel,
+                colorId : colorId,
                 startDate : startDate,
                 endDate : endDate,
                 orderDateType : 1,
@@ -314,6 +332,40 @@
             }
         });
     }
+
+   $('.chosenDealerId').chosen({
+        no_results_text: "没有找到结果！",//搜索无结果时显示的提示
+        search_contains:true,   //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许，选中选项会有一个x号可以删除选项
+        disable_search: false, //禁用搜索。设置为true，则无法搜索选项。
+        disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
+        inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
+        placeholder_text_single: '选择产品', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
+        width: '250px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
+        max_shown_results: 1000, //下拉框最大显示选项数量
+        display_disabled_options: false,
+        single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除
+        case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
+        group_search: false, //选项组是否可搜。此处搜索不可搜
+        include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示，true显示。默认false。
+    });
+    $('.chosenColorId').chosen({
+        no_results_text: "没有找到结果！",//搜索无结果时显示的提示
+        search_contains:true,   //关键字模糊搜索。设置为true，只要选项包含搜索词就会显示；设置为false，则要求从选项开头开始匹配
+        allow_single_deselect:true, //单选下拉框是否允许取消选择。如果允许，选中选项会有一个x号可以删除选项
+        disable_search: false, //禁用搜索。设置为true，则无法搜索选项。
+        disable_search_threshold: 0, //当选项少等于于指定个数时禁用搜索。
+        inherit_select_classes: true, //是否继承原下拉框的样式类，此处设为继承
+        placeholder_text_single: '选择产品', //单选选择框的默认提示信息，当选项为空时会显示。如果原下拉框设置了data-placeholder，会覆盖这里的值。
+        width: '350px', //设置chosen下拉框的宽度。即使原下拉框本身设置了宽度，也会被width覆盖。
+        max_shown_results: 1000, //下拉框最大显示选项数量
+        display_disabled_options: false,
+        single_backstroke_delete: false, //false表示按两次删除键才能删除选项，true表示按一次删除键即可删除
+        case_sensitive_search: false, //搜索大小写敏感。此处设为不敏感
+        group_search: false, //选项组是否可搜。此处搜索不可搜
+        include_group_label_in_selected: true //选中选项是否显示选项分组。false不显示，true显示。默认false。
+    });
+
 </script>
 </body>
 </html>