Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -2,9 +2,11 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.service.impl.TmstruckMeasureCommissionServiceImpl;
+import com.steerinfo.dil.service.impl.UtilsServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.route.service.impl.RouteServiceImpl;
 import com.steerinfo.route.vo.Map.RouteVo;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -17,6 +19,7 @@ import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
+@RequestMapping("/${api.version}/Test")
 public class TestController extends BaseRESTfulController {
 
     @Autowired
@@ -26,6 +29,10 @@ public class TestController extends BaseRESTfulController {
 
     @Autowired
     TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+
+    @Autowired
+    private UtilsServiceImpl utilsService;
+
     @PostMapping("/savePath")
     public String savePath() throws Exception {
 
@@ -67,4 +74,11 @@ public class TestController extends BaseRESTfulController {
         return createOrder.get();
     }
 
+
+    @PostMapping("/Test")
+    public int test(){
+        utilsService.pushMesToWebsocket("湘M99999","排队信息");
+        return 1;
+    }
+
 }

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

@@ -201,7 +201,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         String capacityNumber = (String) mesMap.get("capacityNumber");
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
-        if(orderType == 11){
+        if(orderType == 11 || orderType == 15 || orderType == 16){
             int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
             map.put("resultId",tmstruckLoadResultMapper.selectMaxId());

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

@@ -60,7 +60,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
-    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17);
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16);
 
     //给达兴发委托
     private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
@@ -383,10 +383,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("packagesNum", 0);
                 break;
             case 20://采购内转委托总厂区
+            case 15:
+            case 16:
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
                 if(measureCommission == null){
                     return 0;
                 }
+                if(orderType == 16){
+                    measureCommission.put("factory","dg");
+                }
                 measureCommission.put("isRelationEAS",false);
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel",false);
@@ -394,8 +399,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
         }
-        if(measureCommission != null)
+        if(measureCommission != null){
             map.put("materialId", measureCommission.get("materialId"));
+        }
         addMeasureCommission(map); // 添加计量委托
         /*访问接口发送数据*/
         return sendMesToMeasure(measureCommission);
@@ -600,9 +606,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 14:
 
                 break;
-            case 15:
             case 20:
-            case 16: //发送计量委托(查询物资顺序第一个装卸货的物资)
+                //发送计量委托(查询物资顺序第一个装卸货的物资)
                 //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
@@ -616,6 +621,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 11:
             case 17:
             case 18:
+            case 15:
+            case 16:
                 i+=addMaoMeasureCommission(map);
         }
         return i;

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

@@ -149,7 +149,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
         int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //判断是不是内转
-        if(orderType == 11){
+        if(orderType == 11 || orderType == 15 || orderType == 16){
             //如果是内转新增卸货实绩
             Integer sqe = utilsMapper.getLineSequenceByOrderNumber((String) map.get("orderNumber"));
             sqe = sqe == null ? 1 : sqe +1;

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -173,7 +174,7 @@ public class UtilsServiceImpl implements IUtilsService {
 
         //添加消息实体
         HashMap<Object, Object> mesMap = new HashMap<>();
-        mesMap.put("messageType", 4); //用于进厂后 刷新消息
+        mesMap.put("messageType", 5); //用于进厂后 刷新消息
         mesMap.put("sendPerson", "system");
         mesMap.put("receivePerson", capacityNumber);
         mesMap.put("messageContent", pushMes + new Date());
@@ -187,7 +188,6 @@ public class UtilsServiceImpl implements IUtilsService {
         imFeign.sendToUser(sendMap);
     }
 
-
     public int randomGetValue(List<Integer> dataList){
         if(dataList.size() != 0&&dataList !=null){
             if(dataList.size() == 1){

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

@@ -576,7 +576,7 @@
             join RMS_CARRIER RCA
                 on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
-        where OO.ORDER_TYPE in (12,15)
+        where OO.ORDER_TYPE = 12
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -597,9 +597,6 @@
         <if test="userIds!=null">
             and ASO.UPDATE_USERNAME=#{userIds}
         </if>
-        <if test="orderType!=null">
-            and OO.ORDER_TYPE=#{orderType}
-        </if>
         )
         <where>
             <if test="receiveName != null">
@@ -640,7 +637,7 @@
             <if test="resultTareWeightTime != null">
                 and
                 <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultTareWeightTime" like '%${item}%'
+                    to_char("resultTareWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultTareWeight != null">
@@ -652,7 +649,7 @@
             <if test="resultEndTime != null">
                 and
                 <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
-                    "resultEndTime" like '%${item}%'
+                    to_char("resultEndTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="warehouseName != null">
@@ -664,7 +661,7 @@
             <if test="resultGrossWeightTime != null">
                 and
                 <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeightTime" like '%${item}%'
+                    to_char("resultGrossWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultGrossWeight != null">
@@ -769,7 +766,7 @@
             join RMS_CARRIER RCA
             on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
-        where OO.ORDER_TYPE in (13,16)
+        where OO.ORDER_TYPE = 13
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -790,9 +787,6 @@
         <if test="userIds!=null">
             and ASO.UPDATE_USERNAME=#{userIds}
         </if>
-        <if test="orderType!=null">
-            and OO.ORDER_TYPE=#{orderType}
-        </if>
         )
         <where>
             <if test="receiveName != null">
@@ -1160,7 +1154,7 @@
             <if test="resultTareWeightTime != null">
                 and
                 <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultTareWeightTime" like '%${item}%'
+                    to_char("resultTareWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
 
@@ -1172,7 +1166,7 @@
             <if test="resultGrossWeightTime != null">
                 and
                 <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeightTime" like '%${item}%'
+                    to_char("resultGrossWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultGrossWeight != null">

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

@@ -1039,10 +1039,9 @@
             rca.address_province "province",
             rca.address_district "district",
             rca.address_town "town",
-            rca.address_delivery_address "deliveryAddress",
+            rrp.address_delivery_address "deliveryAddress",
             asom.sale_order_consignee "consignee",
             asom.sale_order_consignee_tel "consigneeTel",
-            asom.sale_date_of_receipt "receiptDate",
             rsh.SHIPPER_NAME "shippername",
             sysdate "sendDate"
         from omstruck_order oo
@@ -1071,9 +1070,13 @@
              on
                  rcr.carrier_id = adso.carrier_id
                  left join
+             RMS_RECEIVE_PLACE rrp
+             on
+                 rrp.PLACE_ID = asom.SALE_SHIPPING_ADDRESS_ID
+                 left join
              rms_receive_address rca
              on
-                 rca.address_id = asom.sale_shipping_address_id
+                 rca.address_id = rrp.ADDRESS_ID
         left join RMS_SHIPPER rsh
         on rsh.SHIPPER_ID = aso.SHIPPER_ID
         where oo.order_number =#{orderNumber}
@@ -1086,8 +1089,7 @@
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight",
-            ruom.unit_of_measure_name "measureName",
-            twr.RESULT_NET_WEIGHT "resultWeight"
+            tlr.RESULT_LOAD_START_TIME "makeDate"
         from omstruck_order oo
                  left join
              omstruck_order_material oom
@@ -1107,8 +1109,13 @@
                 left  join
             TMSTRUCK_WEIGHT_RESULT twr
             on
-                 twr.RESULT_TOTAL_ID =   ttr.ORDER_ID
+                 twr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
             and twr.MATERIAL_ID = oom.MATERIAL_ID
+                left  join
+            TMSTRUCK_LOAD_RESULT tlr
+            on
+                  tlr.RESULT_TOTAL_ID =   ttr.RESULT_TOTAL_ID
+            and tlr.MATERIAL_ID = oom.MATERIAL_ID
         where oo.order_number = #{orderNumber}
     </select>
     <!--零星物资出厂实绩列表 -->

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

@@ -1538,7 +1538,13 @@
       <if test="resultLoadStartTime != null">
         and
         <foreach collection="resultLoadStartTime" item="item" open="(" separator="or" close=")">
-          "resultLoadStartTime" like '%${item}%'
+          to_char("resultLoadStartTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultLoadEndTime != null">
+        and
+        <foreach collection="resultLoadEndTime" item="item" open="(" separator="or" close=")">
+          to_char("resultLoadEndTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
         </foreach>
       </if>
       <if test="warehouseName != null">

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

@@ -747,6 +747,8 @@
         select
             APO.PURCHASE_ORDER_NO   "purchaseOrder",
             APO.SUPPLIER_SCREEN_INFO    "supplierScreenInfo",
+            APO.QIITEM              "qiItem",
+            APO.RESOURCE_POINT      "resourcePoint",
             OO.ORDER_NUMBER         "transportNum",
             RC.CAPACITY_NUMBER      "carNum",
             RTC.TRUCK_CALCULATE_NUMBER "steelyardNum",
@@ -1106,6 +1108,8 @@
                 SELECT
                     OO.ORDER_NUMBER "transportNum",
                     RC.CAPACITY_NUMBER "carNum",
+                    APO.QIITEM              "qiItem",
+                    APO.RESOURCE_POINT      "resourcePoint",
                     APO.PURCHASE_ORDER_NO "purchaseOrder",
                     RS.SUPPLIER_NAME "sendUnit",
                     RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
@@ -1113,6 +1117,7 @@
                     TWR.INSERT_UPDATE_REMARK "demo",
                     RM.MATERIAL_ID "materialId",
                     RM.MATERIAL_NAME "materiaName",
+                    DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
                     concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
                     RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
                 FROM
@@ -1131,6 +1136,7 @@
                         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_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                        LEFT JOIN DIL_BATCH DB ON DB.BATCH_ID = APO.BATCH_ID
                 WHERE
                     OO.ORDER_ID = #{orderId}
                 ORDER BY

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

@@ -667,10 +667,10 @@
 
   <!-- 查询计时作业 -->
   <select id="getAllTimeTaskResult" resultType="java.util.Map">
-    select RC.CAPACITY_NUMBER "capacityNumber",
-           OO.ORDER_ID "orderId",
+    select * from (select RC.CAPACITY_NUMBER "capacityNumber",
+    OO.ORDER_ID "orderId",
     OO.ORDER_NUMBER "orderNumber",
-    CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME)  AS "resultTime",
+    CONCAT(TTTR.RESULT_VALUE,RUOM.UNIT_OF_MEASURE_NAME) AS "resultTime",
     RCT.CAPACITY_TYPE_NAME "capacityTypeName",
     TTTR.INSERT_TIME "insertTime",
     (
@@ -715,17 +715,17 @@
     LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
     ON TTR.ORDER_ID=OO.ORDER_ID
     LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
-    ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+    ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
     LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
     ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
-    LEFT JOIN  RMS_CAPACITY RC
+    LEFT JOIN RMS_CAPACITY RC
     ON RC.CAPACITY_ID=OO.CAPACITY_ID
     LEFT JOIN RMS_CAPACITY_TYPE RCT
     ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
-    where TTTR.RESULT_TIME_TYPE = 3  AND   TTTR.RESULT_VALUE IS NOT NULL
+    where TTTR.RESULT_TIME_TYPE = 3 AND TTTR.RESULT_VALUE IS NOT NULL
     <if test="con!=null">
-      AND RC.CAPACITY_NUMBER LIKE #{con} or  RM.MATERIAL_NAME LIKE  #{con}
-      or  RS.SHIPPER_NAME LIKE #{con}
+      AND RC.CAPACITY_NUMBER LIKE #{con} or RM.MATERIAL_NAME LIKE #{con}
+      or RS.SHIPPER_NAME LIKE #{con}
     </if>
     <if test="userId!=null">
       AND oo.INSERT_USERNAME LIKE #{userId}
@@ -736,7 +736,7 @@
     <if test="startDate != null">
       and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TTTR.INSERT_TIME
       and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TTTR.INSERT_TIME
-    </if>
+    </if>)
     <where>
       <if test="orderNumber != null">
         <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -776,13 +776,13 @@
       <if test="startTime != null">
         and
         <foreach collection="startTime" item="item" open="(" separator="or" close=")">
-          "startTime" like '%${item}%'
+          to_char("startTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
         </foreach>
       </if>
       <if test="endTime != null">
         and
         <foreach collection="endTime" item="item" open="(" separator="or" close=")">
-          "endTime" like '%${item}%'
+          to_char("endTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
         </foreach>
       </if>
       <if test="timingTime != null">

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

@@ -865,7 +865,6 @@
 
     <!--  查询内转厂内卸货实绩  -->
     <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
-
         SELECT *
         FROM (
         SELECT TUR.RESULT_ID             "resultId",
@@ -924,16 +923,10 @@
                     "warehouseName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultStartTime != null">
-                and
-                <foreach collection="resultStartTime" item="item" open="(" separator="or" close=")">
-                    "resultStartTime" like '%${item}%'
-                </foreach>
-            </if>
             <if test="resultEndTime != null">
                 and
                 <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
-                    "resultEndTime" like '%${item}%'
+                    to_char("resultEndTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultNetWeight != null">

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

@@ -2078,8 +2078,10 @@
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
         RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+        RTC1.TRUCK_CALCULATE_NUMBER "grossCalculateNumber",
         TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME,TWR.RESULT_TARE_WEIGHT_TIME) "netWeightTime",
         TWR.RESULT_TARE_WEIGHT "resultTareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
@@ -2094,11 +2096,13 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        left join RMS_TRUCK_CALCULATE RTC1
+        on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_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
-        where RESULT_TARE_WEIGHT_TIME is not null
+        where TWR.RESULT_NET_WEIGHT IS NOT NULL
         and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
@@ -2134,7 +2138,7 @@
             <if test="resultGrossWeightTime != null">
                 and
                 <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeightTime" like '%${item}%'
+                    to_char("resultGrossWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultTareWeight != null">
@@ -2152,7 +2156,7 @@
             <if test="resultTareWeightTime != null">
                 and
                 <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultTareWeightTime" like '%${item}%'
+                    to_char("resultTareWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
                 </foreach>
             </if>
             <if test="resultNetWeight != null">
@@ -2161,10 +2165,16 @@
                     "resultNetWeight" like '%${item}%'
                 </foreach>
             </if>
+            <if test="netWeightTime != null">
+                and
+                <foreach collection="netWeightTime" item="item" open="(" separator="or" close=")">
+                    to_char("netWeightTime",'yyyy-mm-dd hh24:mi:ss') like '%${item}%'
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
         <if test="orderField == null  ">
-            order by "resultTareWeightTime" desc
+            order by "netWeightTime" desc
         </if>
     </select>