1

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

@@ -1441,7 +1441,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     //自运出库时手动加的车
                                     if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                                .eq("contract_no", contractManagementInfo1.getContractNo()).eq("tran_type", "1"));
+                                                .eq("contract_no", contractManagementInfo1.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1"));
                                         TranCarInfo tranCarInfo = new TranCarInfo();
                                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                                         tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
@@ -1582,7 +1582,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //自运出库时手动加的车
                             if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
+                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1")
                                         .orderBy("create_date", false));
                                 TranCarInfo tranCarInfo = new TranCarInfo();
                                 TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
@@ -2074,7 +2074,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         //自运出库时手动加的车
                         if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getTranCarNo() == null || warehouseInOutInfo.getCarId() == null) {
                             List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
+                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1")
                                     .orderBy("create_date", false));
                             TranCarInfo tranCarInfo = new TranCarInfo();
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
@@ -4101,7 +4101,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     //自运出库时手动加的车
                                     if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                                .eq("contract_no", contractManagementInfo1.getContractNo()).eq("tran_type", "1"));
+                                                .eq("contract_no", contractManagementInfo1.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1"));
                                         TranCarInfo tranCarInfo = new TranCarInfo();
                                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                                         tranCarInfo.setTranPrice(String.valueOf(tranProcessInfo.getTranPrice() != null ? tranProcessInfo.getTranPrice() : 0f));
@@ -4244,7 +4244,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             //自运出库时手动加的车
                             if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
+                                        .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1")
                                         .orderBy("create_date", false));
                                 TranCarInfo tranCarInfo = new TranCarInfo();
                                 TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
@@ -4790,7 +4790,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         //自运出库时手动加的车
                         if ("1".equals(warehouseInOutInfo.getSelfLoading()) || warehouseInOutInfo.getTranCarNo() == null || warehouseInOutInfo.getCarId() == null) {
                             List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
+                                    .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1")
                                     .orderBy("create_date", false));
                             TranCarInfo tranCarInfo = new TranCarInfo();
                             TranTaskInfo tranTaskInfo = tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()