Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

pom.xml

@@ -118,7 +118,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
-                        <param>OMSTRUCK_ORDER</param>
+                        <param>AMSSHIP_DELIVERY_NOTICE</param>
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -55,8 +55,8 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @Autowired
     JoinFeign joinFeign;
 
-
     private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
     /**
      * 展示承运商接收销售公司已接受的销售订单
      *
@@ -290,7 +290,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                           Integer orderType,
                                           Integer fuelOrder,
                                           String con,
-                                          String carrierSSOId) {
+                                          String carrierSSOId,
+                                          String startTime,
+                                          String endTime) {
+
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -311,6 +314,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
@@ -762,11 +766,16 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                               Integer orderStatus,
                                               Integer fuelOrder,
                                               String carrierSSOId,
-                                              String con
+                                              String con,
+                                              String startTime,
+                                              String endTime
     ) {
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
         }
+        if (con != null||"null".equals(con)) {
+            mapValue.put("con", con);
+        }
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -778,6 +787,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
                 mapValue.put("carrierSSOId", carrierSSOId);
             }
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);

src/main/resources/bootstrap.yml

@@ -17,8 +17,8 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
-    register-with-eureka: false #表示向EurekaServer注册自己 默认为true
-    fetch-registry: false #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
+    register-with-eureka: true #表示向EurekaServer注册自己 默认为true
+    fetch-registry: true #是否从EurekaServer抓取已有的注册信息，默认为true,单节点无所谓,集群必须设置为true才能配合ribbon使用负载均衡
 
   instance:
     prefer-ip-address: true

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

@@ -896,9 +896,16 @@
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OO.ORDER_ISSUE_TIME
+            </if>
             <if test="con!=null">
-                and (instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
-                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0)
+                and ((instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
             </if>
         </where>
         )
@@ -1530,6 +1537,17 @@
             <if test="carrierSSOId != null">
                 and RCA.CARRIER_SSO_ID = #{carrierSSOId}
             </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCON.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
         </where>
         )
         <where>
@@ -1889,10 +1907,15 @@
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
         RM.MATERIAL_MODEL "materialModel",
-        OO.DRIVER_TEL "drivelTel"
+        OO.DRIVER_TEL "drivelTel",
+        ASM.SALE_WAREHOUSE "saleWarehouse"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         LEFT JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
@@ -1925,7 +1948,6 @@
             <if test="orderTypee!=null">
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
-
             <if test="shipperId!=null">
                 and ASO.SHIPPER_ID = #{shipperId}
             </if>
@@ -3815,8 +3837,9 @@
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
         CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
-        TTR.RESULT_TOTAL_ID "resultTotalId"
-
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -3874,44 +3897,62 @@
     </select>
 
     <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
-        SELECT OO.ORDER_NUMBER            AS "orderNumber",
-               RCC.CAPACITY_NUMBER        AS "capacityNumber",
-               TWR.RESULT_NET_WEIGHT      AS "netWeight",
-               TWR.RESULT_TARE_WEIGHT     AS "tareWeight",
-               TWR.RESULT_GROSS_WEIGHT    AS "grossWeight",
-               TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
-               TLFR.RESULT_OUT_GATE_TIME  AS "outGateTime",
-               TLR.RESULT_LOAD_START_TIME AS "loadTime",
-               RM.MATERIAL_NAME           AS "materialName",
-               OOM.ORDER_MATERIAL_WEIGHT  AS "materialWeight",
-               OO.ORDER_STATUS            AS "orderStatus"
+        SELECT OO.ORDER_NUMBER AS "orderNumber",
+        RCC.CAPACITY_NUMBER AS "capacityNumber",
+        TWR.RESULT_NET_WEIGHT AS "netWeight",
+        TWR.RESULT_TARE_WEIGHT AS "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME AS "tareTime",
+        TWR.RESULT_GROSS_WEIGHT_TIME AS "grossTime",
+        TWR.RESULT_GROSS_WEIGHT AS "grossWeight",
+        RTCT.TRUCK_CALCULATE_NUMBER AS "tareCalculate",
+        RTCG.TRUCK_CALCULATE_NUMBER AS "grossCalculate",
+        TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
+        TLFR.RESULT_OUT_GATE_TIME AS "outGateTime",
+        TLR.RESULT_LOAD_START_TIME AS "loadTime",
+        RWA.WAREHOUSE_NAME AS "warehouse",
+        RM.MATERIAL_NAME AS "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+        RGE.GATEPOST_NAME AS "enGatepost",
+        RGL.GATEPOST_NAME AS "outGatepost",
+        OO.ORDER_STATUS AS "orderStatus",
+        ASO.DELETED AS "deleted"
         FROM AMS_SALE_ORDER ASO
-                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                 LEFT JOIN OMSTRUCK_ORDER OO
-                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-                           ON OOM.ORDER_ID = OO.ORDER_ID
-                 LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 LEFT JOIN RMS_CAPACITY RCC
-                           ON RCC.CAPACITY_ID = OO.CAPACITY_ID
-                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                           ON TTR.ORDER_ID = OO.ORDER_ID
-                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
-                           ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
-                           ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
-                           ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
-                           ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RCC
+        ON RCC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCT
+        ON RTCT.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCG
+        ON RTCG.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGE
+        ON RGE.GATEPOST_ID = TER.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RWA
+        ON RWA.WAREHOUSE_ID = TLR.LOADING_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGL
+        ON RGL.GATEPOST_ID = TLFR.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+        ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
-          AND OO.ORDER_STATUS IS NOT NULL
-          AND OO.ORDER_TYPE IN (1,2)
-        <if test="con != null" >
+        AND OO.ORDER_STATUS IS NOT NULL
+        AND OO.ORDER_TYPE IN (1,2)
+        <if test="con != null">
             AND RCC.CAPACITY_NUMBER LIKE #{con}
         </if>
         ORDER BY OO.ORDER_NUMBER DESC