Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -242,7 +242,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             List<TranSettlementReport> tranSettlementReportList = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
                                     .eq("car_id", tranCarInfo.getId()));
                             if (!CollectionUtils.isEmpty(tranSettlementReportList)) {
-                                if (tranCarInfo.getUnloadNetWeight() > 0) {
+                                if (tranCarInfo.getUnloadNetWeight() > 0&&tranProcessInfo.getFlag()!=null) {
                                     for (TranSettlementReport tranSettlementReport : tranSettlementReportList) {
                                         tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                         tranSettlementReport.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());
@@ -336,7 +336,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             List<TranSettlementReport> tranSettlementReportList = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
                                     .eq("car_id", tranCarInfo.getId()));
                             if (!CollectionUtils.isEmpty(tranSettlementReportList)) {
-                                if (tranCarInfo.getUnloadNetWeight() > 0) {
+                                if (tranCarInfo.getUnloadNetWeight() > 0&&tranProcessInfo.getFlag()!=null) {
                                     for (TranSettlementReport tranSettlementReport : tranSettlementReportList) {
                                         tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                         tranSettlementReport.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());
@@ -398,7 +398,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             List<TranSettlementReport> tranSettlementReportList = tranSettlementReportService.selectList(new EntityWrapper<TranSettlementReport>()
                                     .eq("car_id", tranCarInfo.getId()));
                             if (!CollectionUtils.isEmpty(tranSettlementReportList)) {
-                                if (tranCarInfo.getUnloadNetWeight() > 0) {
+                                if (tranCarInfo.getUnloadNetWeight() > 0&&tranProcessInfo.getFlag()!=null) {
                                     for (TranSettlementReport tranSettlementReport : tranSettlementReportList) {
                                         tranSettlementReport.setLoadingImg(tranCarInfo.getLoadPoundImg());
                                         tranSettlementReport.setUnloadingWeight(tranCarInfo.getUnloadNetWeight());
@@ -465,7 +465,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                         }
                     }
                     //卸车反馈时状态改为已送达
-                    if (tranCarInfo.getUnloadNetWeight() > 0) {
+                    if (tranCarInfo.getUnloadNetWeight() > 0&&tranProcessInfo.getFlag()!=null) {
                         tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                         TranProcessInfo tranProcessInfo1 = this.selectById(tranProcessInfo.getId());