燃料款

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CoalPaymentInfoController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 记录煤款信息 前端控制器
+ * 记录燃料款信息 前端控制器
  * </p>
  *
  * @author Gdc
@@ -26,7 +26,7 @@ public class CoalPaymentInfoController {
     private ICoalPaymentInfoService coalPaymentInfoService;
 
     /**
-     * 煤款列表查询
+     * 燃料款列表查询
      *
      * @param coalPaymentInfo
      * @return

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/ExpenseInfoController.java

@@ -185,7 +185,7 @@ public class ExpenseInfoController {
     }
 
     /**
-     * 煤款列表请款记录列表
+     * 燃料款列表请款记录列表
      *
      * @param expenseInfo
      * @return

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

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 记录煤款信息
+ * 记录燃料款信息
  * </p>
  *
  * @author Gdc

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

@@ -136,7 +136,7 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      */
     private String expensesPurpose;
     /**
-     * 是否自动分配(1不自动分配3仓储费自动分配5煤款自动分配)
+     * 是否自动分配(1不自动分配3仓储费自动分配5燃料款自动分配)
      */
     private String autoAssign;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CoalPaymentInfoMapper.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 /**
  * <p>
- * 记录煤款信息 Mapper 接口
+ * 记录燃料款信息 Mapper 接口
  * </p>
  *
  * @author Gdc
@@ -17,7 +17,7 @@ import java.util.Map;
 public interface CoalPaymentInfoMapper extends BaseMapper<CoalPaymentInfo> {
 
     /**
-     * 根据条件查询煤款总数
+     * 根据条件查询燃料款总数
      *
      * @param pageView
      * @return
@@ -25,7 +25,7 @@ public interface CoalPaymentInfoMapper extends BaseMapper<CoalPaymentInfo> {
     Integer getCountByCondition(Map<String, Object> pageView);
 
     /**
-     * 根据条件查询煤款列表
+     * 根据条件查询燃料款列表
      *
      * @param pageView
      * @return

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>
- * 记录煤款信息 服务类
+ * 记录燃料款信息 服务类
  * </p>
  *
  * @author Gdc
@@ -15,7 +15,7 @@ import com.baomidou.mybatisplus.service.IService;
 public interface ICoalPaymentInfoService extends IService<CoalPaymentInfo> {
 
     /**
-     * 煤款列表查询
+     * 燃料款列表查询
      *
      * @param coalPaymentInfo
      * @return

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

@@ -135,7 +135,7 @@ public interface IExpenseInfoService extends IService<ExpenseInfo> {
     Page<ExpenseInfo> selectBondInfo(ExpenseInfo expenseInfo);
 
     /**
-     * 煤款列表请款记录列表
+     * 燃料款列表请款记录列表
      *
      * @param expenseInfo
      * @return

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

@@ -15,7 +15,7 @@ import java.util.Map;
 
 /**
  * <p>
- * 记录煤款信息 服务实现类
+ * 记录燃料款信息 服务实现类
  * </p>
  *
  * @author Gdc
@@ -25,7 +25,7 @@ import java.util.Map;
 public class CoalPaymentInfoServiceImpl extends ServiceImpl<CoalPaymentInfoMapper, CoalPaymentInfo> implements ICoalPaymentInfoService {
 
     /**
-     * 煤款列表查询
+     * 燃料款列表查询
      * @param coalPaymentInfo
      * @return
      */

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

@@ -1070,9 +1070,9 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 }
             }
         }
-        //库点费用-煤款
+        //库点费用-燃料款
         else if ("3".equals(expenseInfo1.getExpensesPurpose()) && "5".equals(expenseInfo1.getAutoAssign())) {
-            //查询该仓库是否有煤款信息
+            //查询该仓库是否有燃料款信息
             CoalPaymentInfo coalPaymentInfo = coalPaymentInfoService.selectOne(new EntityWrapper<CoalPaymentInfo>()
             .eq("warehouse_name",expenseInfo1.getWarehouseName()));
             if (coalPaymentInfo == null){
@@ -1589,7 +1589,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     }
 
     /**
-     * 煤款列表请款记录列表
+     * 燃料款列表请款记录列表
      * @param expenseInfo
      * @return
      */

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

@@ -2605,7 +2605,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     warehousingOrder2.setInWarehouseWeight(warehousingOrder1.getAfterWeight());
                     warehousingOrder2.setSurplusWeight(warehousingOrder1.getAfterWeight());
                     warehousingOrder2.setIssuingTime(new Date());
-                    //查询仓库的煤款可分配金额
+                    //查询仓库的燃料款可分配金额
                     CoalPaymentInfo coalPaymentInfo = coalPaymentInfoService.selectOne(new EntityWrapper<CoalPaymentInfo>()
                             .eq("warehouse_id", warehousingOrder1.getBaseId()));
                     if (coalPaymentInfo != null) {