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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -166,7 +166,6 @@ public enum StatusEnum {
     TRACK_END("3", "已结束", "track_end"),
     REQUESTED("4", "已申请", "requested"),
     TRACK_REIMBURSEMENT("5", "已报销", "track_reimbursement"),
-    TRACK_SUCCESST("6", "已通过", "track_success"),
 
     //申请状态
     APPLY_ING("1", "已申请", "apply_ing"),

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/ExpenseInfoServiceImpl.java

@@ -119,6 +119,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         pageView.put("searchType", expenseInfo.getSearchType());
         pageView.put("searchTypeFee", expenseInfo.getSearchTypeFee());
         pageView.put("warehouseName", expenseInfo.getWarehouseName());
+        pageView.put("expensesPurpose", expenseInfo.getExpensesPurpose());
         pageView.put("pageSize", expenseInfo.getPageSize());
         pageView.put("currentPage", expenseInfo.getCurrentPage());
         pageView.put("contractNo", expenseInfo.getContractNo());
@@ -588,7 +589,8 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     public List<WarehousingOrder> selectWarehousingOrder(String contractNo, String warehouseName, String receiptDocDate) {
         Wrapper<WarehousingOrder> warehousingOrderWrapper = new EntityWrapper<>();
         if (contractNo!=null){
-            warehousingOrderWrapper.eq("contract_no", contractNo);
+            warehousingOrderWrapper.andNew().eq("contract_no", contractNo).or()
+                    .eq("move_task_no", contractNo);
         }
         if (warehouseName!=null){
             warehousingOrderWrapper.eq("warehouse_name", warehouseName);

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);
@@ -2829,6 +2832,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
                         qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());
                         qualityInspectionManagement.setBinNumber(weighingManagement.getBinNumber());
+                        qualityInspectionManagement.setFleet(weighingManagement.getFleet());
                         qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
                         qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());
                         qualityInspectionManagement.setManagementType("3");
@@ -4128,6 +4132,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setContractNo(contractManagementInfo1.getContractNo());
                                         tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                         tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                        tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                                        if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                            tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                            tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                            tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                        } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                            tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                        } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                            tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        }
                                         warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                         warehouseInOutInfo.setTranCarNo(tranCarNo);
                                         stockSaleReceiptReport.setTranCarNo(tranCarNo);
@@ -4290,6 +4309,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                                 tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                 tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                                tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                                if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                    tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                }
                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
                                 warehouseInOutInfoService.updateById(warehouseInOutInfo);
@@ -4847,6 +4881,21 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfo.setContractNo(warehouseInOutInfo.getContractNo());
                             tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.LOADED.getName());
+                            tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                            if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                            } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                            } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                            } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                            }
                             warehouseInOutInfo.setSelfLoading("1");
                             warehouseInOutInfo.setCarId(tranCarInfo.getId());
                             warehouseInOutInfo.setTranCarNo(tranCarNo);

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

@@ -604,6 +604,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
         qualityInspectionManagement.setGoodsName(weighingManagement.getGoodsName());
+        qualityInspectionManagement.setFleet(weighingManagement.getFleet());
         qualityInspectionManagement.setBinNumber(weighingManagement.getBinNumber());
         qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
         qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/FuelFingListener.java

@@ -38,8 +38,8 @@ public class FuelFingListener extends AbstractWorkflowTaskListener {
             }
         }
         if (processIsEnd) {
-            fuelFillingInfo.setTravelStatus(StatusEnum.TRACK_SUCCESST.getName());
-            fuelFillingInfo.setTravelStatusFlag(StatusEnum.TRACK_SUCCESST.getFlag());
+            fuelFillingInfo.setStatusFlag(StatusEnum.ORDER_PASSED.getFlag());
+            fuelFillingInfo.setStatus(StatusEnum.ORDER_PASSED.getName());
             fuelFillingInfo.setWorkflowId(null);
             fuelFillingInfo.setApproveStatus(null);
         } else {

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

@@ -19,6 +19,9 @@
         <if test="createUserId != null and createUserId != ''">
             AND create_user_id= #{createUserId}
         </if>
+        <if test="expensesPurpose != null and expensesPurpose != ''">
+            AND expenses_purpose= #{expensesPurpose}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'
@@ -90,6 +93,9 @@
         <if test="createUserId != null and createUserId != ''">
             AND create_user_id= #{createUserId}
         </if>
+        <if test="expensesPurpose != null and expensesPurpose != ''">
+            AND expenses_purpose= #{expensesPurpose}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'

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

@@ -145,6 +145,7 @@
         ff.total_cost as totalCost,
         ff.tfc,
         ff.remark,
+        ff.status,
         ff.travel_status as travelStatus,
         ff.travel_status_flag as travelStatusFlag,
         fd.oil_consumption as oilConsumption,

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

@@ -77,6 +77,7 @@
         q.management_type as managementType,
         q.goods_name as goodsName,
         q.confirm,
+        q.fleet,
         q.param_type as paramType,
         q.grade,
         q.imperfect_grain as imperfectGrain,

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