aike/emis-api-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-14 21:10:57 +08:00
parent 404e6bdc5d
commit 0746570572
19 changed files with 240 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/compiler.xml
View File

@ -2,6 +2,7 @@
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

13
.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/alibabacloud-gateway-spi/0.0.1/alibabacloud-gateway-spi-0.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/alibabacloud-gateway-spi/0.0.1/alibabacloud-gateway-spi-0.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/alibabacloud-gateway-spi/0.0.1/alibabacloud-gateway-spi-0.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:credentials-java:0.2.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/credentials-java/0.2.4/credentials-java-0.2.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/credentials-java/0.2.4/credentials-java-0.2.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/credentials-java/0.2.4/credentials-java-0.2.4-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:dysmsapi20170525:2.0.22">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/dysmsapi20170525/2.0.22/dysmsapi20170525-2.0.22.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/dysmsapi20170525/2.0.22/dysmsapi20170525-2.0.22-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/dysmsapi20170525/2.0.22/dysmsapi20170525-2.0.22-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:endpoint-util:0.0.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/endpoint-util/0.0.7/endpoint-util-0.0.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/endpoint-util/0.0.7/endpoint-util-0.0.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/endpoint-util/0.0.7/endpoint-util-0.0.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:openapiutil:0.1.14">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/openapiutil/0.1.14/openapiutil-0.1.14.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/openapiutil/0.1.14/openapiutil-0.1.14-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/openapiutil/0.1.14/openapiutil-0.1.14-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:tea:1.1.14">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea/1.1.14/tea-1.1.14.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea/1.1.14/tea-1.1.14-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea/1.1.14/tea-1.1.14-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:tea-console:0.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-console/0.0.1/tea-console-0.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:tea-openapi:0.2.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-openapi/0.2.6/tea-openapi-0.2.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-openapi/0.2.6/tea-openapi-0.2.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-openapi/0.2.6/tea-openapi-0.2.6-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:tea-util:0.2.14">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-util/0.2.14/tea-util-0.2.14.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-util/0.2.14/tea-util-0.2.14-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-util/0.2.14/tea-util-0.2.14-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.aliyun:tea-xml:0.1.5">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-xml/0.1.5/tea-xml-0.1.5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-xml/0.1.5/tea-xml-0.1.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/aliyun/tea-xml/0.1.5/tea-xml-0.1.5-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sun.xml.bind:jaxb-core:2.3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-core-2.3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-core-2.3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-core-2.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.3.0/jaxb-impl-2.3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.3.0/jaxb-impl-2.3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.3.0/jaxb-impl-2.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.65/bcpkix-jdk15on-1.65-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.dom4j:dom4j:2.0.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.0.3/dom4j-2.0.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.0.3/dom4j-2.0.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/dom4j/dom4j/2.0.3/dom4j-2.0.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.ini4j:ini4j:0.5.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/ini4j/ini4j/0.5.4/ini4j-0.5.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/ini4j/ini4j/0.5.4/ini4j-0.5.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/ini4j/ini4j/0.5.4/ini4j-0.5.4-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-sources.jar!/" />
</SOURCES>
</library>
</component>

18
emis-api-web/emis-api-web.iml
View File

@ -172,7 +172,6 @@
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-sts:3.0.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-ecs:4.2.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:aliyun-java-sdk-kms:2.7.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: io.minio:minio:8.4.5" level="project" />
<orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
@ -250,5 +249,22 @@
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:2.0.9" level="project" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.11" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:dysmsapi20170525:2.0.22" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:endpoint-util:0.0.7" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:openapiutil:0.1.14" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.65" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.6" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:credentials-java:0.2.4" level="project" />
<orderEntry type="library" name="Maven: org.ini4j:ini4j:0.5.4" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:alibabacloud-gateway-spi:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-xml:0.1.5" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.0.3" level="project" />
<orderEntry type="library" name="Maven: org.jacoco:org.jacoco.agent:runtime:0.8.4" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-console:0.0.1" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea-util:0.2.14" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
<orderEntry type="library" name="Maven: com.aliyun:tea:1.1.14" level="project" />
</component>
</module>

109
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
View File

@ -86,8 +86,8 @@ public class WaybillController extends BaseController
/**
* 获取电子运单信息
*/
@GetMapping(value = "/getWaybillDetail")
public AjaxResult getWaybillDetail(String billCode ,String orderSn)
@GetMapping(value = "/getWaybillDetailByOms")
public AjaxResult getWaybillDetailByOms(String billCode ,String orderSn)
{
try {
WaybillOrder waybillOrder=null;
@ -138,8 +138,8 @@ public class WaybillController extends BaseController
}
@Log(title = "Excel草稿方式下单", businessType = BusinessType.INSERT)
@PostMapping(value = "/draftSubmitOrder")
public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave)
@PostMapping(value = "/draftSubmitOrderByOms")
public AjaxResult draftSubmitOrderByOms(@RequestBody EmisWaybill emisWaybillSave)
{
JSONObject jObjOut = new JSONObject();
@ -180,8 +180,8 @@ public class WaybillController extends BaseController
}
@Log(title = "取消订单", businessType = BusinessType.INSERT)
@PostMapping(value = "/cancelOrder")
public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder)
@PostMapping(value = "/cancelOrderByOms")
public AjaxResult cancelOrderByOms(@Valid @RequestBody WaybillOrder waybillOrder)
{
try {
@ -210,9 +210,10 @@ public class WaybillController extends BaseController
}
}
@Log(title = "运单实时下单", businessType = BusinessType.INSERT)
@PostMapping(value = "/realSubmitOrder")
public AjaxResult realSubmitOrder(@Valid @RequestBody WaybillOrder waybillOrder, Integer isModify)
@Log(title = "OMS实时下单", businessType = BusinessType.INSERT)
@PostMapping(value = "/realSubmitOrderByOms")
public AjaxResult realSubmitOrderByOms(@Valid @RequestBody WaybillOrder waybillOrder, Integer isModify)
{
try {
@ -222,7 +223,7 @@ public class WaybillController extends BaseController
EmisWaybill emisWaybillSave = waybillOrder.toDb();
emisWaybillService.realSubmitOrder(emisWaybillSave);
emisWaybillService.realSubmitOrderByOms(emisWaybillSave);
JSONObject jObjOut = new JSONObject();
jObjOut.put("billCode", waybillOrder.getBillCode());
@ -241,17 +242,16 @@ public class WaybillController extends BaseController
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
@Log(title = "运费试算", businessType = BusinessType.OTHER)
@PostMapping(value = "/preCalcWaybillFee")
public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder)
@PostMapping(value = "/preCalcWaybillFeeByOms")
public AjaxResult preCalcWaybillFeeByOms(@RequestBody WaybillOrder waybillOrder)
{
try {
EmisWaybill emisWaybillSave = waybillOrder.toDb();
@ -273,88 +273,7 @@ public class WaybillController extends BaseController
}
}
@Log(title = "计算运费", businessType = BusinessType.OTHER)
@PostMapping(value = "/calcWaybillFee")
public AjaxResult calcWaybillFee(@RequestBody WaybillOrder waybillOrder)
{
try {
EmisWaybill emisWaybillSave = waybillOrder.toDb();
emisWaybillService.calcWaybillFee(emisWaybillSave);
JSONObject jObjFee = new JSONObject();
jObjFee.put("totalFee", emisWaybillSave.getFreight());
FeeItem feeItem = new FeeItem();
jObjFee.put("feeList",feeItem.cvtToVoList(emisWaybillSave.getFeeitemList()));
return AjaxResult.success("计算成功", jObjFee);
}
catch(EmisBizError ex){
ex.printStackTrace();
return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage());
}
catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
@Log(title = "计算结算重量", businessType = BusinessType.OTHER)
@PostMapping(value = "/calcSetteldWeight")
public AjaxResult calcSetteldWeight(@RequestBody WaybillOrder waybillOrder)
{
try {
EmisWaybill emisWaybillSave = waybillOrder.toDb();
emisWaybillService.calcSettledWeight(emisWaybillSave);
JSONObject jObjRst = new JSONObject();
jObjRst.put("settlementWeight", emisWaybillSave.getSettlementWeight());
jObjRst.put("volumeWeight", emisWaybillSave.getVolumeWeight());
return AjaxResult.success("计算成功", jObjRst);
}
catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}
@Log(title = "计算体积重量", businessType = BusinessType.OTHER)
@PostMapping(value = "/calcVolumeWeight")
public AjaxResult calcVolumeWeight(@RequestBody WaybillOrder waybillOrder)
{
try {
EmisWaybill emisWaybillSave = waybillOrder.toDb();
emisWaybillService.calcVolumeWeight(emisWaybillSave);
JSONObject jObjRst = new JSONObject();
jObjRst.put("volumeWeight", emisWaybillSave.getVolumeWeight());
return AjaxResult.success("计算成功", jObjRst);
}
catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error(ex.getMessage(),((EmisBizError)ex).getErrorCode());
}
return AjaxResult.error("服务器异常，联系客服");
}
}