根据预期到货时间查询

suishenbang-order/src/main/java/com/dgtly/order/domain/MetaHanaSalesOrder.java

@@ -79,6 +79,8 @@ public class MetaHanaSalesOrder extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expectedTime;
 
+    private String expectedTimeStr;//预期到货时间 字符串
+
     public String getDocNumber() {
         return docNumber;
     }
@@ -303,6 +305,14 @@ public class MetaHanaSalesOrder extends BaseEntity {
         this.expectedTime = expectedTime;
     }
 
+    public String getExpectedTimeStr() {
+        return expectedTimeStr;
+    }
+
+    public void setExpectedTimeStr(String expectedTimeStr) {
+        this.expectedTimeStr = expectedTimeStr;
+    }
+
     @Override
     public String toString() {
         return "MetaHanaSalesOrder{" +

suishenbang-order/src/main/java/com/dgtly/order/mapper/MetaHanaSalesOrderMapper.java

@@ -21,4 +21,6 @@ public interface MetaHanaSalesOrderMapper  {
 
     @MapKey("order_number")
     Map<String,Map<String,Object>> selectOrderExcepTimeByList(List<String> orderNumbers);
+
+    List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder1(MetaHanaSalesOrder metaHanaSalesOrder);
 }

suishenbang-order/src/main/java/com/dgtly/order/service/impl/MetaHanaSalesOrderServiceImpl.java

@@ -1,15 +1,18 @@
 package com.dgtly.order.service.impl;
 
+import com.dgtly.common.utils.DateUtils;
 import com.dgtly.order.domain.MetaHanaSalesOrder;
 import com.dgtly.order.mapper.MetaHanaSalesOrderMapper;
 import com.dgtly.order.service.IMetaHanaSalesOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.logging.SimpleFormatter;
 
 /**
  * <p>
@@ -22,14 +25,14 @@ import java.util.Map;
 @Service
 public class MetaHanaSalesOrderServiceImpl implements IMetaHanaSalesOrderService {
 
-    @Autowired
+    @Resource
     private MetaHanaSalesOrderMapper metaHanaSalesOrderMapper;
 
 
     @Override
     public List<MetaHanaSalesOrder> selectDistinctMetaHanaSalesOrder(MetaHanaSalesOrder metaHanaSalesOrder) {
 
-        List<String> orderNumbers = new ArrayList<>();
+        /*List<String> orderNumbers = new ArrayList<>();
         List<MetaHanaSalesOrder> list =  metaHanaSalesOrderMapper.selectDistinctMetaHanaSalesOrder(metaHanaSalesOrder);
         for(MetaHanaSalesOrder m:list){
             orderNumbers.add(m.getDocNumber());
@@ -41,7 +44,11 @@ public class MetaHanaSalesOrderServiceImpl implements IMetaHanaSalesOrderService
                 m.setExpectedTime((Date)timeList.get(m.getDocNumber()).get("expected_time"));
             }
 
+        }*/
+        if(metaHanaSalesOrder.getExpectedTime() != null){
+            metaHanaSalesOrder.setExpectedTimeStr(DateUtils.dateTime(metaHanaSalesOrder.getExpectedTime()));
         }
+        List<MetaHanaSalesOrder> list =  metaHanaSalesOrderMapper.selectDistinctMetaHanaSalesOrder1(metaHanaSalesOrder);
         return list;
     }
 

suishenbang-order/src/main/resources/mapper/order/MetaHanaSalesOrderMapper.xml

@@ -60,4 +60,26 @@
         </foreach>
     </select>
 
+    <select id="selectDistinctMetaHanaSalesOrder1" parameterType="MetaHanaSalesOrder" resultMap="MetaHanaSalesResult">
+        select distinct mhso.DOC_NUMBER, mhso.CUSTOMER_CODE, mhso.CUSTOMER_NAME,
+        mhso.CREATE_DATE, mhso.CREDIT_DATE, mhso.CREDIT_STATUS, mhso.REJECT_REASON
+        <if test="expectedTimeStr != null  and expectedTimeStr != ''">
+            ,sob.expected_time as expectedTime
+        </if>
+
+        from meta_hana_sales_order mhso
+        LEFT JOIN sales_order_base sob
+        on mhso.DOC_NUMBER = sob.order_number
+        <where>
+            <if test="docNumber != null  and docNumber != ''"> and mhso.DOC_NUMBER like concat('%', #{docNumber}, '%')</if>
+            <if test="salesOrg != null  and salesOrg != ''"> and mhso.SALES_ORG =#{salesOrg}</if>
+            <if test="salesOrgName != null  and salesOrgName != ''"> and mhso.SALES_ORG_NAME like concat('%', #{salesOrgName}, '%')</if>
+            <if test="customerCode != null  and customerCode != ''"> and mhso.CUSTOMER_CODE like concat('%', #{customerCode}, '%')</if>
+            <if test="customerName != null  and customerName != ''"> and mhso.CUSTOMER_NAME like concat('%', #{customerName}, '%')</if>
+            <if test="docType != null  and docType != ''"> and mhso.DOC_TYPE = #{docType}</if>
+            <if test="creditStatus != null  and creditStatus != ''"> and mhso.CREDIT_STATUS = #{creditStatus}</if>
+            <if test="expectedTimeStr != null  and expectedTimeStr != ''"> and sob.expected_time like concat('%', #{expectedTimeStr}, '%')</if>
+        </where>
+    </select>
+
 </mapper>

suishenbang-order/src/main/resources/templates/order/orderbase/orderbase.html

@@ -3,6 +3,9 @@
 <head>
     <th:block th:include="include :: header('订单基础 订单的基础信息列表')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <style type='text/css'>
+        .control-label{padding-right : 0px}
+    </style>
 </head>
 <body class="gray-bg">
     <div class="container-div">
@@ -59,7 +62,17 @@
                             <!--<div class="input-group col-sm-8">-->
                             <!--<input class="form-control" type="text" name="salesOrgName"/>-->
                             <!--</div>-->
+                            <label class="control-label col-sm-4">期望到货时间：</label>
+                            <div class="input-group col-sm-8">
+                                <input id="date"
+                                       class="form-control"
+                                       type="text"
+                                       name="expectedTime"
+                                       value=""
+                                       placeholder="查询年月日" >
+                            </div>
                         </div>
+
                         <div class="form-group col-sm-4 row">
                             <div class="form-group" style="float: right;">
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -95,6 +108,17 @@
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
+         $('#date').datetimepicker({
+            forceParse: 0,//设置为0，时间不会跳转1899，会显示当前时间。
+            language: 'zh-CN',//显示中文
+            format: 'yyyy-mm-dd',//显示格式
+            minView: "month",//设置只显示到月份
+            initialDate: new Date(),//初始化当前日期
+            autoclose: true,//选中自动关闭
+            todayBtn: true//显示今日按钮
+        })
+        //$("#date").datetimepicker("setDate", new Date() );  //设置显示默认当天的时间
+
         var editFlag = [[${@permission.hasPermi('order:orderbase:edit')}]];
         //var removeFlag = [[${@permission.hasPermi('order:orderbase:remove')}]];
         var orderStatusDatas = [[${@dict.getType('order_type')}]];