Merge remote-tracking branch 'origin/master'

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

@@ -138,4 +138,6 @@ public interface UtilsMapper {
 
     String getRequireRemark(BigDecimal orderId);
 
+    //查询总实绩的订单是否包含某个物资的数目
+    int getMaterialNumByTotal(Map<String,Object> map);
 }

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

@@ -94,6 +94,15 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         gatepostIdList.remove(null);
         //随机取门岗值
         Integer gatepostId = utilsService.randomGetValue(gatepostIdList);
+        try{
+            //如果是物资里有钒渣，则取5
+            map.put("con","钒渣");
+            if(utilsMapper.getMaterialNumByTotal(map) > 0){
+                gatepostId=5;
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
         //获取门岗ID
         tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
         //添加路段顺序号

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

@@ -68,12 +68,13 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = mobile.trim();
-        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。退订";
+        String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";
         String sendUrl = url+"timestamp=" + tmpTmp + "&sign=" + sign + "&mobiles=" + mobile1 + "&content=" + content;
         System.out.println(mobile1);
         String jsonData = null;
         JSONObject jsonObject = new JSONObject();
         jsonData = HTTPRequestUtils.send(sendUrl,jsonObject,"utf-8");
+        System.out.println(jsonData);
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);

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

@@ -147,6 +147,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+        if(mesMap==null){
+            return -5;
+        }
         //卸货时查询是否含有净重
         BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);

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

@@ -2177,6 +2177,14 @@
                         0,'未上报') like '%${item}%'
                     </foreach>
                     </if>
+                    <if test="saleRemarkList != null">
+                        and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
+                        ASO.sale_remark like '%${item}%'
+                    </foreach>
+                    </if>
+                    <if test="consigneeLoginName != null">
+                        and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
+                    </if>
                     order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID  DESC
                      )
     </select>
@@ -2629,12 +2637,14 @@
                            r_carrier.carrier_id "carrierId",
                            r_carrier.carrier_name "carrierName",
                            oo.ORDER_ID "orderId",
+                           r_cap.CAPACITY_TEL "capacityTel",
                            NVL( r_carrier.carrier_id, 0 ) "carrierIds",
                            NVL( r_cap.capacity_id, 0 ) "capacityIds",
                             RDOINDEP.ORG_NAME "transInDep",
                            RDOOUTDEP.ORG_NAME "transOutDep",
                            RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse",
                            oo.ORDER_NUMBER  "orderNumber",
+                           oo.ORDER_STATUS "orderStatus",
                            TWR.RESULT_NET_WEIGHT    "netWeight"
                        FROM
                            AMS_SALE_ORDER ASO
@@ -2660,6 +2670,7 @@
                        WHERE
                            ASO.SALE_TYPE = 4
                          AND ASO.DELETED = 0
+                         AND rc.CONSIGNEE_COMPANY_NAME IS NOT NULL
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
         </if>
@@ -2680,6 +2691,7 @@
             and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
         </if>
         ORDER BY
+        ASO.SALE_ORDER_ID DESC,
         oo.ORDER_ID DESC)
     </select>
     <select id="getSteelReportDetailsBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">

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

@@ -386,4 +386,12 @@
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getMaterialNumByTotal" resultType="java.lang.Integer">
+        SELECT COUNT(DISTINCT OOM .ORDER_MATERIAL_ID)
+        FROM TMSTRUCK_TOTAL_RESULT TTR
+                 LEFT JOIN OMSTRUCK_ORDER OO ON OO .ORDER_ID = TTR .ORDER_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 TTR .RESULT_TOTAL_ID=#{resultTotalId} AND RM .MATERIAL_NAME LIKE CONCAT('%',CONCAT(#{con},'%'))
+    </select>
 </mapper>