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
02ef0094
Commit
02ef0094
authored
Nov 25, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提单业务调整
parent
9b421393
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
27 deletions
+29
-27
MakeBillOfLadingServiceImpl.java
...service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
+29
-27
No files found.
yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/makeBillOfLading/MakeBillOfLadingServiceImpl.java
View file @
02ef0094
...
@@ -307,39 +307,41 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
...
@@ -307,39 +307,41 @@ public class MakeBillOfLadingServiceImpl extends AbstractService<MakeBillOfLadin
// 提单直接审批通过
// 提单直接审批通过
updateObj
.
setStatus
(
2
);
updateObj
.
setStatus
(
2
);
//end 提单直接审批通过
//end 提单直接审批通过
if
(
null
!=
updateReqVO
.
getNeedBackend
()
&&
updateReqVO
.
getNeedBackend
())
{
OrderDO
order
=
orderQueryService
.
getOrderById
(
Long
.
valueOf
(
makeBillOfLading
.
getOrderId
()));
OrderDO
order
=
orderQueryService
.
getOrderById
(
Long
.
valueOf
(
makeBillOfLading
.
getOrderId
()
));
OrderObjectiveDO
orderObjectiveDO
=
orderObjectiveService
.
getByOrderId
(
order
.
getOrderId
(
));
OrderObjectiveDO
orderObjectiveDO
=
orderObjectiveService
.
getByOrderId
(
order
.
getOrderId
());
//得到订单目的仓
String
destStr
=
""
;
//得到订单目的仓
if
(
null
!=
orderObjectiveDO
&&
null
!=
orderObjectiveDO
.
getObjectiveWarehouseId
())
{
String
destStr
=
""
;
WarehouseDO
warehouseDO
=
warehouseService
.
getWarehouse
(
orderObjectiveDO
.
getObjectiveWarehouseId
());
if
(
null
!=
orderObjectiveDO
&&
null
!=
orderObjectiveDO
.
getObjectiveWarehouseId
())
{
destStr
=
warehouseDO
.
getTitleEn
();
WarehouseDO
warehouseDO
=
warehouseService
.
getWarehouse
(
orderObjectiveDO
.
getObjectiveWarehouseId
());
}
destStr
=
warehouseDO
.
getTitleEn
();
}
if
(
StrUtil
.
isBlank
(
order
.
getContainerNumber
()))
{
if
(
StrUtil
.
isBlank
(
order
.
getContainerNumber
()))
{
throw
exception
(
MAKE_BILL_OF_SELF_NULL
);
throw
exception
(
MAKE_BILL_OF_SELF_NULL
);
}
}
if
(
StrUtil
.
isBlank
(
order
.
getTidanNo
()))
{
if
(
StrUtil
.
isBlank
(
order
.
getTidanNo
()))
{
throw
exception
(
MAKE_BILL_OF_ORDER_NULL
);
throw
exception
(
MAKE_BILL_OF_ORDER_NULL
);
}
}
FileClient
masterFileClient
=
fileConfigService
.
getMasterFileClient
();
FileClient
masterFileClient
=
fileConfigService
.
getMasterFileClient
();
String
domain
=
masterFileClient
.
getDomain
();
String
domain
=
masterFileClient
.
getDomain
();
//创建空运的PDF提单
//创建空运的PDF提单
String
pdfFileName
=
"/admin/shipment/"
+
StrUtil
.
blankToDefault
(
order
.
getContainerNumber
(),
""
)
+
"/pdf/"
+
StrUtil
.
blankToDefault
(
order
.
getTidanNo
(),
""
)
+
" "
+
StrUtil
.
blankToDefault
(
order
.
getMarks
(),
""
)
+
" "
+
StrUtil
.
blankToDefault
(
destStr
,
""
)
+
".pdf"
;
String
pdfFileName
=
"/admin/shipment/"
+
StrUtil
.
blankToDefault
(
order
.
getContainerNumber
(),
""
)
+
"/pdf/"
+
StrUtil
.
blankToDefault
(
order
.
getTidanNo
(),
""
)
+
" "
+
StrUtil
.
blankToDefault
(
order
.
getMarks
(),
""
)
+
" "
+
StrUtil
.
blankToDefault
(
destStr
,
""
)
+
".pdf"
;
String
pdfUrl
=
domain
+
pdfFileName
;
String
pdfUrl
=
domain
+
pdfFileName
;
String
pdfPath
=
prePath
+
pdfFileName
;
String
pdfPath
=
prePath
+
pdfFileName
;
try
{
try
{
AirHtmlToPdfUtil
.
convertHtmlToPdf
(
updateObj
.
getBillContent
(),
pdfPath
);
AirHtmlToPdfUtil
.
convertHtmlToPdf
(
updateObj
.
getBillContent
(),
pdfPath
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
throw
new
RuntimeException
(
e
);
throw
new
RuntimeException
(
e
);
}
//设置生成的PDF路径
updateObj
.
setImgUrl
(
pdfUrl
);
}
}
//设置生成的PDF路径
updateObj
.
setImgUrl
(
pdfUrl
);
/*
/*
String bpmProcessId =
String bpmProcessId =
bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),
bpmCreateServiceFactory.createBmp(SecurityFrameworkUtils.getLoginUserId(),
...
...
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