From b52c130256c90e03d7fa8a585b49b57422f3b317 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 31 Jan 2023 11:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E8=B4=9F=E8=B4=A3=E4=BA=BA=E9=80=89=E6=8B=A9=E4=B8=BA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QyWxOperationService.java | 1 - .../templates/pages/stockTaking/stockTaking.html | 2 +- .../dreamchaser/depository_manage/TestOther.java | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/dreamchaser/depository_manage/TestOther.java diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java index e8ea00bd..02215859 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/QyWxOperationService.java @@ -1631,7 +1631,6 @@ public class QyWxOperationService { } if (!depositoryById.getDname().contains("前置仓")) { - // 如果不是前置仓下的仓库 flag = false; } diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html index 9a91c99c..0b053491 100644 --- a/src/main/resources/templates/pages/stockTaking/stockTaking.html +++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html @@ -647,7 +647,7 @@ parent.wx.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 success: function (res) { // 回调 var result = res.resultStr;//当needResult为1时返回处理结果 diff --git a/src/test/java/com/dreamchaser/depository_manage/TestOther.java b/src/test/java/com/dreamchaser/depository_manage/TestOther.java new file mode 100644 index 00000000..b5558e33 --- /dev/null +++ b/src/test/java/com/dreamchaser/depository_manage/TestOther.java @@ -0,0 +1,15 @@ +package com.dreamchaser.depository_manage; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class TestOther { + @Test + public void Test(){ + System.out.println(Integer.compare(3, 0) == 0 ); + } +}