修改

src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -173,4 +173,9 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     int clearRepeat(TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult);
 
     String getVersionValue(int versionId);
+
+    String getOrderDate(BigDecimal saleMaterialIdOld);
+
+    Date getMakeDate(BigDecimal saleMaterialIdOld);
+
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckSelfMachineService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.RulesMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.service.ITmstruckSelfMachineService;
@@ -26,6 +27,9 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
     @Autowired
     TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
 
+    @Autowired
+    RulesMapper rulesMapper;
+
     /**
      * 提货单信息
      * @param orderNumber
@@ -157,6 +161,15 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
         }catch (Exception e){
             System.out.println("e"+e.getMessage());
         }
+        for(Map<String,Object> dateMap : (List<Map<String,Object>>) map.get("deliveryOrderMaterialList")){
+            System.out.println(dateMap);
+            //查询订单日期
+            String orderDate = tmstruckLeaveFactoryResultMapper.getOrderDate(DataChange.dataToBigDecimal(dateMap.get("saleMaterialIdOld")));
+            dateMap.put("orderDate",orderDate);
+            Date makeDate = tmstruckLeaveFactoryResultMapper.getMakeDate(DataChange.dataToBigDecimal(dateMap.get("saleMaterialIdOld")));
+            dateMap.put("makeDate",makeDate);
+        }
+        map.put("orderTimeFlag",rulesMapper.getVersionValue(15) == 1 ? 1 : null);
         return map;
     }
 

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2212,6 +2212,9 @@
                         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS
                         END) LIKE '%${receiveAddress}%'
                     </if>
+                    <if test="receiveCustomer != null">
+                        and ASO.SALE_ORDER_RECEIVE_CUSTOMER = #{receiveCustomer}
+                    </if>
                     <if test="easPrimaryId != null">
                         and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
                     </if>

src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1627,4 +1627,14 @@
             ROWS ONLY
         )
     </delete>
+    <select id="getOrderDate" resultType="java.lang.String" parameterType="decimal">
+        SELECT to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE ASTM.MATERIAL_ID = #{saleMaterialIdOld}
+    </select>
+    <select id="getMakeDate" resultType="java.util.Date" parameterType="decimal">
+        SELECT SALE_MAKE_DATE FROM AMS_SALE_MATERIAL ASM
+        WHERE ASM.SALE_MATERIAL_ID = #{saleMaterialIdOld}
+    </select>
 </mapper>