2024-07-03-2提交

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

@@ -86,7 +86,7 @@ public class SalesAnalysisControl {
     }
 
     /*
-     获取销售统计数据 lanbm 2024-05-04 add
+     获取销售统计数据
      */
     @GetMapping("/getStatisticalSummary")
     public CommonResult<StatisticalSummary> getStatisticalSummary(@Valid SalesAnalysisReq query) {
@@ -94,7 +94,6 @@ public class SalesAnalysisControl {
     }
 
     /*
-     lanbm 2024-04-24 add
      */
     @GetMapping("/exportExcel")
     @ApiOperation("导出销售分析数据")

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

@@ -65,7 +65,6 @@ public class SalesReportControl {
 
     /*
     按运输方式统计重量和方数
-    lanbm 2024-04-01
     */
     @PostMapping("/SalesReportCount")
     public CommonResult<List<SalesReportResp>> SalesReportCount(@RequestBody SalesReportReq Req) throws ParseException {

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

@@ -33,7 +33,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 @RequestMapping("/Report/SysDeptEx")
 public class SysDeptExtControl {
 
-    //lanbm 2024-04-19 添加的系统基础扩展功能
+    // 添加的系统基础扩展功能
 
     @Resource
     private DeptExMapper deptExMapper;

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

@@ -7,7 +7,7 @@ import lombok.ToString;
 import java.math.BigDecimal;
 
 /*
- lanbm 2024-05-03 add
+
  */
 @Schema(description = "管理后台 - 订单汇总数据")
 @Data

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

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update;
 import java.util.List;
 
 /*
- 用注解实现简单的功能 lanbm 2024-05-26 add
+ 用注解实现简单的功能
  */
 public interface MyTest {
     // 查询所有商品类型

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

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * (SalesAnalysis)销售分析
  *
- * @author lanbm
+ * @author
  * @since 2024-04-01
  */
 @Mapper

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

@@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * (SalesReport)销售报表
  *
- * @author lanbm
- * @since 2024-04-01
+ * @author
+ * @since
  */
 @Mapper
 public interface SalesReportMapper {
@@ -37,7 +37,7 @@ public interface SalesReportMapper {
 
     /*
    统计一段时间内客户成交数目，出重客户
-   lanbm 2024-05-09 add
+
    */
     int CustomerTargetCount(SalesReportReq Req);
 

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

@@ -18,7 +18,6 @@ public class AllWriteOffImpl implements AllWriteOffService {
 
     /*
      调用自动核销存储过程
-     lanbm 2024-05-19 add
      */
     public String auto_writeoff() {
        return allWriteOffMapper.auto_writeoff();

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

@@ -120,7 +120,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
 
     /*
      格式化BigDecimal为字符串，保留两位小数
-     lanbm 2024-04-10 add
      */
     private String format(BigDecimal value) {
         NumberFormat numberFormat = NumberFormat.getInstance();
@@ -196,7 +195,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
             }
 
         } else {
-            //2024-03-01
             String sT = Req.getSdate();
             String s = sT.substring(4, 10);
 
@@ -470,7 +468,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/EmployeeServiceImpl.java

@@ -17,7 +17,7 @@ import javax.validation.Valid;
 /**
  * (Employee)表服务实现类
  *
- * @author lanbm
+ * @author
  * @since 2024-03-27 21:25:56
  */
 @Service("employeeService")

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

@@ -82,7 +82,7 @@ public class SalesAnalysisImpl implements SalesAnalysisService {
         r.setDraweeName(sTemp);
 
 
-        //计算提货率 lanbm 2024-05-02 add
+        //计算提货率
         if (r.getSumquantity() == 0) {
             r.setShowThl("总数为0");
         } else {

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

@@ -25,7 +25,6 @@ import java.util.List;
 
 /*
   销售看板统计报表
-  lanbm 2024-04-01 add
  */
 @Service("SalesReportService")
 public class SalesReportImpl implements SalesReportService {
@@ -328,7 +327,7 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     获取首次成交统计数据 lanbm 2024-05-09 add
+     获取首次成交统计数据
      */
     public SalesReportCusTarget FirstCustomerCount(SalesReportReq Req) throws ParseException {
         Req = getReq(Req);
@@ -354,7 +353,7 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     根据查询参数获取同比查询参数 lanbm 2024-05-09 add
+     根据查询参数获取同比查询参数
      */
     private SalesReportReq getReqTb(SalesReportReq Req) {
         SalesReportReq ReqLast = new SalesReportReq();
@@ -369,7 +368,6 @@ public class SalesReportImpl implements SalesReportService {
 
     /*
     统计一段时间内客户成交数目，出重客户
-    lanbm 2024-05-09 add
     */
     public SalesReportCusTarget CustomerTargetCount(SalesReportReq Req) throws ParseException {
         Req = getReq(Req);
@@ -396,7 +394,6 @@ public class SalesReportImpl implements SalesReportService {
 
     /*
    格式化BigDecimal为字符串，保留两位小数
-   lanbm 2024-04-10 add
    */
     private String format(BigDecimal value) {
         NumberFormat numberFormat = NumberFormat.getInstance();
@@ -547,7 +544,6 @@ public class SalesReportImpl implements SalesReportService {
 
     /*
      获取统计数据List
-     lanbm 2024-05-15 add
      */
     private List<String> getListTotal(SalesReportReq Req, int n,
                                       SalesReportBar salesReportBar) {
@@ -681,7 +677,6 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     lanbm 2024-05-16 add
      */
     private String getHbSDate(Date dCurDate) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -695,7 +690,6 @@ public class SalesReportImpl implements SalesReportService {
     }
 
     /*
-     lanbm 2024-05-16 add
      */
     private String getHbEDate(String sDate) {
         String[] parts2 = sDate.split("-");

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

@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.apollo.core.event.Customer.ReceiveCustomerCalT
 //import cn.iocoder.yudao.module.delivery.entity.orderdata.OrderExt;
 
 /*
- 订单相关的业务逻辑扩展 lanbm 2024-05-07 add
+ 订单相关的业务逻辑扩展
  判断订单发货方客户活收货方客户是否有已入仓订单
  */
 public interface OrderServiceExt {

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/utility/JsonFactory.java

@@ -22,7 +22,7 @@ import java.math.BigDecimal;
 import java.util.*;
 
 /*
- 递归的例子 lanbm 2024-05-26 add
+ 递归的例子
  */
 public class JsonFactory {
     public static List<TreeNode> buildtree(List<TreeNode> nodes, int id) {
@@ -41,7 +41,7 @@ public class JsonFactory {
     }
 
     /*
-     获取UUID lanbm 2024-05-30 添加
+     获取UUID
      */
     public static String getUUID()
     {

yudao-module-depository/yudao-module-depository-core/src/main/java/cn/iocoder/yudao/module/depository/dal/dataobject/warehouse/WarehouseLineDO.java

@@ -119,17 +119,17 @@ public class WarehouseLineDO extends BaseDO {
     private String destQianzhui;
 
     /*
-     落款信息 lanbm 2024-06-10 add
+     落款信息
      */
     private String lkLeft;
 
     /*
-     落款信息 lanbm 2024-06-10 add
+     落款信息
      */
     private String lkRight;
 
     /*
-    图章名称 lanbm 2024-06-12 add
+    图章名称
     */
     private String tzName;
 

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

@@ -263,12 +263,12 @@ public class WarehouseServiceImpl implements WarehouseService {
                     warehouseItem.setTempTitleEn(lineDO.getTempTitleEn());
                     warehouseItem.setTempTitleZh(lineDO.getTempTitleZh());
 
-                    //lanbm 2024-06-12 添加配置
+                    //添加配置
                     warehouseItem.setLkRight(lineDO.getLkRight());
                     warehouseItem.setLkLeft(lineDO.getLkLeft());
                     warehouseItem.setTzName(lineDO.getTzName());
 
-                    //end lanbm 2024-06-12 添加配置
+                    //end  添加配置
 
                     String recipientInfo = lineDO.getRecipientInfo();
                     if (recipientInfo != null) {

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

@@ -1364,7 +1364,7 @@ public class ProdCostCalculation {
                 prodParam.getUnitDO(),
                 1);
 
-        //lanbm 2024-06-21 添加的逻辑
+        // 添加的逻辑
         if (productPriceDO.getPriceType() == null) {
             zTest3 z = new zTest3();
             z.setCreatedate(new Date());

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/dataobject/BoxCostDO.java

@@ -57,7 +57,7 @@ public class BoxCostDO extends BaseDO {
     private String remarks;
 
     /*
-    费用产生时间 lanbm 2024-05-17 add
+    费用产生时间
     */
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private Date freecsdate;

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/AirBillReceivableExcelExportListener.java

@@ -64,7 +64,6 @@ import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.HAVE_NOT
 
 /*
  空运应收款汇总下载
- lanbm 2024-05-25 添加注释
  */
 @Component("AirBillReceivableExcelExportListener")
 @AllArgsConstructor

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java

@@ -428,7 +428,7 @@ public class ShipmentLoadExcelExportListener2 {
                                         //preloadDto.setUsageIds(sUserdName);
                                     }
 
-                                    //商品特性赋值 lanbm 2024-06-05 add
+                                    //商品特性赋值
                                     String sR = getAttrName(item, ProductAttrMap);
                                     //preloadDto.setProdAttrIds(sR);
 

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentReceivableExcelExportListener2.java

@@ -72,7 +72,7 @@ import java.net.URL;
  * 自编号订单excel导出监听
  * 海运应收汇总表单
  *
- * @author lanbm 2024-05-25 add
+ * @author
  */
 @Component("ShipmentReceivableExcelExportListener2")
 @AllArgsConstructor
@@ -227,7 +227,7 @@ public class ShipmentReceivableExcelExportListener2 {
                     headMap.put("lkRight", warehouseLineDO.getLkRight());
                 }
 
-                //lanbm 2024-06-11 添加图片自动填充功能
+                // 添加图片自动填充功能
                 ImageData imageData = new ImageData();
                 imageData.setUrl(new URL(
                         "https://jiedao-pre-production.oss-cn-shenzhen.aliyuncs.com/2024/06/11/6668347de4b001393be98e24.jpg"));

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxCost/BoxCostServiceImpl.java

@@ -71,7 +71,7 @@ public class BoxCostServiceImpl extends AbstractService<BoxCostMapper, BoxCostDO
         req.setDestWarehouseId(boxDO.getDestWarehouseId());
         req.setTransportId(Long.valueOf(boxDO.getTransportType()));
         req.setShippingFeeId(boxCost.getId());
-        //lanbm 2024-05-17 add 费用产生日期
+        // 费用产生日期
         req.setFreecsdate(boxCost.getFreecsdate());
         payableService.createPayable(req);
         return boxCost.getId();

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

@@ -169,7 +169,7 @@ public class BoxMergePkgServiceImpl extends AbstractService<BoxMergePkgMapper, B
                         String.valueOf(boxMergePkgNumRecordDO.getNum()));
             }
 
-            //lanbm 2024-06-15 添加箱码是否重复的校验功能
+            // 添加箱码是否重复的校验功能
             BoxMergePkgDO boxMergePkg =
                     BoxMergePkgConvert.INSTANCE.convert(createReqVO);
             if (isHavingBoxCod(boxMergePkg.getPkgNum()) == 0) {
@@ -402,7 +402,7 @@ public class BoxMergePkgServiceImpl extends AbstractService<BoxMergePkgMapper, B
         BoxMergePkgDO boxMergePkgDO = boxMergePkgMapper.selectById(id);
         if (boxMergePkgDO.getSumVolume() == null||
         boxMergePkgDO.getSumVolume().compareTo(new BigDecimal(0))==0) {
-            //lanbm 2024-06-20注释掉
+            //
             boxMergePkgDO = boxMergePkgMapper.getMergePkgInfoById(id);
 
             //根据长宽高计算箱的体积

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPreloadGoods/BoxPreloadGoodsServiceImpl.java

@@ -2943,7 +2943,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
     }
 
     /*
-     lanbm 2024-05-13 处理问题添加注释
+    处理问题添加注释
      */
     @Override
     public Map<Long, BoxGoodsStatistics> getBoxStatistics(List<Long> idList) {
@@ -3071,10 +3071,10 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
     private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList,
                                       BoxGoodsStatistics boxGoodsStatistics,
                                       long shipmentId) {
-        //lanbm 2024-05-13 添加修改问题注释掉的代码
+        // 添加修改问题注释掉的代码
         //if (CollectionUtil.isEmpty(mergePkgDOList)) return;
         //shipmentId = mergePkgDOList.get(0).getShipmentId();
-        //end lanbm 2024-05-13 添加修改问题注释掉的代码
+        //end 添加修改问题注释掉的代码
 
         BoxDO box = boxService.getBox(shipmentId);
         if (!TransportTypeEnum.AIR.getType().equals(box.getTransportType())) {

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/vo/makeBillOfLading/MakeBillOfLadingBackVO.java

@@ -39,7 +39,7 @@ public class MakeBillOfLadingBackVO {
     private String bpmProcessId;
 
     /*
-     审批状态 lanbm 2024-05-04 add
+     审批状态
      */
     private String bpmStatus;
 

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

@@ -58,7 +58,6 @@ public class BoxCostController {
     private PayableService payableService;
 
     /*
-     lanbm 2024-05-16 add
      */
     @Resource
     private CurrencyService currencyService;
@@ -135,7 +134,7 @@ public class BoxCostController {
         List<BoxCostBackVO> costList = BoxCostConvert.INSTANCE.convertList(list);
 
 
-        //lanbm 2024-05-16 添加币种信息
+        // 添加币种信息
         List<CurrencyDO> listCurrency = currencyService.getCurrencyList();
         //List 转 Map
         Map<Integer, String> currencyMap =

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

@@ -109,7 +109,7 @@ public class BoxLadingBillController {
     }
 
     /*
-     lanbm 2024-05-28 处理空运提单补料模板修改
+     处理空运提单补料模板修改
      */
     @GetMapping("/getBoxLadingBillPdf")
     @ApiOperation("获得提单补料pdf")

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

@@ -10,7 +10,6 @@ import java.util.Date;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 /*
- lanbm 2024-05-18 add
  */
 @Data
 @ApiModel("管理后台 - 银行收款单明细列表")
@@ -54,7 +53,7 @@ public class ReceiptItemReq extends PageParam {
 
 
     /*
-    实收日期 lanbm 2024-06-07 add
+    实收日期
     */
     private String sDate4;
     private String eDate4;
@@ -77,7 +76,7 @@ public class ReceiptItemReq extends PageParam {
     private String accountNo;
 
     /*
-     审批状态 lanbm 2024-06-13 add
+     审批状态
      */
     private String status;
 

yudao-module-wealth/yudao-module-wealth-rest/src/main/resources/mapper/ReceiptItem/BankReceiptDetailsMapper.xml

@@ -50,7 +50,7 @@
                 AND a.update_time BETWEEN #{sDate3} and #{eDate3}
             </if>
 
-            <!--实收日期 lanbm 2024-06-07 add-->
+            <!--实收日期 -->
             <if test="sDate4 != null and sDate4 != '' and
              eDate4 != null and eDate4 != ''">
                 AND p.amount_date BETWEEN #{sDate4} and #{eDate4}