上报

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -990,7 +990,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String waybillAdministrationReport(OrderInfo orderInfo) throws Exception {
-        if ("3".equals(ENV)) {
+        if ("1".equals(ENV)) {
             if (CollectionUtils.isNotEmpty(orderInfo.getOrderInfoList())) {
                 for (OrderInfo orderInfo1 : orderInfo.getOrderInfoList()) {
 
@@ -1004,11 +1004,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
                             .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getVehicleType()));
                     hyDriverCarInfo1.setVehicleTypeKey(hyCommonSysParameter.getConstKey());
-                    //查询挂车车辆类型key值
-                    HyCommonSysParameter hyCommonSysParameter3 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
-                            .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getTrailerVehicleType()));
-                    hyDriverCarInfo1.setTrailerVehicleTypeKey(hyCommonSysParameter3.getConstKey());
-
+                    if(hyDriverCarInfo1.getTrailerVehicleType()!= null && !hyDriverCarInfo1.getTrailerVehicleType().isEmpty()){
+                        //查询挂车车辆类型key值
+                        HyCommonSysParameter hyCommonSysParameter3 = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
+                                .eq("const_id", "CAR1").eq("const_value", hyDriverCarInfo1.getTrailerVehicleType()));
+                        hyDriverCarInfo1.setTrailerVehicleTypeKey(hyCommonSysParameter3.getConstKey());
+                    }
 
                     //1.查询任务,获取业务类型代码
                     PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectById(orderInfo1.getTaskId());
@@ -1116,24 +1117,26 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
-                            //挂车车辆交管监测系统上报
-                            try {
-                                String result = MonitoringSystemReporting.testTrailerVehicleRoot(hyDriverCarInfo1);
-                                JSONObject jsonObject = JSONObject.fromObject(result);
-                                //发送成功
-                                if ("1001".equals(jsonObject.getString("code"))) {
-                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
-                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                            if(hyDriverCarInfo1.getGuaCarNumber()!= null && !hyDriverCarInfo1.getGuaCarNumber().isEmpty()) {
+                                //挂车车辆交管监测系统上报
+                                try {
+                                    String result = MonitoringSystemReporting.testTrailerVehicleRoot(hyDriverCarInfo1);
+                                    JSONObject jsonObject = JSONObject.fromObject(result);
+                                    //发送成功
+                                    if ("1001".equals(jsonObject.getString("code"))) {
+                                        hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_SUCESS.getFlag());
+                                        hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_SUCESS.getName());
+                                    }
+                                    //发送失败
+                                    else if ("3003".equals(jsonObject.getString("code"))) {
+                                        hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
+                                        hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
+                                        hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
+                                    }
+                                    driverCarInfoService.updateById(hyDriverCarInfo1);
+                                } catch (Exception e) {
+                                    e.printStackTrace();
                                 }
-                                //发送失败
-                                else if ("3003".equals(jsonObject.getString("code"))) {
-                                    hyDriverCarInfo1.setReportedStatusKey(StatusEnum.REPORTED_FAIL.getFlag());
-                                    hyDriverCarInfo1.setReportedStatus(StatusEnum.REPORTED_FAIL.getName());
-                                    hyDriverCarInfo1.setReportedFailureReason(jsonObject.getString("data"));
-                                }
-                                driverCarInfoService.updateById(hyDriverCarInfo1);
-                            } catch (Exception e) {
-                                e.printStackTrace();
                             }
                             //运单监测系统上报
                             try {

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/MonitoringSystemReporting.java

@@ -230,7 +230,9 @@ public class MonitoringSystemReporting {
             vehicle.setGrossMass(totalWeight);
         }
         vehicle.setRoadTransportCertificateNumber(hyDriverCarInfo.getOperationCertificateNumber());
-        vehicle.setTrailerVehiclePlateNumber(hyDriverCarInfo.getGuaCarNumber());
+        if (hyDriverCarInfo.getGuaCarNumber() != null) {
+            vehicle.setTrailerVehiclePlateNumber(hyDriverCarInfo.getGuaCarNumber());
+        }
         vehicle.setRemark("备注");
         Root root = getRoot(vehicle, name, loginRoot("23106960", "qweasd!@#123", "91230229MABPEWQX94", "debugSystem"));
         String messageJson = JSON.toJSONString(root);
@@ -281,7 +283,9 @@ public class MonitoringSystemReporting {
         String totalWeight = df.format(doubleValue1);
         vehicle.setGrossMass(totalWeight);
         vehicle.setRoadTransportCertificateNumber(hyDriverCarInfo.getTrailerOperationCertificateNumber());
-        vehicle.setTrailerVehiclePlateNumber(hyDriverCarInfo.getGuaCarNumber());
+        if (hyDriverCarInfo.getGuaCarNumber() != null){
+            vehicle.setTrailerVehiclePlateNumber(hyDriverCarInfo.getGuaCarNumber());
+        }
         vehicle.setRemark("备注");
         Root root = getRoot(vehicle, name, loginRoot("23106960", "qweasd!@#123", "91230229MABPEWQX94", "debugSystem"));
         String messageJson = JSON.toJSONString(root);

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

@@ -514,6 +514,7 @@
         o.task_id as taskId,
         o.cargo_common_id as cargoCommonId,
         o.common_id as commonId,
+        o.car_captain_common_id as carCaptainCommonId,
         case when o.freight_advance = 1 then '垫付' else '非垫付' end as freightAdvance,
         o.cargo_owner as cargoOwner,
         o.driver_name as driverName,