1

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

@@ -267,12 +267,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             }
             //入库
             if ("2".equals(warehouseInOutInfo.getInOutFlag())) {
-                Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                        .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                 if (tranCarInfo != null) {
                     //将车改成已被选
                     tranCarInfo.setSubmit("2");
@@ -283,12 +278,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             }
             //出库
             else {
-                Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                        .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                 if (tranCarInfo != null) {
                     if ("1".equals(tranCarInfo.getSubmit())) {
                         throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
@@ -402,10 +392,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         warehouseInOutInfo.getId(), null);
                 //APP线上订单入库
                 if ("2".equals(warehouseInOutInfo.getInOutFlag())) {
-                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                    TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                     // 合同表
                     ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>().eq("contract_no", warehouseInOutInfo.getContractNo())
                             .eq("delete_flag", "0"));
@@ -561,10 +548,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
                         // 客户确认
-                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq("delete_flag", "0"));
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
                             purchaseReceiptReport.setCustomerConfirmationStatusFlag("1");
                             purchaseReceiptReport.setCustomerConfirmationStatus("是");
@@ -713,10 +697,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
 
                         // 客户确认
-                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq("delete_flag", "0"));
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
                             salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
                             salesDeliveryReport.setCustomerConfirmationStatus("是");
@@ -1210,12 +1191,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
                     }
-                    Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                            .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                    TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                     if (tranCarInfo != null) {
                         //将到货数据同步到派车表
                         tranCarInfo.setUnloadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -2527,12 +2503,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 }
                             }
                         }
-                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                                .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
                             tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -2755,12 +2726,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranSettlementReport.setStatus(StatusEnum.PENDING_PAY.getName());
                             tranSettlementReportService.insert(tranSettlementReport);
                         }
-                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                                .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
                             tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -3329,12 +3295,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             }
             //入库
             if ("2".equals(warehouseInOutInfo.getInOutFlag())) {
-                Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                        .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                 if (tranCarInfo != null) {
                     //将车改成已被选
                     tranCarInfo.setSubmit("2");
@@ -3368,12 +3329,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
             }
             //出库
             else {
-                Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", warehouseInOutInfo.getContractNo())
-                        .eq("car_no", warehouseInOutInfo.getCarNo())
-                        .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                        .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                 if (tranCarInfo != null) {
                     if ("1".equals(tranCarInfo.getSubmit())) {
                         throw new YException(YExceptionEnum.CARNO_SUBMITTED_ERROR);
@@ -3606,10 +3562,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         warehouseInOutInfo.getId(), null);
                 //APP线上订单入库
                 if ("2".equals(warehouseInOutInfo.getInOutFlag())) {
-                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                    TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                     // 合同表
                     ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>().eq("contract_no", warehouseInOutInfo.getContractNo())
                             .eq("delete_flag", "0"));
@@ -3765,10 +3718,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
                         // 客户确认
-                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq("delete_flag", "0"));
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
                             purchaseReceiptReport.setCustomerConfirmationStatusFlag("1");
                             purchaseReceiptReport.setCustomerConfirmationStatus("是");
@@ -3917,10 +3867,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
 
                         // 客户确认
-                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq("delete_flag", "0"));
+                        TranCarInfo tranCarInfo1 = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo1 != null && "3".equals(tranCarInfo1.getConfirmFlag())) {
                             salesDeliveryReport.setCustomerConfirmationStatusFlag("1");
                             salesDeliveryReport.setCustomerConfirmationStatus("是");
@@ -4641,12 +4588,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         }
                         weighingManagementService.updateById(weighingManagement);
                     }
-                    Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                            .eq("contract_no", warehouseInOutInfo.getContractNo())
-                            .eq("car_no", warehouseInOutInfo.getCarNo())
-                            .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                            .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                    TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                    TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                     if (tranCarInfo != null) {
                         //将到货数据同步到派车表
                         tranCarInfo.setUnloadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -6015,12 +5957,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if (contractManagementInfo1 == null) {
                             throw new YException(YExceptionEnum.CONTRACT_NO_NOT_EXSITS_ERROR);
                         }
-                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                                .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
                             tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));
@@ -6243,12 +6180,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         if (contractManagementInfo1 == null) {
                             throw new YException(YExceptionEnum.CONTRACT_NO_NOT_EXSITS_ERROR);
                         }
-                        Wrapper wrapper = new EntityWrapper<TranCarInfo>()
-                                .eq("contract_no", warehouseInOutInfo.getContractNo())
-                                .eq("car_no", warehouseInOutInfo.getCarNo())
-                                .eq(TranCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                                .eq("tran_car_no", warehouseInOutInfo.getTranCarNo());
-                        TranCarInfo tranCarInfo = tranCarInfoService.selectOne(wrapper);
+                        TranCarInfo tranCarInfo = tranCarInfoService.selectById(warehouseInOutInfo.getCarId());
                         if (tranCarInfo != null) {
                             //将发货数据同步到派车表
                             tranCarInfo.setLoadNetWeight(Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight())));