优化产品备案信息

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsProductServiceImpl.java

@@ -264,7 +264,7 @@ public class GoodsProductServiceImpl implements GoodsProductService {
                         }
                     }
                 }
-                GoodsProductEntity queryProduct = goodsProductDao.selectByParams(goodsProductDto.getSku(), goodsProductDto.getMerchSn(), goodsProductDto.getThirdMerchSn(),goodsProductDto.getProdBarcode());
+                GoodsProductEntity queryProduct = goodsProductDao.selectByParams(goodsProductDto.getSku(), goodsProductDto.getMerchSn(), null,goodsProductDto.getProdBarcode());
                 if (Objects.nonNull(queryProduct)) {
                     throw new RRException("该sku：" + queryProduct.getSku() + " 商品条形码："+goodsProductDto.getProdBarcode()+"已存在！");
                 }

kmall-admin/src/main/resources/mybatis/mapper/GoodsProductDao.xml

@@ -596,6 +596,7 @@
 	<insert id="saveBatch" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
 		insert into mall_goods_product(
 		`merch_sn`,
+		`third_merch_sn`,
 		`prod_barcode`,
 		`sku`,
 		`batch_no`,
@@ -630,6 +631,7 @@
 		<foreach collection="list" index="index" item="item" separator=",">
 			(
 			#{item.merchSn},
+			#{item.thirdMerchSn},
 			#{item.prodBarcode},
 			#{item.sku},
 			#{item.batchNo},

kmall-admin/src/main/webapp/js/sale/sale.js

@@ -1301,11 +1301,11 @@ function openWebSocket() {
         //无法使用wss，浏览器打开WebSocket时报错
         //ws对应http、wss对应https。
         //kmall测试环境
-        // webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
+        webSocket = new WebSocket("ws://183.62.225.124:8080/ws/server/"+storeId);
         //kmall正式环境
         // webSocket = new WebSocket("ws://8.135.102.238:8080/ws/server/"+storeId);
         //kmall本地环境
-        webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
+        // webSocket = new WebSocket("ws://127.0.0.1:50/ws/server/"+163);
         // webSocket = new WebSocket("wss://cb.k1net.cn/ws/server/"+storeId);
         if (webSocket.readyState === webSocket.CONNECTING) {
             console.log('1.连接正在打开......');