Commit 1ca70cc0 authored by lanbaoming's avatar lanbaoming

2024-07-03-2提交

parent dcc3fc7c
...@@ -11,7 +11,6 @@ import java.util.List; ...@@ -11,7 +11,6 @@ import java.util.List;
/* /*
客户看板返回给图表的Model 客户看板返回给图表的Model
lanbm 2024-04-03 add
*/ */
@Data @Data
@Builder @Builder
...@@ -27,7 +26,7 @@ public class CustomerReportBar { ...@@ -27,7 +26,7 @@ public class CustomerReportBar {
private List<CustomerReportResp> resultList; private List<CustomerReportResp> resultList;
/* /*
记录总数 lanbm 2024-04-14 add 记录总数
*/ */
private long total; private long total;
} }
...@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.delivery.entity.orderdata; ...@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.delivery.entity.orderdata;
import lombok.Data; import lombok.Data;
/* /*
订单业务逻辑的相关判断 lanbm 2024-05-07 add 订单业务逻辑的相关判断
此参数暂时未使用 此参数暂时未使用
*/ */
@Data @Data
......
...@@ -13,7 +13,6 @@ import javax.annotation.Resource; ...@@ -13,7 +13,6 @@ import javax.annotation.Resource;
/* /*
财务收款单 全部核销定时任务 财务收款单 全部核销定时任务
lanbm 2024-05-14 add
myBatis调用存储过程参考 myBatis调用存储过程参考
https://blog.csdn.net/dwenxue/article/details/82257944 https://blog.csdn.net/dwenxue/article/details/82257944
*/ */
...@@ -22,7 +21,6 @@ import javax.annotation.Resource; ...@@ -22,7 +21,6 @@ import javax.annotation.Resource;
@Slf4j @Slf4j
public class AllWriteOffJob implements JobHandler { public class AllWriteOffJob implements JobHandler {
//在服务器上配置任务名时,此类的名称要小写,否则无法识别。 //在服务器上配置任务名时,此类的名称要小写,否则无法识别。
//lanbm 2024-05-19 添加注释
@Resource @Resource
private AllWriteOffService allWriteOffService; private AllWriteOffService allWriteOffService;
......
...@@ -31,7 +31,6 @@ public interface EcwVzMapper extends BaseMapperX<EcwVz> { ...@@ -31,7 +31,6 @@ public interface EcwVzMapper extends BaseMapperX<EcwVz> {
/* /*
实现物理删除 实现物理删除
lanbm 2024-04-08 add
*/ */
int deleteById2(Long id); int deleteById2(Long id);
......
...@@ -20,7 +20,7 @@ import java.util.List; ...@@ -20,7 +20,7 @@ import java.util.List;
/** /**
* (Employee)表数据库访问层 * (Employee)表数据库访问层
* *
* @author lanbm * @author
* @since 2024-03-27 21:25:56 * @since 2024-03-27 21:25:56
*/ */
@Mapper @Mapper
......
...@@ -888,7 +888,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService { ...@@ -888,7 +888,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
/* /*
lanbm 2024-04-26 add
*/ */
public PageResult<CustomerAnalysisResp> getListPage_New(CustomerAnalysisReq req) public PageResult<CustomerAnalysisResp> getListPage_New(CustomerAnalysisReq req)
throws JsonProcessingException { throws JsonProcessingException {
......
...@@ -2821,7 +2821,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI ...@@ -2821,7 +2821,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderWarehouseInCreateReqVO.setOrderWarehouseInItemDoList(orderWarehouseInUpdateItemDoList); orderWarehouseInCreateReqVO.setOrderWarehouseInItemDoList(orderWarehouseInUpdateItemDoList);
} }
/* lanbm 2024-05-21 修改此处,isDeleteNotInWarehouseIn 改为true /* 修改此处,isDeleteNotInWarehouseIn 改为true
this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO, this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO,
orderId, orderItemId, orderDO, orderId, orderItemId, orderDO,
updateReqVO.getPictureUrls(), updateReqVO.getPictureUrls(),
...@@ -2859,7 +2859,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI ...@@ -2859,7 +2859,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
// 已完成入仓,则需要提交申请 // 已完成入仓,则需要提交申请
else { else {
//完成入仓之后修改信息才发起审批流程 lanbm 2024-06-04 添加注释 //完成入仓之后修改信息才发起审批流程
// 需要提交审批,则不能有其他任何审批 // 需要提交审批,则不能有其他任何审批
orderQueryService.throwProcessingApproval(orderId); orderQueryService.throwProcessingApproval(orderId);
......
...@@ -537,7 +537,7 @@ public class ShipmentLoadExcelExportListener2 { ...@@ -537,7 +537,7 @@ public class ShipmentLoadExcelExportListener2 {
sReult = sAttrName; sReult = sAttrName;
} }
} }
//end lanbm 2024-06-05添加商品特性 //end 添加商品特性
return sReult; return sReult;
} }
} }
......
...@@ -117,7 +117,6 @@ public class ShipmentReceivableExcelExportListener2 { ...@@ -117,7 +117,6 @@ public class ShipmentReceivableExcelExportListener2 {
private AdminUserApi adminUserApi; private AdminUserApi adminUserApi;
/* /*
lanbm 2024-06-12 add
*/ */
private String getTemplateName(WarehouseLineDO warehouseLineDO) { private String getTemplateName(WarehouseLineDO warehouseLineDO) {
String sTemName = "/nrlyReceivable2.xlsx"; String sTemName = "/nrlyReceivable2.xlsx";
...@@ -158,7 +157,7 @@ public class ShipmentReceivableExcelExportListener2 { ...@@ -158,7 +157,7 @@ public class ShipmentReceivableExcelExportListener2 {
String dir = ueProperties.getTempDir().concat("/receivable/excel/"); String dir = ueProperties.getTempDir().concat("/receivable/excel/");
//先不合并单元格,之后合并,把合并的传到服务器 lanbm 2024-05-25 add //先不合并单元格,之后合并,把合并的传到服务器
String fileName = event.getUserId().toString(). String fileName = event.getUserId().toString().
concat(StrUtil.DASHED).concat(event.getUserType().toString()). concat(StrUtil.DASHED).concat(event.getUserType().toString()).
concat(StrUtil.DASHED).concat(nowTime). concat(StrUtil.DASHED).concat(nowTime).
......
...@@ -168,7 +168,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe ...@@ -168,7 +168,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
/* /*
空运提单补料 lanbm 2024-05-28 添加注释 空运提单补料
*/ */
@Override @Override
public Map<String, String> getBoxLadingBillPdf(Long shipmentId) throws Exception { public Map<String, String> getBoxLadingBillPdf(Long shipmentId) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment