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

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

@@ -63,9 +63,9 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
     }
 
     public int generaSendMessage(String mobile,String capacityNum,BigDecimal orderId) throws Exception {
-        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-10QNI&";
+        String url = "http://www.btom.cn:8080/simpleinter/sendSMS?appId=EUCP-EMY-SMS1-0RHMZ&";
         String tmpTmp = MD5Util.formatTimeTmp();
-        String sign = MD5Util.sign("EUCP-EMY-SMS1-10QNI","EE20B0B28B75E567");
+        String sign = MD5Util.sign("EUCP-EMY-SMS1-0RHMZ","CC1A5DEBB4590DA");
         String driverTel = tmstruckSmsRusultMapper.getDriverTel(orderId);
         String mobile1 = mobile.trim();
         String content = "【达州钢铁】您好!您在达钢购买的钢材已发车。司机电话:" + driverTel + "。欲知详情，请前往达州钢铁智慧物流平台查看车辆实时轨迹。";

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

@@ -166,7 +166,21 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             map.put("Sqe",sqe);
             map.put("totalId",totalId);
             TmstruckUnloadResult tmstruckUnloadResult = generateUnload(map);
-            tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+            try{
+                Integer resultId=tmstruckUnloadResultMapper.checkMaterialIdUnload(totalId, DataChange.dataToBigDecimal(map.get("materialId")));
+                if(orderType == 11 && resultId != null){
+                    //如果已经存在，根据主键更新
+                    tmstruckUnloadResult.setResultId(new BigDecimal(resultId));
+                    tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
+                }else{
+                    //不存在，插入
+                    tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+                }
+            }catch (Exception e){
+                e.printStackTrace();
+                //出现异常，插入
+                tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+            }
             //更新路段顺序号
             //内转只要是卸货都直接关闭订单 事务跨服务更改同表同一行数据 不能调用 会锁行
             //如果没有净重更新路段顺序号需要继续回皮 有就结束订单

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

@@ -1931,6 +1931,7 @@
                     RCA.CAPACITY_NUMBER "newCapacityNo",
                     NVL(OO.CAPACITY_ID,0)  "capacityIds",
                     OO.CAPACITY_ID "capacityId",
+                    DECODE(NVL(OO.IS_ACCEPT,0),1,'已接收','未接收') "isAccept",
                     ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
                     ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
                     OO.ORDER_LINE_SEQUENCE "lineSequence",
@@ -2297,7 +2298,9 @@
         --卸货类别
         RRP.UNLOAD_TYPE "unloadType",
         --计划件数
-        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
+        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
+        --制单时间
+        ASM.SALE_MAKE_DATE "saleMakeDate"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
@@ -2463,9 +2466,9 @@
             0,'未上报') like '%${item}%'
         </foreach>
         </if>
-        <if test="saleOrderMaterialIds != null">
-            and  ASOM.SALE_ORDER_MATERIAL_ID IN
-          <foreach collection="saleOrderMaterialIds" item="item" open="(" separator="," close=")">
+        <if test="saleMaterialIds != null">
+            and  ASM.SALE_MATERIAL_ID IN
+          <foreach collection="saleMaterialIds" item="item" open="(" separator="," close=")">
           '${item}'
           </foreach>
         </if>
@@ -2573,7 +2576,9 @@
         --卸货类别
         RRP.UNLOAD_TYPE "unloadType",
         --计划件数
-        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber"
+        ASM.MATERIAL_PLAN_NUMBER "materialPlanNumber",
+        --制单时间
+        ASM.SALE_MAKE_DATE "saleMakeDate"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN RMS_CONSIGNEE RC
         ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID