2024-07-03-2提交

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/CustomerAnalysisControl.java

@@ -86,7 +86,7 @@ public class CustomerAnalysisControl {
 
 
     /*
-     客户分析列表lanbm 2024-04-02 add
+     客户分析列表
      xml动态查询参考网址
      https://blog.csdn.net/CYK_byte/article/details/128611104
      */

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/CustomerReportControl.java

@@ -41,7 +41,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
 /**
  * (CustomerReport)客户看板报表
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27
  */
 @RestController
@@ -70,7 +70,7 @@ public class CustomerReportControl {
     }
 
     /*
-     获取某年某月的最后一天 lanbm 2024-04-16 add
+     获取某年某月的最后一天
      */
     private int getLastDay(int year, int month) {
         YearMonth yearMonth = YearMonth.of(year, month);
@@ -134,7 +134,6 @@ public class CustomerReportControl {
 
     /*
      格式化BigDecimal为字符串，保留两位小数
-     lanbm 2024-04-10 add
      */
     private String format(BigDecimal value) {
         NumberFormat numberFormat = NumberFormat.getInstance();
@@ -145,7 +144,7 @@ public class CustomerReportControl {
 
 
     /*
-     客户分析列表 lanbm 2024-04-02 add
+     客户分析列表
      xml动态查询参考网址
      https://blog.csdn.net/CYK_byte/article/details/128611104
      */
@@ -171,7 +170,7 @@ public class CustomerReportControl {
             return error(eCode);
         }
 
-        //把model转 JSON字符串 lanbm
+        //把model转 JSON字符串
         //String jsonStr = JsonUtils.toJsonString(Req);
         //JsonUtils.SaveLog(jsonStr);
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/EcwReportPermissionController.java

@@ -152,7 +152,7 @@ public class EcwReportPermissionController {
     }
 
     /*
-     获取当前用户的报表权限 lanbm 2024-04-15 add
+     获取当前用户的报表权限
      */
     @GetMapping("/getCurUserPermission")
     public CommonResult<EcwReportPermission> getCurUserPermission() {

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/EcwVzController.java

@@ -35,7 +35,7 @@ import java.util.List;
 /**
  * V值转换配置参数(EcwVz)表控制层
  * https://ft0n6y6ben.feishu.cn/sheets/Y7PosKYx5h2O2btS6Gcc0TS7nZe?from=from_copylink
- * @author lanbm
+ * @author
  * @since 2024-04-02
  * CNG244324  测试提单号
  */

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/SalesAnalysisControl.java

@@ -39,7 +39,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
 /**
  * (SalesAnalysis)销售分析报表
  *
- * @author lanbm add
+ * @author
  * @since 2024-03-31
  */
 @RestController

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/SalesReportControl.java

@@ -25,7 +25,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 /**
  * 销售统计报表控制层
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27
  */
 @RestController
@@ -46,7 +46,6 @@ public class SalesReportControl {
 
     /*
      首次成交的客户数统计
-     lanbm 2024-04-01
      */
     @PostMapping("/FirstCustomerCount")
     public CommonResult<SalesReportCusTarget> FirstCustomerCount(@RequestBody SalesReportReq Req) throws ParseException {

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/CustomerReportResp.java

@@ -10,7 +10,6 @@ import java.math.BigDecimal;
 
 /*
  客户看板结果
- lanbm 2024-04-02 add
  */
 @ApiModel("管理后台-客户看报表结果")
 @Data

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/EcwReportPermissionResp.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 报表权限(EcwReportPermission)实体类
  *
- * @author lanbm
+ * @author
  * @since 2024-04-09 23:10:39
  */
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/EcwVz.java

@@ -7,7 +7,7 @@ import lombok.*;
 /**
  * V值转换配置参数(EcwVz)实体类
  *
- * @author lanbm
+ * @author
  * @since 2024-04-02 22:38:22
  */
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/Employee.java

@@ -8,7 +8,7 @@ import lombok.*;
 /**
  * (Employee)实体类
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27 21:25:55
  */
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/SalesAnalysisReq.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.ToString;
 
 /*
-  lanbm 2024-03-31 add
  */
 @Schema(description = "管理后台 - 销售分析查询参数")
 @Data

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/SalesReportReq.java

@@ -12,7 +12,6 @@ import java.util.Date;
 /*
  销售看板查询请求参数
  逻辑数据大部分集中在表 ecw_order
- lanbm 2024-03-31 add
  */
 @Schema(description = "管理后台-销售看板查询参数")
 @Data

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/EcwReportPermissionMapper.java

@@ -44,13 +44,12 @@ public interface EcwReportPermissionMapper extends BaseMapperX<EcwReportPermissi
 
     /*
    实现物理删除
-   lanbm 2024-04-08 add
    */
     int deleteById2(Long id);
 
 
     /*
-     lanbm 2024-04-15 add
+
      */
     List<EcwReportPermissionResp> getListPageCustom(EcwReportPermissionPageReq PageReq);
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/SalesAnalysisMapper.java

@@ -23,7 +23,6 @@ public interface SalesAnalysisMapper {
     Long GetCount(SalesAnalysisReq req);
 
     /*
-     导出报表列表 lanbm 2024-04-24 add
      */
     List<SalesAnalysisExcelResp>getList(SalesAnalysisReq req);
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/CustomerAnalysisImpl.java

@@ -349,7 +349,7 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
     }
 
     /*
-      客户角色多选 lanbm 2024-06-24 add
+      客户角色多选
      */
     private void setCusRole(CustomerAnalysisReq Req) {
         if (Req.getCustomerrole() != null && Req.getCustomerrole().size() > 0) {
@@ -392,7 +392,7 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
         query = getDataWhere(query);
         System.out.println("处理后的查询条件：" + query);
 
-        //把model转 JSON字符串 lanbm
+        //把model转 JSON字符串
         //String jsonStr = JsonUtils.toJsonString(query);
         //JsonUtils.SaveLog(jsonStr);
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/EcwReportPermissionServiceImpl.java

@@ -18,7 +18,7 @@ import javax.validation.Valid;
 /**
  * 报表权限(EcwReportPermission)表服务实现类
  *
- * @author lanbm
+ * @author
  * @since 2024-04-09 23:10:41
  */
 @Service("ecwReportPermissionService")

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/SalesAnalysisImpl.java

@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.Map;
 
 /*
- lanbm 2024-04-01
  */
 @Service("SalesAnalysisService")
 public class SalesAnalysisImpl implements SalesAnalysisService {

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/view_order_businesstimeServiceImpl.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /*
- lanbm 2024-04-25 add
  */
 @Service("view_order_businesstimeServiceImpl")
 public class view_order_businesstimeServiceImpl implements

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/service/warehouse/impl/WarehouseServiceImpl.java

@@ -455,7 +455,7 @@ public class WarehouseServiceImpl implements WarehouseService {
             recipientInfo = JSON.toJSONString(reqVO.getRecipientInfo());
         }
 
-        //lanbm 2024-06-12 添加配置参数项
+        //添加配置参数项
         warehouseLineMapper.update(null,
                 new LambdaUpdateWrapper<WarehouseLineDO>().eq(WarehouseLineDO::getId, reqVO.getLineId())
                         .set(WarehouseLineDO::getOtherService, reqVO.getOtherService())

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/component/ProdCostCalculation.java

@@ -87,7 +87,7 @@ public class ProdCostCalculation {
     private final LineChannelPriceStepClearanceMapper
             lineChannelPriceStepClearanceMapper;
 
-    //lanbm 2024-06-21 add
+    //
     @Resource
     private ZTestMapper3 zTestMapper;
 
@@ -1490,7 +1490,7 @@ public class ProdCostCalculation {
                             channelId, lineId);
 
             if (CollectionUtil.isNotEmpty(lineChannelPackagingDOList)) {
-                //如果线路渠道的包装类型为空，就取阶梯价的清关价 lanbm 2024-06-21 添加注释
+                //如果线路渠道的包装类型为空，就取阶梯价的清关价
                 BasePrice lineClearanceBasePrice = null;
 
                 for (LineChannelPackagingDO lineChannelPackagingDO :

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/product/impl/ProductPriceServiceImpl.java

@@ -1247,7 +1247,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
                 }
             }
 
-            //lanbm 2024-06-06 处理单询价问题添加的逻辑点。
+            // 处理单询价问题添加的逻辑点。
             if (productPriceDO.getNeedOrderInquiry() != null) {
                 if (productPriceDO.getNeedOrderInquiry() == 1 ||
                         productPriceDO.getNeedOrderInquiry() == 0) {
@@ -1284,7 +1284,7 @@ public class ProductPriceServiceImpl extends AbstractService<ProductPriceMapper,
             }
         }
 
-        //开始处理此价格的异常订单 lanbm 2024-05-31 添加注释
+        //开始处理此价格的异常订单
         if (CollectionUtil.isNotEmpty(needHandleList)) {
             HandleData handleData;
             if (sync) {

yudao-module-product/yudao-module-product-rest/src/main/java/cn/iocoder/yudao/module/product/controller/admin/product/ProductPriceController.java

@@ -87,7 +87,6 @@ public class ProductPriceController {
     @Idempotent(timeout = 5)
     public CommonResult<Boolean> updateProductPrice(
             @Valid @RequestBody ProductPriceUpdateReqVO updateReqVO) {
-        //lanbm 2024-05-28 添加注释
         productPriceService.updateProductPrice(updateReqVO);
         return success(true);
     }
@@ -293,7 +292,7 @@ public class ProductPriceController {
     /**
      * 从商品列表中某一商品进入复制价格
      * @param dto
-     * lanbm 2024-06-19 添加注释
+     *
      */
     @ApiOperation("从商品列表中某一商品进入复制价格")
     @PostMapping("/copyPriceByProductIds")

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxApproval/BoxApprovalServiceImpl.java

@@ -1154,7 +1154,7 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
             //======================批量加价格=======================
             case SHIPMENT_BATCH_ADD_PRICE:
                 //批量加价格
-                //lanbm 2024-06-18 添加注释 是给自编号下的订单加价
+                // 添加注释 是给自编号下的订单加价
                 if (result == BpmProcessInstanceResultEnum.APPROVE.getResult()) {
                     String details = boxApprovalDO.getDetails();
                     BoxOrderMarkUpVO boxOrderMarkUpVO =

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxLadingBill/BoxLadingBillServiceImpl.java

@@ -264,7 +264,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
             }
         }
 
-        //lanbm 2024-06-06 添加保存数量和单位
+        //添加保存数量和单位
         String sPackName = "";
         String sUnit = boxLadingBillDO.getPackageUnit();
         if (CollectionUtil.isNotEmpty(PackMap) && sUnit != null && sUnit.length() > 0) {
@@ -274,7 +274,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
         sDes += "\r\n" + boxLadingBillDO.getGoodsDesc();
         headMap.put("description", sDes);
         //headMap.put("description", boxLadingBillDO.getGoodsDesc());
-        //end lanbm 2024-06-06 添加保存数量和单位
+        //end 添加保存数量和单位
 
         headMap.put("weight", boxLadingBillDO.getKgs() == null ? "" : String.valueOf(boxLadingBillDO.getKgs().doubleValue()));
         headMap.put("volume", boxLadingBillDO.getCbm() == null ? "" : String.valueOf(boxLadingBillDO.getCbm().doubleValue()));

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxMergePkg/BoxMergePkgServiceImpl.java

@@ -187,7 +187,6 @@ public class BoxMergePkgServiceImpl extends AbstractService<BoxMergePkgMapper, B
         return "success";
     }
 
-    //lanbm 2024-06-15 add
     private long isHavingBoxCod(String sBoxCode) {
         LambdaQueryWrapperX q1 = new LambdaQueryWrapperX<BoxMergePkgDO>().
                 eq(BoxMergePkgDO::getPkgNum, sBoxCode);

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java

@@ -501,7 +501,7 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
                     paramMap.put("clearanceFreight",
                             "0" + currencyMap.get(item.getClearanceFreightCurrency()) + "/m³");
                     //paramMap.put("clearanceFreight", "");
-                    //lanbm 2024-04-25 update 提单制作，清关价为0问题修改
+                    // update 提单制作，清关价为0问题修改
                 }
             } else {
                 paramMap.put("clearanceFreight",

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/boxCost/BoxCostBackVO.java

@@ -93,12 +93,12 @@ public class BoxCostBackVO {
     private String updater;
 
     /*
-     应付款，关联的付款单 lanbm 2024-06-03 add
+     应付款，关联的付款单
      */
     private String paymentId;
 
     /*
-    费用产生时间 lanbm 2024-05-17 add
+    费用产生时间
     */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date freecsdate;

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MakeBillOfLadingController.java

@@ -86,8 +86,8 @@ public class MakeBillOfLadingController {
     @Idempotent(timeout = 10)
     //@PreAuthorize("@ss.hasPermission('shipment:make-bill-of-lading:create')")
     public CommonResult<Long> createMakeBillOfLading(@Valid @RequestBody MakeBillOfLadingCreateReqVO createReqVO) {
-        //lanbm 2024-05-24 修改此函数，取消审批流程
-        //lanbm 2024-06-13 取消流程的发起
+        //修改此函数，取消审批流程
+        //取消流程的发起
         //ecw_make_bill_of_lading 提单
         String redisKey = MessageFormat.format(BOX_MAKE_LADING_KEY, createReqVO.getOrderId().toString());
         Long count = redisHelper.incrBy(redisKey, 1);
@@ -197,7 +197,6 @@ public class MakeBillOfLadingController {
                 MakeBillOfLadingConvert.INSTANCE.convert(lading);
 
         //前端是根据 status 来判断的，此处逻辑可以不用理会
-        //lanbm 2024-06-13 添加注释
         if (lading.getBpmProcessId() == null ||
                 lading.getBpmProcessId().length() == 0) {
             vResult.setBpmStatus("-1");

yudao-module-shipment/yudao-module-shipment-rest/src/main/java/cn/iocoder/yudao/module/shipment/controller/admin/MyBoxController.java

@@ -75,7 +75,7 @@ public class MyBoxController {
     @PostMapping("/exitPageAir")
     @ApiOperation("获得退场出货分页, use this")
     public CommonResult<PageResult<BoxBackVO>> getBoxExitPageAir(@Valid @RequestBody MyBoxExitQueryVO query) {
-        //空运退场到仓列表 lanbm 2024-05-27 添加注释
+        //空运退场到仓列表
         //此出有个仓库权限的限制，管来没有权限，数据符合逻辑也是显示不出来信息的
         PageResult<BoxBackVO> pageResult = boxService.getBoxExitPageAir(query);
         return success(pageResult);

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/service/receipt/ReceiptServiceImpl.java

@@ -503,7 +503,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
     }
 
     /*
-     获取核销比例 lanbm 2024-06-06 add
+     获取核销比例
      */
     private String getHxBili(List<ReceiptAccountDO> ReceiptAccountList,
                              List<ReceiptItemDO> listItemList,
@@ -550,7 +550,6 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
     }
 
     /*
-     lanbm 2024-06-06 add
      应收款
      */
     private String getYSShow(List<ReceiptAccountDO> ReceiptAccountList,
@@ -619,7 +618,7 @@ public class ReceiptServiceImpl extends AbstractService<ReceiptMapper, ReceiptDO
     }
 
     /*
-     lanbm 2024-05-13 计算收款单明细状态
+      计算收款单明细状态
      收款单主表
      SELECT * from ecw_receipt where receipt_no='SKD00006547'
      收款单明细表

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemResp.java

@@ -15,7 +15,6 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /*
- lanbm 2024-05-18 add
  */
 @Data
 @ApiModel("管理后台 - 银行收款单明细列表返回结果")

yudao-module-wealth/yudao-module-wealth-rest/src/main/java/cn/iocoder/yudao/module/wealth/controller/admin/receipt/ReceiptController.java

@@ -209,7 +209,7 @@ public class ReceiptController {
     }
 
     /*
-     lanbm 2024-05-29 add 批量 收款单反核销
+      批量 收款单反核销
      */
     @PostMapping("/financeReceiptWriteOffNo2")
     @ApiOperation("收款单反核销")