diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java index db3a0fdb..f1e86bd2 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoWaybillController.java @@ -1,78 +1,34 @@ package cn.qihangerp.api.tao.controller; -import cn.qihangerp.api.tao.TaoApiCommon; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.enums.HttpStatus; +import cn.qihangerp.open.dou.DouRequest; import cn.qihangerp.security.common.BaseController; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; import lombok.extern.java.Log; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - @Log @AllArgsConstructor @RestController @RequestMapping("/tao/ewaybill") public class TaoWaybillController extends BaseController { - private final TaoApiCommon taoApiCommon; + @GetMapping(value = "/get_waybill_account_list") public AjaxResult getWaybillAccountList(Long shopId) throws Exception { - - return AjaxResult.error("开源版本不支持电子面单取号功能"); + return AjaxResult.error("开源版本不支持电子面单功能"); } -// @RequestMapping(value = "/shareSupplier", method = RequestMethod.POST) -// public AjaxResult shareSupplier(@RequestBody ShareSupplierRequest params) throws Exception { -// if (params.getId() == null || params.getId() <= 0) return AjaxResult.error("参数错误，没有Id"); -// if (params.getSupplierIds() == null || params.getSupplierIds().length == 0) return AjaxResult.error("参数错误，没有供应商"); -// OmsDouWaybillAccount account = new OmsDouWaybillAccount(); -// account.setId(params.getId()); -// String result = Arrays.stream(params.getSupplierIds()).mapToObj(String::valueOf).collect(Collectors.joining(",")); -// account.setSupplierIds(","+result+","); -// waybillAccountService.updateById(account); -// -// return AjaxResult.success(); -// } -// -// @RequestMapping(value = "/updateAccount", method = RequestMethod.POST) -// public AjaxResult updateAccount(@RequestBody DouWaybillAccountUpdateRequest params) throws Exception { -// if (params.getId() == null || params.getId() <= 0) return AjaxResult.error("参数错误，没有Id"); -// if (!StringUtils.hasText(params.getName())) return AjaxResult.error("缺少参数"); -// if (!StringUtils.hasText(params.getMobile())) return AjaxResult.error("缺少参数"); -// if (!StringUtils.hasText(params.getNetsiteName())) return AjaxResult.error("缺少参数"); -// if (!StringUtils.hasText(params.getNetsiteCode())) return AjaxResult.error("缺少参数"); -// -// OmsDouWaybillAccount account = new OmsDouWaybillAccount(); -// account.setId(params.getId()); -// account.setNetsiteName(params.getNetsiteName()); -// account.setNetsiteCode(params.getNetsiteCode()); -// account.setName(params.getName()); -// account.setMobile(params.getMobile()); -// account.setSellerShopId(params.getSellerShopId()); -// waybillAccountService.updateById(account); -// -// return AjaxResult.success(); -// } /** * 拉取电子面单账号 * - * @param + * @param params * @return * @throws Exception */ @RequestMapping(value = "/pull_waybill_account", method = RequestMethod.POST) - public AjaxResult pullWaybillAccount() throws Exception { + public AjaxResult pullWaybillAccount(@RequestBody DouRequest params) throws Exception { return AjaxResult.error("开源版本不支持电子面单功能"); } @@ -91,8 +47,7 @@ public class TaoWaybillController extends BaseController { @PostMapping("/push_print_success") @ResponseBody public AjaxResult pushPrintSuccess() { - - return AjaxResult.success(); + return AjaxResult.error("开源版本不支持电子面单功能"); } /** @@ -104,6 +59,6 @@ public class TaoWaybillController extends BaseController { @PostMapping("/push_ship_send") @ResponseBody public AjaxResult pushShipSend() { - return AjaxResult.error("开源版本不支持电子面单发货功能"); + return AjaxResult.error("开源版本不支持电子面单功能"); } } diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java new file mode 100644 index 00000000..edc95c4a --- /dev/null +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiWaybillController.java @@ -0,0 +1,64 @@ +package cn.qihangerp.api.wei.controller; + +import cn.qihangerp.common.AjaxResult; +import cn.qihangerp.open.dou.DouRequest; +import cn.qihangerp.security.common.BaseController; +import lombok.AllArgsConstructor; +import lombok.extern.java.Log; +import org.springframework.web.bind.annotation.*; + +@Log +@AllArgsConstructor +@RestController +@RequestMapping("/wei/ewaybill") +public class WeiWaybillController extends BaseController { + + + @GetMapping(value = "/get_waybill_account_list") + public AjaxResult getWaybillAccountList(Long shopId) throws Exception { + return AjaxResult.error("开源版本不支持电子面单功能"); + } + + + /** + * 拉取电子面单账号 + * + * @param params + * @return + * @throws Exception + */ + @RequestMapping(value = "/pull_waybill_account", method = RequestMethod.POST) + public AjaxResult pullWaybillAccount(@RequestBody DouRequest params) throws Exception { + return AjaxResult.error("开源版本不支持电子面单功能"); + } + + @PostMapping("/get_waybill_code") + @ResponseBody + public AjaxResult getWaybillCode() { + return AjaxResult.error("开源版本不支持电子面单功能"); + } + + @PostMapping("/get_print_data") + @ResponseBody + public AjaxResult getPrintData() { + return AjaxResult.error("开源版本不支持电子面单功能"); + } + + @PostMapping("/push_print_success") + @ResponseBody + public AjaxResult pushPrintSuccess() { + return AjaxResult.error("开源版本不支持电子面单功能"); + } + + /** + * 发货 + * + * @param + * @return + */ + @PostMapping("/push_ship_send") + @ResponseBody + public AjaxResult pushShipSend() { + return AjaxResult.error("开源版本不支持电子面单功能"); + } +} diff --git a/vue/src/views/tao/ewaybill/index.vue b/vue/src/views/tao/ewaybill/index.vue index a2e515c7..f21d915c 100644 --- a/vue/src/views/tao/ewaybill/index.vue +++ b/vue/src/views/tao/ewaybill/index.vue @@ -480,7 +480,7 @@ export default { this.multiple = !selection.length }, openWs() { - console.log('开源版本暂不支持') + this.$modal.msgError("开源版本未实现电子面单相关功能！请自行对接发货"); }, // 取号弹窗 handleGetEwaybillCode() { diff --git a/vue/src/views/wei/ewaybill/index.vue b/vue/src/views/wei/ewaybill/index.vue index 3b293a8e..77261f33 100644 --- a/vue/src/views/wei/ewaybill/index.vue +++ b/vue/src/views/wei/ewaybill/index.vue @@ -332,30 +332,7 @@ export default { }); }, openWs() { - const ws = new WebSocket('ws://127.0.0.1:12705'); - ws.onopen = () => { - console.log('与打印组件建立连接成功: '); - // 或打印机 - ws.send(JSON.stringify({ - requestID: '12345', - command: 'getPrinterList' - })) - }; - let obj = this.$modal; - ws.onmessage = (e) => { - const resp = JSON.parse(e.data || '{}') - if (resp.command === 'getPrinterList') { - this.printerList = resp.printerList - obj.msgSuccess("打印组件连接成功！"); - console.log('打印机列表: ', resp.printerList); - } - }; - // 当发生错误时触发 - ws.onerror = function(error) { - obj.msgError("打印组件连接失败！请安装并启动微信视频号小店打印组件！"); - console.error('WebSocket error:', error); - // alert('WebSocket error occurred. Check the console for more details.'); - }; + this.$modal.msgError("开源版本未实现电子面单相关功能！请自行对接发货"); }, handlePrintEwaybill() { if (!this.printParams.printer) { @@ -365,57 +342,7 @@ export default { getWaybillPrintData({shopId: this.queryParams.shopId, ids: this.ids}).then(response => { console.log("======打印======", response.data) if (response.data) { - const ws = new WebSocket('ws://127.0.0.1:12705'); - - ws.onopen = () => { - console.log('开始打印: '); - // 打印 - ws.send(JSON.stringify({ - command: 'print', - version: '2.0', // 必传 - requestID: '1234', // String, 调用方保证唯一 - taskList: [{ - taskID: '1234', // String, 调用方保证唯一 - printInfo: 'JTdCJTIycHJpbnREYXRhJTIyJTNBJTdCJTIyd2F5YmlsbElkJTIyJTNBJTIyNzM2MTE0NjI1MzgzODUlMjIlMkMlMjJwcmludFRpbWUlMjIlM0ElMjIyMDI0JTJGMDYlMkYwMyUyMDE4JTNBNDUlMjIlMkMlMjJzZXJ2aWNlcyUyMiUzQSU1QiU1RCUyQyUyMnJlY2VpdmVyTmFtZSUyMiUzQSUyMiVFNSVBRSVBMyoqJTIyJTJDJTIycmVjZWl2ZXJQaG9uZSUyMiUzQSUyMjEzNyoqKiozODQwJTIyJTJDJTIycmVjZWl2ZXJBZGRyZXNzJTIyJTNBJTIyJUU0JUI4JThBJUU2JUI1JUI3JUU1JUI4JTgyJUU0JUI4JThBJUU2JUI1JUI3JUU1JUI4JTgyJUU2JUI1JUE2JUU0JUI4JTlDJUU2JTk2JUIwJUU1JThDJUJBJUU1JUJDJUEwJUU2JUIxJTlGJUU5JTk1JTg3JUU1JUFEJTk5JUU2JUExJUE1JUU4JUI3JUFGMjM4JUU1JUJDJTg0MzAlRTUlOEYlQjcyMDIlRTUlQUUlQTQlMjIlMkMlMjJzZW5kZXJOYW1lJTIyJTNBJTIyJUU0JUI4JTgzJUU5JTg3JThDJUU1JTlEJUFBJTIyJTJDJTIyc2VuZGVyUGhvbmUlMjIlM0ElMjIxNTgxODU5MDExOSUyMiUyQyUyMnNlbmRlckFkZHJlc3MlMjIlM0ElMjIlRTUlQjklQkYlRTQlQjglOUMlRTclOUMlODElRTYlQjclQjElRTUlOUMlQjMlRTUlQjglODIlRTUlQUUlOUQlRTUlQUUlODklRTUlOEMlQkF4eHh4eDElRTUlOEYlQjclRTUlOEMlOTclRTklOTclQTglMjIlMkMlMjJzaXRlQ29kZSUyMiUzQSUyMjU1ODMwJTIyJTJDJTIyZXdheWJpbGxPcmRlcklkJTIyJTNBJTIyMzQ4NjYxMzA5Mzg5ODE0MTY5OSUyMiUyQyUyMmJhZ0FkZHIlMjIlM0ElMjIlRTYlQjIlQUElRTQlQjglOUMlMjIlMkMlMjJtYXJrJTIyJTNBJTIyMzEwLSUyMFA2JTIwMDMxJTIwJTVCQjMxJTVEJTIyJTJDJTIyc3RvcmVOYW1lJTIyJTNBJTIyJUU5JUFBJTg0JUU5JUI5JUJGJUU2JTlDJTlCJUU1JUIxJUIxJUU0JUI4JTkzJUU1JThEJTk2JUU1JUJBJTk3JTIyJTJDJTIyY3VzdG9tZXJOb3RlcyUyMiUzQSUyMiUyMiUyQyUyMm1lcmNoYW50Tm90ZXMlMjIlM0ElMjIlMjIlMkMlMjJvcmRlcklkJTIyJTNBJTIyMzcyMDI5MzQxNTUwOTk1NDgxNiUyMiU3RCUyQyUyMnRlbXBsYXRlJTIyJTNBJTdCJTIydGVtcGxhdGVJZCUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMnRlbXBsYXRlTmFtZSUyMiUzQSUyMiVFOSVCQiU5OCVFOCVBRSVBNCVFNyVBOSVCQSVFNiVBOCVBMSVFNiU5RCVCRiUyMiUyQyUyMnRlbXBsYXRlRGVzYyUyMiUzQSUyMiVFNCVCOCU4MCVFOCU4MSU5NCVFNSU4RCU5NSVFNiVBMCU4NyVFNSU4NyU4NiVFNiVBOCVBMSVFNiU5RCVCRiUyMiUyQyUyMnRlbXBsYXRlVHlwZSUyMiUzQSUyMnNpbmdsZSUyMiUyQyUyMm9wdGlvbkxpc3QlMjIlM0ElN0IlN0QlMkMlMjJvcHRpb25zJTIyJTNBJTVCJTVEJTJDJTIyY29kZSUyMiUzQTAlMkMlMjJkZWxpdmVyeUlkJTIyJTNBJTIyWlRPJTIyJTJDJTIydGVtcGxhdGVVcmwlMjIlM0ElMjJodHRwcyUzQSUyRiUyRm1tZWMtc2hvcC0xMjU4MzQ0NzA3LmNvcy5hcC1zaGFuZ2hhaS5teXFjbG91ZC5jb20lMkZzaG9wJTJGcHVibGljJTJGMjAyMy0xMC0yNSUyRjNlY2JiM2FhLTViY2YtNDA0ZC05NzJhLThhMDhhODE2MjIzYy5odG1sJTIyJTJDJTIyY3VzdG9tQ29uZmlnJTIyJTNBJTdCJTIyd2lkdGglMjIlM0E2NTYlMkMlMjJoZWlnaHQlMjIlM0EzMDAlMkMlMjJsZWZ0JTIyJTNBNjAlMkMlMjJ0b3AlMjIlM0E5MzAlN0QlMkMlMjJ3aWR0aCUyMiUzQTc2JTJDJTIyaGVpZ2h0JTIyJTNBMTMwJTdEJTdE', // String, [获取打印报文]接口返回的print_info - printNum: { - curNum: 1, // 打印计数-当前张数 - sumNum: 2, // 打印计数-总张数 - }, - splitControl: 0,// 可不传， 默认为0， 根据自定义内容自动分页；1，禁止分页；2；强制分页， 内容打印在第二页 - showDeliveryLogo: 0, // 可不传， 默认为1， 传0时不展示快递公司logo - // 自定义模板信息，没有自定义模板需求可不传 - - // 面单补充信息，用来覆盖寄件人信息，没有这种需求可以不传 - - }], - printType: 1, // Number 打印类型，默认为 1，打印固定高度的面单；如果为2，则打印任意自定义内容，需要传递 size 参数指定纸张尺寸，printInfo 改为传递 base64 格式的 html - size: { - width: 76, // 纸张尺寸，单位毫米，printType 为 2 时必传 - height: 130 - }, - printer: this.printParams.printer, // 选中的打印机，printer.name - })) - }; - - - let obj = this.$modal; - ws.onmessage = (e) => { - const resp = JSON.parse(e.data || '{}') - if (resp.command === 'print') { - console.log('打印结果: ', resp); - // 请求回调 - return pushWaybillPrintSuccess({shopId: this.queryParams.shopId, ids: this.ids}) - // obj.msgError("打印结果！"+JSON.stringify(resp)); - } - }; - - - // 当发生错误时触发 - ws.onerror = function (error) { - obj.msgError("打印失败！"); - console.error('WebSocket error:', error); - // alert('WebSocket error occurred. Check the console for more details.'); - }; + this.$modal.msgError("开源版本未实现电子面单相关功能！请自行对接发货"); } }); },