From 07465705727cf5aa9c262159629c3343ae21d783 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 14 Jul 2024 21:10:57 +0800 Subject: [PATCH] md --- .idea/compiler.xml | 1 + ..._aliyun_alibabacloud_gateway_spi_0_0_1.xml | 13 +++ ...ven__com_aliyun_credentials_java_0_2_4.xml | 13 +++ ...en__com_aliyun_dysmsapi20170525_2_0_22.xml | 13 +++ .../Maven__com_aliyun_endpoint_util_0_0_7.xml | 13 +++ .../Maven__com_aliyun_openapiutil_0_1_14.xml | 13 +++ .../Maven__com_aliyun_tea_1_1_14.xml | 13 +++ .../Maven__com_aliyun_tea_console_0_0_1.xml | 13 +++ .../Maven__com_aliyun_tea_openapi_0_2_6.xml | 13 +++ .../Maven__com_aliyun_tea_util_0_2_14.xml | 13 +++ .../Maven__com_aliyun_tea_xml_0_1_5.xml | 13 +++ ...aven__com_sun_xml_bind_jaxb_core_2_3_0.xml | 13 +++ ...aven__com_sun_xml_bind_jaxb_impl_2_3_0.xml | 13 +++ ...__org_bouncycastle_bcpkix_jdk15on_1_65.xml | 13 +++ .../Maven__org_dom4j_dom4j_2_0_3.xml | 13 +++ .../Maven__org_ini4j_ini4j_0_5_4.xml | 13 +++ ..._jacoco_org_jacoco_agent_runtime_0_8_4.xml | 13 +++ emis-api-web/emis-api-web.iml | 18 ++- .../xdadan/erp/apiweb/WaybillController.java | 109 +++--------------- 19 files changed, 240 insertions(+), 96 deletions(-) create mode 100644 .idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml create mode 100644 .idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml create mode 100644 .idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml create mode 100644 .idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml create mode 100644 .idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml create mode 100644 .idea/libraries/Maven__com_aliyun_tea_1_1_14.xml create mode 100644 .idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml create mode 100644 .idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml create mode 100644 .idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml create mode 100644 .idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml create mode 100644 .idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml create mode 100644 .idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml create mode 100644 .idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml create mode 100644 .idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml create mode 100644 .idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml create mode 100644 .idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 98390bf..2d8bcbb 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml new file mode 100644 index 0000000..a0ba707 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_alibabacloud_gateway_spi_0_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml new file mode 100644 index 0000000..6ff722e --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_credentials_java_0_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml new file mode 100644 index 0000000..b0b7ec3 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_dysmsapi20170525_2_0_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml new file mode 100644 index 0000000..66d2291 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_endpoint_util_0_0_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml new file mode 100644 index 0000000..ecff150 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_openapiutil_0_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml b/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml new file mode 100644 index 0000000..f0f1924 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_tea_1_1_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml new file mode 100644 index 0000000..69ab5e7 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_tea_console_0_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml new file mode 100644 index 0000000..f8cb4eb --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_tea_openapi_0_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml new file mode 100644 index 0000000..cdcc418 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_tea_util_0_2_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml new file mode 100644 index 0000000..51215c0 --- /dev/null +++ b/.idea/libraries/Maven__com_aliyun_tea_xml_0_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml new file mode 100644 index 0000000..7e58f96 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_core_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml new file mode 100644 index 0000000..70b2b05 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml new file mode 100644 index 0000000..cd50714 --- /dev/null +++ b/.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_65.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml new file mode 100644 index 0000000..015b98b --- /dev/null +++ b/.idea/libraries/Maven__org_dom4j_dom4j_2_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml b/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml new file mode 100644 index 0000000..9e114a8 --- /dev/null +++ b/.idea/libraries/Maven__org_ini4j_ini4j_0_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml new file mode 100644 index 0000000..b7f6c9a --- /dev/null +++ b/.idea/libraries/Maven__org_jacoco_org_jacoco_agent_runtime_0_8_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-api-web/emis-api-web.iml b/emis-api-web/emis-api-web.iml index 5844ada..0e05a4c 100644 --- a/emis-api-web/emis-api-web.iml +++ b/emis-api-web/emis-api-web.iml @@ -172,7 +172,6 @@ - @@ -250,5 +249,22 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java index 0a5b2d6..b261926 100644 --- a/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java +++ b/emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java @@ -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("服务器异常，联系客服"); - } - - }