Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
1ca70cc0
Commit
1ca70cc0
authored
Jul 03, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-07-03-2提交
parent
dcc3fc7c
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
8 additions
and
14 deletions
+8
-14
CustomerReportBar.java
...r/yudao/module/delivery/entity/bar/CustomerReportBar.java
+1
-2
OrderExt.java
...oder/yudao/module/delivery/entity/orderdata/OrderExt.java
+1
-1
AllWriteOffJob.java
.../cn/iocoder/yudao/module/delivery/job/AllWriteOffJob.java
+0
-2
EcwVzMapper.java
.../cn/iocoder/yudao/module/delivery/mapper/EcwVzMapper.java
+0
-1
EmployeeMapper.java
.../iocoder/yudao/module/delivery/mapper/EmployeeMapper.java
+1
-1
CustomerAnalysisImpl.java
...ao/module/delivery/service/Impl/CustomerAnalysisImpl.java
+0
-1
OrderWarehouseInServiceImpl.java
...service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
+2
-2
ShipmentLoadExcelExportListener2.java
...e/shipment/listener/ShipmentLoadExcelExportListener2.java
+1
-1
ShipmentReceivableExcelExportListener2.java
...ment/listener/ShipmentReceivableExcelExportListener2.java
+1
-2
BoxLadingBillServiceImpl.java
...pment/service/boxLadingBill/BoxLadingBillServiceImpl.java
+1
-1
No files found.
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/bar/CustomerReportBar.java
View file @
1ca70cc0
...
...
@@ -11,7 +11,6 @@ import java.util.List;
/*
客户看板返回给图表的Model
lanbm 2024-04-03 add
*/
@Data
@Builder
...
...
@@ -27,7 +26,7 @@ public class CustomerReportBar {
private
List
<
CustomerReportResp
>
resultList
;
/*
记录总数
lanbm 2024-04-14 add
记录总数
*/
private
long
total
;
}
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/orderdata/OrderExt.java
View file @
1ca70cc0
...
...
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.delivery.entity.orderdata;
import
lombok.Data
;
/*
订单业务逻辑的相关判断
lanbm 2024-05-07 add
订单业务逻辑的相关判断
此参数暂时未使用
*/
@Data
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/job/AllWriteOffJob.java
View file @
1ca70cc0
...
...
@@ -13,7 +13,6 @@ import javax.annotation.Resource;
/*
财务收款单 全部核销定时任务
lanbm 2024-05-14 add
myBatis调用存储过程参考
https://blog.csdn.net/dwenxue/article/details/82257944
*/
...
...
@@ -22,7 +21,6 @@ import javax.annotation.Resource;
@Slf4j
public
class
AllWriteOffJob
implements
JobHandler
{
//在服务器上配置任务名时,此类的名称要小写,否则无法识别。
//lanbm 2024-05-19 添加注释
@Resource
private
AllWriteOffService
allWriteOffService
;
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/EcwVzMapper.java
View file @
1ca70cc0
...
...
@@ -31,7 +31,6 @@ public interface EcwVzMapper extends BaseMapperX<EcwVz> {
/*
实现物理删除
lanbm 2024-04-08 add
*/
int
deleteById2
(
Long
id
);
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/mapper/EmployeeMapper.java
View file @
1ca70cc0
...
...
@@ -20,7 +20,7 @@ import java.util.List;
/**
* (Employee)表数据库访问层
*
* @author
lanbm
* @author
* @since 2024-03-27 21:25:56
*/
@Mapper
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/CustomerAnalysisImpl.java
View file @
1ca70cc0
...
...
@@ -888,7 +888,6 @@ public class CustomerAnalysisImpl implements CustomerAnalysisService {
/*
lanbm 2024-04-26 add
*/
public
PageResult
<
CustomerAnalysisResp
>
getListPage_New
(
CustomerAnalysisReq
req
)
throws
JsonProcessingException
{
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @
1ca70cc0
...
...
@@ -2821,7 +2821,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderWarehouseInCreateReqVO
.
setOrderWarehouseInItemDoList
(
orderWarehouseInUpdateItemDoList
);
}
/*
lanbm 2024-05-21
修改此处,isDeleteNotInWarehouseIn 改为true
/* 修改此处,isDeleteNotInWarehouseIn 改为true
this.doSaveOrUpdateOrderWarehouseInDo(orderWarehouseInCreateReqVO,
orderId, orderItemId, orderDO,
updateReqVO.getPictureUrls(),
...
...
@@ -2859,7 +2859,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
// 已完成入仓,则需要提交申请
else
{
//完成入仓之后修改信息才发起审批流程
lanbm 2024-06-04 添加注释
//完成入仓之后修改信息才发起审批流程
// 需要提交审批,则不能有其他任何审批
orderQueryService
.
throwProcessingApproval
(
orderId
);
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentLoadExcelExportListener2.java
View file @
1ca70cc0
...
...
@@ -537,7 +537,7 @@ public class ShipmentLoadExcelExportListener2 {
sReult
=
sAttrName
;
}
}
//end
lanbm 2024-06-05
添加商品特性
//end 添加商品特性
return
sReult
;
}
}
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/listener/ShipmentReceivableExcelExportListener2.java
View file @
1ca70cc0
...
...
@@ -117,7 +117,6 @@ public class ShipmentReceivableExcelExportListener2 {
private
AdminUserApi
adminUserApi
;
/*
lanbm 2024-06-12 add
*/
private
String
getTemplateName
(
WarehouseLineDO
warehouseLineDO
)
{
String
sTemName
=
"/nrlyReceivable2.xlsx"
;
...
...
@@ -158,7 +157,7 @@ public class ShipmentReceivableExcelExportListener2 {
String
dir
=
ueProperties
.
getTempDir
().
concat
(
"/receivable/excel/"
);
//先不合并单元格,之后合并,把合并的传到服务器
lanbm 2024-05-25 add
//先不合并单元格,之后合并,把合并的传到服务器
String
fileName
=
event
.
getUserId
().
toString
().
concat
(
StrUtil
.
DASHED
).
concat
(
event
.
getUserType
().
toString
()).
concat
(
StrUtil
.
DASHED
).
concat
(
nowTime
).
...
...
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxLadingBill/BoxLadingBillServiceImpl.java
View file @
1ca70cc0
...
...
@@ -168,7 +168,7 @@ public class BoxLadingBillServiceImpl extends AbstractService<BoxLadingBillMappe
/*
空运提单补料
lanbm 2024-05-28 添加注释
空运提单补料
*/
@Override
public
Map
<
String
,
String
>
getBoxLadingBillPdf
(
Long
shipmentId
)
throws
Exception
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment