1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranSettlementReport.java

@@ -246,6 +246,16 @@ public class TranSettlementReport extends BaseModel<TranSettlementReport> {
      */
     @TableField(exist = false)
     private String customer;
+    /**
+     * 合同标识1
+     */
+    @TableField(exist = false)
+    private String contractFlag;
+    /**
+     * 车队标识1
+     */
+    @TableField(exist = false)
+    private String fleetFlag;
 
     //账户记录
     @TableField(exist = false)

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -442,6 +442,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     @TableField(exist = false)
     private WeighingManagement weighingManagement;
+    /**
+     * 车队
+     */
+    @TableField(exist = false)
+    private String fleet;
 
 
     @Override

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

@@ -94,6 +94,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                         .eq("delete_flag", "0"));
                 //合同类型
                 if(contractManagementInfo!=null) {
+                    tranSettlementReport.setContractFlag("1");
                     //销售
                     if ("1".equals(contractManagementInfo.getContractType())) {
                         tranSettlementReport.setCustomer(contractManagementInfo.getBuyer());
@@ -101,7 +102,9 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                         tranSettlementReport.setCustomer(contractManagementInfo.getSeller());
                     }
                 }
-
+                else {
+                    tranSettlementReport.setContractFlag("0");
+                }
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(tranSettlementReport.getWorkflowId())&&StringUtils.isNotBlank(tranSettlementReport.getBatchId())) {
@@ -165,18 +168,30 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 if (!CollectionUtils.isEmpty(tranPriceApproveList)) {
                     tranSettlementReport1.setTranPriceApproveList(tranPriceApproveList);
                 }
-                //查询账户信息
-                List<DriverViewInfo> driverViewInfoList = driverViewInfoService.selectList(new EntityWrapper<DriverViewInfo>()
-                        .eq("driver_name", tranSettlementReport1.getName())
-                        .eq("delete_flag", "0"));
-                if (!CollectionUtils.isEmpty(driverViewInfoList)) {
-                    for (DriverViewInfo driverViewInfo : driverViewInfoList) {
-                        List<DriverPayeeInfo> driverPayeeInfoList = driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
-                                .eq("driver_id", driverViewInfo.getId())
-                                .eq("delete_flag", "0"));
-                        tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
+                TranCarInfo tranCarInfo=tranCarInfoService.selectById(tranSettlementReport1.getCarId());
+                if (tranCarInfo!=null){
+                    if (tranCarInfo.getFleetName()!=null){
+                        tranSettlementReport1.setName(tranCarInfo.getFleetName());
+                        tranSettlementReport1.setFleetFlag("1");
+                    }
+                    else{
+                        tranSettlementReport1.setName(tranCarInfo.getDriver());
+                        tranSettlementReport1.setFleetFlag("0");
                     }
                 }
+                //查询账户信息
+//                List<DriverViewInfo> driverViewInfoList = driverViewInfoService.selectList(new EntityWrapper<DriverViewInfo>()
+//                        .eq("driver_name", tranSettlementReport1.getName())
+//                        .eq("delete_flag", "0"));
+//                if (!CollectionUtils.isEmpty(driverViewInfoList)) {
+//                    for (DriverViewInfo driverViewInfo : driverViewInfoList) {
+//                        List<DriverPayeeInfo> driverPayeeInfoList = driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
+//                                .eq("driver_id", driverViewInfo.getId())
+//                                .eq("delete_flag", "0"));
+//                        tranSettlementReport1.setDriverPayeeInfoList(driverPayeeInfoList);
+//                    }
+//                }
+
                 String taskId = "";
                 // 只有待审核状态才有taskId
                 if (StringUtils.isNotBlank(tranSettlementReport1.getWorkflowId())&&StringUtils.isNotBlank(tranSettlementReport1.getBatchId())) {

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

@@ -1461,6 +1461,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setId(IdGenerator.generateUUID());
                                         tranCarInfo.setContractNo(contractManagementInfo1.getContractNo());
                                         tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
+                                        tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                                         tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                                         warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                         warehouseInOutInfo.setTranCarNo(tranCarNo);
@@ -1622,6 +1623,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                                 tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                 tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
                                 warehouseInOutInfoService.updateById(warehouseInOutInfo);
@@ -2125,6 +2127,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                             tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                            tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                             warehouseInOutInfo.setSelfLoading("1");
                             warehouseInOutInfo.setCarId(tranCarInfo.getId());
                             warehouseInOutInfo.setTranCarNo(tranCarNo);
@@ -4128,6 +4131,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setContractNo(contractManagementInfo1.getContractNo());
                                         tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                         tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                        tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                                         warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                         warehouseInOutInfo.setTranCarNo(tranCarNo);
                                         stockSaleReceiptReport.setTranCarNo(tranCarNo);
@@ -4290,6 +4294,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                                 tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                 tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
                                 warehouseInOutInfoService.updateById(warehouseInOutInfo);
@@ -4847,6 +4852,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                             tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                            tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
                             warehouseInOutInfo.setSelfLoading("1");
                             warehouseInOutInfo.setCarId(tranCarInfo.getId());
                             warehouseInOutInfo.setTranCarNo(tranCarNo);

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/TranSettlementReportMapper.xml

@@ -10,8 +10,12 @@
         delete_flag = '0'
         AND comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status='待请款'  and approve_status is not null
+            </if>
             <if test="searchType == 2">
-                AND amount_ing_payable-amount_ed_payable>0
+                AND status='待请款'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0
@@ -97,8 +101,12 @@
         delete_flag = '0'
         AND comp_id = #{compId}
         <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND status='待请款'  and approve_status is not null
+            </if>
             <if test="searchType == 2">
-                AND amount_ing_payable-amount_ed_payable>0
+                AND status='待请款'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0