1

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

@@ -248,7 +248,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     }
                     TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
                     //装车反馈时状态改为已装车
-                    if (tranCarInfo.getLoadNetWeight() > 0) {
+                    if (tranCarInfo.getLoadNetWeight() > 0&&tranCarInfo.getUnloadNetWeight() == 0) {
                         tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                         tranCarInfo.setContractNo(tranTaskInfo.getContractNo());
@@ -480,7 +480,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                         }
                     }
                     //卸车反馈时状态改为已送达
-                    if (tranCarInfo.getUnloadNetWeight() > 0&&tranProcessInfo.getFlag()!=null) {
+                    else if (tranCarInfo.getUnloadNetWeight() > 0) {
                         tranCarInfo.setStatusFlag(StatusEnum.DELIVERED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.DELIVERED.getName());
                         TranProcessInfo tranProcessInfo1 = this.selectById(tranProcessInfo.getId());