2024-07-03-2提交

yudao-module-depository/yudao-module-depository-rest/src/main/java/cn/iocoder/yudao/module/depository/controller/admin/warehouse/WarehouseController.java

@@ -234,7 +234,7 @@ public class WarehouseController {
     }
 
     /*
-     lanbm 2024-06-12 添加配置参数
+     添加配置参数
      */
     @PostMapping("/serviceConfig")
     @ApiOperation("其他服务配置")

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/dal/mysql/BoxMapper.java

@@ -312,7 +312,7 @@ public interface BoxMapper extends AbstractMapper<BoxDO> {
                         if (orderCount.equals(ladingCount)) {
                             boxEntity.setLadingBillStatus(2);
                         } else if (orderCount < ladingCount) {
-                            //lanbm 2024-04-16 添加的逻辑，提单有可能补单
+                            // 添加的逻辑，提单有可能补单
                             boxEntity.setLadingBillStatus(2);
                         } else {
                             boxEntity.setLadingBillStatus(1);

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

@@ -81,7 +81,7 @@ import static cn.iocoder.yudao.module.shipment.enums.ErrorCodeConstants.HAVE_NOT
 
 /**
  * 自编号订单excel导出监听
- * lanbm 2024-06-05 修改模板样式和添加列字段
+ * 修改模板样式和添加列字段
  * 海运已装单数据导出
  * NG2408045L
  * @author zhengYi
@@ -207,7 +207,7 @@ public class ShipmentLoadExcelExportListener2 {
                 WriteSheet sheet = EasyExcel.writerSheet(0).build();
                 excelWriter.fill(headMap, sheet);
 
-                //商品属性获取 lanbm 2024-06-05 add
+                //商品属性获取
                 List<ProductAttrDO> ProductAttrList =
                         productAttrService.getProductAttrList();
                 Map<Long, String> ProductAttrMap = null;
@@ -216,7 +216,7 @@ public class ShipmentLoadExcelExportListener2 {
                             collect(Collectors.toMap(ProductAttrDO::getId,
                                     ProductAttrDO::getAttrName));
                 }
-                //end 商品属性获取 lanbm 2024-06-05 add
+                //end 商品属性获取
 
                 if (box.getLdStatus() != null && box.getLdStatus() >= 43) {
                     //43、已装柜、待封柜
@@ -511,11 +511,11 @@ public class ShipmentLoadExcelExportListener2 {
     }
 
     /*
-      lanbm 2024-06-05 添加商品属性转换函数
+      添加商品属性转换函数
      */
     private String getAttrName(OrderItemDO item, Map<Long, String> ProductAttrMap) {
         String sReult = "";
-        //lanbm 2024-06-05添加商品特性
+        //添加商品特性
         if (item.getProdAttrIds() == null || item.getProdAttrIds().length() == 0) {
             return sReult;
         } else {

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

@@ -193,7 +193,7 @@ public class ShipmentReceivableExcelExportListener2 {
                         box.getStartWarehouseId(), box.getDestWarehouseId(),
                         box.getTransportType());
 
-                //lanbm 添加动态模板逻辑
+                // 添加动态模板逻辑
                 String sTemName = getTemplateName(warehouseLineDO);
                 inputStream = getClass().getClassLoader().
                         getResourceAsStream(ueProperties.getTemplatesUrl()
@@ -214,7 +214,7 @@ public class ShipmentReceivableExcelExportListener2 {
                 headMap.put("tempTitleEn", StringUtils.isBlank(warehouseLineDO.getTempTitleEn()) ? "GUANGZHOU E&C LOGISTICS LIMITED" : warehouseLineDO.getTempTitleEn());
                 headMap.put("tempTitleZh", StringUtils.isBlank(warehouseLineDO.getTempTitleZh()) ? "广州市捷道国际货运代理有限公司" : warehouseLineDO.getTempTitleZh());
 
-                //lanbm 2024-06-10 add
+
                 if (StringUtils.isBlank(warehouseLineDO.getLkLeft())) {
                     headMap.put("lkLeft", "落款参数未配置");
                 } else {
@@ -233,7 +233,7 @@ public class ShipmentReceivableExcelExportListener2 {
                         "https://jiedao-pre-production.oss-cn-shenzhen.aliyuncs.com/2024/06/11/6668347de4b001393be98e24.jpg"));
                 headMap.put("img1", imageData.getUrl());
                 headMap.put("img2", imageData.getUrl());
-                //end lanbm 2024-06-11 添加图片自动填充功能
+                //end  添加图片自动填充功能
 
                 if (box.getZgDate() != null) {
                     //装柜日期  日期格式化

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

@@ -1183,7 +1183,7 @@ public class BoxApprovalServiceImpl extends AbstractService<BoxApprovalMapper, B
                 //==============删单退场=============================
             case SHIPMENT_CUSTOMS_DECLARE_REMOVE:
                 //解析审核详情
-                //出货审批-报关删单退场审核 lanbm 2024-05-25
+                //出货审批-报关删单退场审核
                 CustomsExitType customsExitType =
                         JSON.parseObject(boxApprovalDO.getDetails(),
                                 CustomsExitType.class);

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

@@ -180,7 +180,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
             throw exception(MAKE_BILL_OF_LADING_NOT_EXISTS);
         }
 
-        //包装单位 lanbm 2024-06-11 add
+        //包装单位
         //2024-06-14 确认使用的单位字典
         List<DictDataRespDTO> listPack =
                 dictDataApi.getDictDatas("goods_package_type");

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

@@ -2949,7 +2949,6 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
     public Map<Long, BoxGoodsStatistics> getBoxStatistics(List<Long> idList) {
         //设置为不能移除的
         //获取所有预装的商品
-        //lanbm 2024-05-13 添加注释
         List<BoxPreloadGoodsDO> allGoodsItemList =
                 boxPreloadGoodsMapper.selectList(
                         new LambdaQueryWrapperX<BoxPreloadGoodsDO>()
@@ -2973,7 +2972,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
                     shipmentId, k -> new HashSet<>()).add(orderDO);
         }
 
-        //ecw_box_load_info 已装柜标签 lanbm 2024-05-13 添加注释
+        //ecw_box_load_info 已装柜标签
         List<BoxLoadInfoDO> allLoadList =
                 boxLoadInfoService.list(new LambdaQueryWrapperX<BoxLoadInfoDO>()
                 .in(BoxLoadInfoDO::getShipmentId, idList)
@@ -3002,7 +3001,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             BoxGoodsStatistics boxGoodsStatistics =
                     calculateByOrderList(loadInfoList, orderDOList);
 
-            //lanbm 2024-05-13 添加参数，解决合包箱数据为空时不计算预装箱数的BUG
+            //添加参数，解决合包箱数据为空时不计算预装箱数的BUG
             calculateBoxMergeSum(shipmentMergeMap.get(shipmentId),
                     boxGoodsStatistics,shipmentId);
 
@@ -3065,8 +3064,8 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
     }
 
     /*
-    shipmentId lanbm 2024-05-13 添加出货主表ID shipmentId
-    BoxMergePkgDO ecw_box_merge_pkg  lanbm 2024-05-13 添加注释
+    shipmentId 添加出货主表ID shipmentId
+    BoxMergePkgDO ecw_box_merge_pkg
      */
     private void calculateBoxMergeSum(List<BoxMergePkgDO> mergePkgDOList,
                                       BoxGoodsStatistics boxGoodsStatistics,
@@ -3102,7 +3101,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
         boxGoodsStatistics.setMergePlanWeight(
                 boxGoodsStatistics.getMergeWeight());
 
-        //已出数 lanbm 2024-04-13 添加注释
+        //已出数
         boxGoodsStatistics.setMergeRealVolume(
                 boxGoodsStatistics.getCheckoutMergeVolume());
         boxGoodsStatistics.setMergeRealWeight(
@@ -3237,7 +3236,7 @@ public class BoxPreloadGoodsServiceImpl extends AbstractService<BoxPreloadGoodsM
             mergeVolume = mergeVolume.add(boxMergePkgDOS.stream().filter(item -> Objects.nonNull(item.getSumVolume())).map(BoxMergePkgDO::getSumVolume).reduce(BigDecimal.ZERO, BigDecimal::add));
             mergeWeight = mergeWeight.add(boxMergePkgDOS.stream().filter(item -> Objects.nonNull(item.getSumWeight())).map(BoxMergePkgDO::getSumWeight).reduce(BigDecimal.ZERO, BigDecimal::add));
         }
-        //合包数据和预装箱数据累加一起 lanbm 2024-05-13 添加注释
+        //合包数据和预装箱数据累加一起
         if (CollectionUtil.isNotEmpty(preloadOrderIds)) {
             List<OrderDO> orderDOS =
                     orderService.selectList(OrderDO::getOrderId, preloadOrderIds);

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

@@ -167,7 +167,7 @@ public class BoxController {
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
 //    @PreAuthorize("@ss.hasPermission('shipment:box:query')")
     public CommonResult<BoxBackVO> getBoxDetail(@RequestParam("id") Long id) {
-        //lanbm 2024-05-15 修改查询到港记录有多条记录报异常的BUG
+        //修改查询到港记录有多条记录报异常的BUG
         BoxBackVO boxBackVO = boxService.getBoxDetail(id);
         return success(boxBackVO);
     }
@@ -185,7 +185,7 @@ public class BoxController {
     @ApiOperation("获得出货分页, use this")
     //@PreAuthorize("@ss.hasPermission({'shipment:box:query', 'shipment:box:query:air'})")
     public CommonResult<PageResult<BoxBackVO>> getBoxPage(@Valid BoxQueryVO query, PageVO page) {
-        //lanbm 2024-05-13 处理问题添加注释
+
         return success(boxService.getBoxPage(query, page));
     }
 

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

@@ -69,7 +69,7 @@ public class BoxCostController {
     @ApiOperation("创建费用登记, use this")
     //@PreAuthorize("@ss.hasPermission('ecw:box-cost:create')")
     public CommonResult<Long> createBoxCost(@Valid @RequestBody BoxCostCreateReqVO createReqVO) {
-        //lanbm 2024-05-17 添加费用产生日期字段
+        //添加费用产生日期字段
         String s = "";
         return success(boxCostService.createBoxCost(createReqVO));
     }
@@ -78,7 +78,7 @@ public class BoxCostController {
     @ApiOperation("更新费用登记, use this")
 //    @PreAuthorize("@ss.hasPermission('ecw:box-cost:update')")
     public CommonResult<Boolean> updateBoxCost(@Valid @RequestBody BoxCostUpdateReqVO updateReqVO) {
-        //lanbm 2024-05-17 添加费用产生日期字段
+        // 添加费用产生日期字段
         String s = "";
         boxCostService.updateBoxCost(updateReqVO);
         return success(true);
@@ -103,7 +103,6 @@ public class BoxCostController {
     }
 
     /*
-     lanbm 2024-05-16 add
      */
     @GetMapping("/getPaymentId")
     @ApiOperation("根据付款明细获取主表ID")
@@ -159,13 +158,13 @@ public class BoxCostController {
                     //获取应付款信息
                     PayableDO payableDO = payableMap.get(boxCostBackVO.getId());
                     if (payableDO != null) {
-                        //lanbm 2024-05-16 添加实付金额币种
+                        //添加实付金额币种
                         Integer i = Integer.parseInt(boxCostBackVO.getPriceUnit().toString());
                         String sBz = currencyMap.get(i);
                         boxCostBackVO.setPayPriceBz(sBz);
                         boxCostBackVO.setPayPrice(payableDO.getTotal());
                         boxCostBackVO.setPayTime(payableDO.getUpdateTime());
-                        //lanbm 2024-05-16 添加付款单单号
+                        //添加付款单单号
                         boxCostBackVO.setPayableNo(payableDO.getPayableNo());
                         boxCostBackVO.setPayableId(payableDO.getId());
 

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

@@ -135,7 +135,7 @@ public class BoxLadingBillController {
             }
 
             outputStream = response.getOutputStream();
-            //获取模板字段值 lanbm 2024-05-28 添加注释
+            //获取模板字段值
             Map<String, String> boxLadingBillPdf = null;
             if (type == 2)
                 //空运

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

@@ -57,8 +57,8 @@ public class BoxMergePkgController {
     @PutMapping("/update")
     @ApiOperation("更新合包箱")
     //@PreAuthorize("@ss.hasPermission('ecw:box-merge-pkg:update')")
-    public CommonResult<Boolean> updateBoxMergePkg(@Valid @RequestBody BoxMergePkgUpdateReqVO updateReqVO) {
-        //lanbm 2024-06-20 添加注释
+    public CommonResult<Boolean> updateBoxMergePkg(
+            @Valid @RequestBody BoxMergePkgUpdateReqVO updateReqVO) {
         boxMergePkgService.updateBoxMergePkg(updateReqVO);
         return success(true);
     }
@@ -143,7 +143,7 @@ public class BoxMergePkgController {
     //@PreAuthorize("@ss.hasPermission('ecw:box-pkg-order:query')")
     public CommonResult<BoxMergePkgBackVO> getMergePkgInfoById(
             @RequestParam("id") Long id) {
-        //lanbm 2024-06-20 添加注释
+        //
         BoxMergePkgDO boxMergePkgBackVO = boxMergePkgService.getMergePkgInfoById(id);
         return success(BoxMergePkgConvert.INSTANCE.convert(boxMergePkgBackVO));
     }

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

@@ -41,7 +41,7 @@ public class BoxOpLogController {
     }
 
     /*
-     获取订单的操作日志 lanbm 2024-06-11 添加注释
+     获取订单的操作日志
      */
     @GetMapping("/list")
     @ApiOperation("获得出货操作日志列表， use this")

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

@@ -293,7 +293,7 @@ public class BoxPreloadGoodsController {
     @ApiOperation("下载预装单")
     @ApiImplicitParam(name = "shipmentId", value = "出货单ID", required = true, example = "20", dataTypeClass = Long.class)
     public CommonResult<String> downloadPreloadGoodsList(@RequestParam("shipmentId") Long shipmentId, HttpServletResponse response) throws Exception {
-        //预装单 lanbm 2024-05-22 处理问题
+        //预装单 处理问题
         BoxDO box = boxService.getBox(shipmentId);
         FileMakeReqDTO reqDTO = new FileMakeReqDTO();
         JSONObject jsonObject = new JSONObject();
@@ -314,7 +314,7 @@ public class BoxPreloadGoodsController {
     }
 
     /*
-     海运已装单下载 lanbm 2024-06-05 修改模板
+     海运已装单下载 修改模板
      添加注释
      */
     @GetMapping("/downloadLoadGoodsList")
@@ -362,7 +362,7 @@ public class BoxPreloadGoodsController {
     @ApiOperation("下载应收汇总")
     @ApiImplicitParam(name = "shipmentId", value = "出货单ID", required = true, example = "20", dataTypeClass = Long.class)
     public CommonResult downloadReceivableList(@RequestParam("shipmentId") Long shipmentId, HttpServletResponse response) throws Exception {
-        //下载应收汇总表 ，修改模板样式 lanbm 2024-04-24 添加注释
+        //下载应收汇总表 ，修改模板样式
         BoxDO box = boxService.getBox(shipmentId);
         FileMakeReqDTO reqDTO = new FileMakeReqDTO();
         JSONObject jsonObject = new JSONObject();
@@ -382,7 +382,7 @@ public class BoxPreloadGoodsController {
     @ApiOperation("下载空运应收汇总")
     @ApiImplicitParam(name = "shipmentId", value = "出货单ID", required = true, example = "20", dataTypeClass = Long.class)
     public CommonResult downloadAirBillReceivable(@RequestParam("shipmentId") Long shipmentId, HttpServletResponse response) throws Exception {
-        //下载空运应收款汇总单 lanbm 2024-05-25 添加注释
+        //下载空运应收款汇总单
         BoxDO box = boxService.getBox(shipmentId);
         FileMakeReqDTO reqDTO = new FileMakeReqDTO();
         JSONObject jsonObject = new JSONObject();

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/dal/mysql/receiptItem/BankReceiptDetailsMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 import java.util.List;
 
 /*
- lanbm 2024-05-18 add
+
  */
 @Mapper
 public interface BankReceiptDetailsMapper {

yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/enums/TransportTypeEnum.java

@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.wealth.enums;
 
 
 /*
- lanbm 2024-05-17 移植过来的变量
+  移植过来的变量
  */
 public enum  TransportTypeEnum {
     SEA_COMBINED_CABINET("1", "海运拼柜"),