From f697d2bba8cd93072f491ab9123e399e5c9a407d Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 26 Oct 2023 18:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=BF=E5=88=A9=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/convenienceStore/ljgoods.js       | 16 +++++++++++
 .../src/views/convenienceStore/goodsFile.vue  | 28 +++++++++++++++++--
 .../controller/LJGoodsController.java         | 10 +++++++
 .../service/LJGoodsService.java               |  6 ++++
 .../service/impl/LJGoodsServiceImpl.java      | 12 ++++++++
 5 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/fuintAdmin/src/api/convenienceStore/ljgoods.js b/fuintAdmin/src/api/convenienceStore/ljgoods.js
index 35aab95a0..728199156 100644
--- a/fuintAdmin/src/api/convenienceStore/ljgoods.js
+++ b/fuintAdmin/src/api/convenienceStore/ljgoods.js
@@ -17,6 +17,22 @@ export function getLJGoods(id) {
   })
 }
 
+// 生成13位二维码
+export function createGoodsNo() {
+  return request({
+    url: '/business/convenience/goods/createGoodsNo',
+    method: 'get'
+  })
+}
+
+// 对接扫码枪
+export function scanCode(goodNo) {
+  return request({
+    url: '/business/convenience/goods/scanCode' ,
+    method: 'get'
+  })
+}
+
 // 新增商品
 export function addLJGoods(data) {
   return request({
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index 1a4e1531a..8f8319ea2 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -155,11 +155,13 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="商品条码" prop="goodsNo">
-              <el-input v-model="form.goodsNo" placeholder="商品的条码信息">
+              <el-input v-model="form.goodsNo"
+                        @keydown.enter.native="getGoods(form)"
+                        placeholder="商品的条码信息">
                 <el-button slot="append">查询</el-button>
               </el-input>
               <div style="text-align: right;color: grey;font-size: 12px">
-                商品无条码？您可以<span style="color: #00afff">生成条码</span>
+                商品无条码？您可以<span style="color: #00afff" @click="createGoodNo">生成条码</span>
               </div>
             </el-form-item>
           </el-col>
@@ -287,7 +289,14 @@
 
 import {selectTree} from "@/api/convenienceStore/goods";
 import {listSupplier} from "@/api/convenienceStore/supplier";
-import {addLJGoods, delLJGoods, getLJGoods, listLJGoods, updateLJGoods} from "@/api/convenienceStore/ljgoods";
+import {
+  addLJGoods,
+  createGoodsNo,
+  delLJGoods,
+  getLJGoods,
+  listLJGoods, scanCode,
+  updateLJGoods
+} from "@/api/convenienceStore/ljgoods";
 import {getSysConfig} from "@/api/staff/user/sysconfig";
 import pinyin from "js-pinyin";
 
@@ -381,6 +390,19 @@ export default {
   computed:{
   },
   methods:{
+    getGoods(form){
+      // console.log(form)
+      scanCode(form.goodsNo).then(response => {
+        console.log(response)
+      })
+    },
+    // 生成13位数字条码信息
+    createGoodNo(){
+      createGoodsNo().then(response => {
+        this.form.goodsNo = response.data
+      })
+    },
+    // 获取中文首字母拼音
     pinyin(){
       let pinyin = require("js-pinyin");
       pinyin.setOptions({ checkPolyphone: false, charCase: 1 });
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
index 16c9d22bf..4615dd1fa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/LJGoodsController.java
@@ -56,6 +56,16 @@ public class LJGoodsController extends BaseController {
         return getSuccessResult(goodNo);
     }
 
+    /**
+     * 扫码枪对接
+     * @return
+     */
+    @GetMapping("/scanCode")
+    public ResponseObject scanCode(){
+//        String result = goodsService.scanCode(goodNo);
+        return getSuccessResult(1);
+    }
+
     /**
      * 删除商品信息
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
index 69e74b4ca..3171c9064 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/LJGoodsService.java
@@ -28,6 +28,12 @@ public interface LJGoodsService {
      */
     public String createGoodNo();
 
+    /**
+     * 扫码枪对接
+     * @return
+     */
+    public String scanCode(String goodNo);
+
     /**
      * 根据id删除商品信息
      * @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
index ff1c7c847..3f7657542 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.fuint.business.convenienceSore.service.impl;
 
+import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,6 +70,17 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
         return number;
     }
 
+    /**
+     * 扫码枪对接
+     * @return
+     */
+    @Override
+    public String scanCode(String goodNo) {
+        String result = HttpUtil.get("https://www.mxnzp.com/api/barcode/goods/details?barcode="
+                +goodNo+"&app_id=oudmngsxohrpsngw&app_secret=FoKv7iOPbT9LmdZpy0kg8CW75Hcc1BJc");
+        return result;
+    }
+
     /**
      * 根据id删除商品信息
      * @param id