From 43814f1deae732639ae9d99071d7139536cfbac3 Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Tue, 17 Jan 2023 16:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MaterialController.java        | 16 ++--
 .../controller/PageController.java            | 13 +++
 .../depository_manage/mapper/GroupMapper.java |  4 +
 .../mapper/MaterialMapper.xml                 | 26 ++++--
 .../mapper/QrCodeMapper.java                  |  8 ++
 .../depository_manage/mapper/QrCodeMapper.xml | 30 +++++--
 .../service/impl/MaterialServiceImpl.java     |  1 +
 .../static/js/JcPrinter/index_Demo.js         | 82 ++++++++++++++-----
 .../js/application-out/application-out.js     |  2 +
 .../pages/application/application-in.html     |  7 +-
 .../pages/application/application-out.html    |  2 +
 .../application/application-transfer.html     |  2 +
 .../templates/pages/group/group-add_back.html |  2 +
 .../templates/pages/split/split_add.html      |  2 +
 .../templates/pages/split/split_edit.html     |  2 +
 .../pages/stockTaking/stockTaking.html        |  3 +
 .../mapper/MaterialMapper.xml                 | 26 ++++--
 .../depository_manage/mapper/QrCodeMapper.xml | 30 +++++--
 .../classes/static/js/JcPrinter/index_Demo.js | 82 ++++++++++++++-----
 .../js/application-out/application-out.js     |  2 +
 .../pages/application/application-in.html     |  7 +-
 .../pages/application/application-out.html    |  2 +
 .../application/application-transfer.html     |  2 +
 .../templates/pages/group/group-add_back.html |  2 +
 .../templates/pages/split/split_add.html      |  2 +
 .../templates/pages/split/split_edit.html     |  2 +
 .../pages/stockTaking/stockTaking.html        |  3 +
 27 files changed, 278 insertions(+), 84 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
index ea7577fd..328244ea 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
@@ -764,8 +764,9 @@ public class MaterialController {
         UserByPort userByPort = (UserByPort) request.getAttribute("userToken");
         // 获取当前用户所在部门拥有的仓库
         List<Depository> depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userByPort.getMaindeparment().toString());
-        // 获取当前扫描的二维码
+        // 获取当前扫描的码值
         String qrCode = (String) map.get("qrCode");
+        int codeFlag =  ObjectFormatUtil.toInteger(map.get("codeFlag"));
         // 根据扫描的二维码获取对应的物料编码
         String mcode = materialService.findMaterialCodeByQrCode(qrCode);
         // 根据物料编码获取物料
@@ -774,11 +775,11 @@ public class MaterialController {
             Map<String, Object> param = new HashMap<>();
             List<PlaceP> placePList = new ArrayList<>();
             param.put("mcode", mcode);
+            param.put("codeFlag",1);
             InventoryP ip = null;
             // 获取物料与条形码的对应关系
             List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
-            for (int j = 0; j < depositoryByAdminorg.size(); j++) {
-                Depository depository = depositoryByAdminorg.get(j);
+            for (Depository depository : depositoryByAdminorg) {
                 param.put("mcode", material.getCode());
                 param.put("depositoryId", depository.getId());
                 // 获取当前仓库下是否有当前物料的库存
@@ -805,7 +806,8 @@ public class MaterialController {
                 mp.setSplitInfoList(splitInfoByMid);
                 return new RestResponse(mp);
             }
-        }else{
+        }
+        else{
             return new RestResponse(null);
         }
 
@@ -1085,6 +1087,7 @@ public class MaterialController {
     public RestResponse qywxApplicationInScanBarCode(@RequestBody Map<String, Object> map, HttpServletRequest request) {
         UserByPort userToken = (UserByPort) request.getAttribute("userToken");
         String qrCode = (String) map.get("qrCode");
+        int codeFlag = ObjectFormatUtil.toInteger(map.get("codeFlag"));
         Map<String, Object> result = new HashMap<>();
         List<Object> materialList = new ArrayList<>();
         // 获取当前用户所在部门拥有的仓库
@@ -1092,9 +1095,10 @@ public class MaterialController {
         Map<String, Object> param = new HashMap<>();
         // 获取条形码与物料的映射
         MaterialAndBarCode materialByBarCode = null;
-        for (int j = 0; j < depositoryByAdminorg.size(); j++) {
-            param.put("depositoryId", depositoryByAdminorg.get(j).getId());
+        for (Depository depository : depositoryByAdminorg) {
+            param.put("depositoryId", depository.getId());
             param.put("barCode", qrCode);
+            param.put("codeFlag", codeFlag);
             // 通过仓库与条形码获取对应关系
             materialByBarCode = materialService.findMaterialByBarCodeByBarCodeAndDepositoryId(param);
             if (materialByBarCode != null) {
diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
index 1e3cf14b..2f8c7982 100644
--- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
+++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
@@ -1559,6 +1559,19 @@ public class PageController {
         return mv;
     }
 
+    @GetMapping("applicationInForGroup")
+    public ModelAndView applicationInForGroup(Integer gid,String type){
+        ModelAndView mv = new ModelAndView();
+        List<Integer> gidList = new ArrayList<>();
+        if ("one".equals(type)) {
+            gidList.add(gid);
+        } else if ("more".equals(type)) {
+        }
+        mv.addObject("gidList", gidList);
+        mv.setViewName("pages/group/applicationInForGroup");
+        return mv;
+    }
+
 
     @GetMapping("/StockTakingReview")
     public ModelAndView StockTakingReview(Integer id, HttpServletRequest request) {
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java
index 4532b628..3cbc5820 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/GroupMapper.java
@@ -64,6 +64,10 @@ public interface GroupMapper {
      */
     List<GroupInfo> findGroupByCondition(Map<String,Object> map);
 
+
+
+
+
     /**
      * 根据组合id批量获取组合信息(不包含其他数据)
      * @param list 组合id列表
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index b149d0f5..da3c7426 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -557,6 +557,9 @@
         <if test="remark != '' and remark != null">
             and remark LIKE CONCAT('%', #{remark}, '%')
         </if>
+        <if test="codeFlag != '' and codeFlag != null">
+            and codeFlag = #{codeFlag}
+        </if>
         group by bmcode
     </select>
 
@@ -569,12 +572,13 @@
         <if test="mcode != null and mcode != ''">
             and mcode = #{mcode}
         </if>
+        and codeFlag = 2
         group by mcode
     </select>
 
     <select id="findMaterialByBarCodeCountByCondition" resultType="int" parameterType="map">
         select count(*)
-        from barcodeandmaterial
+        from qrcodeandmaterial
         where 1 = 1
         <if test="barCode != null and barCode != ''">
             and barCode = #{barCode}
@@ -582,6 +586,7 @@
         <if test="mcode != null and mcode != ''">
             and mcode = #{mcode}
         </if>
+        and flag = 1
     </select>
 
 
@@ -674,7 +679,7 @@
         </foreach>
     </select>
 
-    
+
     <!-- 插入数据 -->
     <insert id="insertMaterial"  useGeneratedKeys="true" keyProperty="id">
         INSERT INTO material (
@@ -754,26 +759,28 @@
     </insert>
 
     <insert id="addBarCodeAndMcode" parameterType="map">
-        insert into barcodeandmaterial(id,barCode,mcode)
+        insert into qrcodeandmaterial(id,barCode,mcode,flag)
         values (
         #{id},
         #{barCode},
-        #{code}
+        #{code},
+        1
         )
     </insert>
 
 
     <insert id="addBarCodeAndMaterialForMoreOne" parameterType="map">
-        insert into barcodeandmaterial(id,mcode,barCode)
+        insert into qrcodeandmaterial(id,mcode,barCode,1)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{id},
             #{code},
-            #{item})
+            #{item},
+            1)
         </foreach>
     </insert>
 
-    
+
 <!--     批量插入数据-->
         <insert id="insertMaterials" parameterType="list">
         INSERT INTO material (
@@ -800,7 +807,7 @@
 <!--    删除映射-->
     <delete id="deleteBarCodeAndMaterial" parameterType="map">
         delete
-        from barcodeandmaterial
+        from qrcodeandmaterial
         where 1 = 1
         <if test="barCode != null and barCode != ''">
             and barCode = #{barCode}
@@ -811,10 +818,13 @@
         <if test="id != null and id != ''">
             and id = #{id}
         </if>
+        and flag = 1
 
     </delete>
 
 
+
+
     <update id="updateMaterialAndProducedDate">
         update materialandproduceddate
         <set>
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java
index 1c407fb5..124db19c 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.java
@@ -71,4 +71,12 @@ public interface QrCodeMapper {
      * @return
      */
     List<PidOrDidAndCode> findLocationByCondition(Map<String,Object> map);
+
+
+    /**
+     * 用于修改当前编码类型
+     * @param map 待修改数据
+     * @return
+     */
+    Integer updateQrCodeType(Map<String,Object> map);
 }
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
index c9b7a423..ab0748e2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
@@ -47,36 +47,39 @@
     </select>
 
     <insert id="addQrCodeAndMaterial" parameterType="map">
-        insert into qrcodeandmaterial(id,qrcode,mcode)
+        insert into qrcodeandmaterial(id,barCode,mcode,flag)
         values (
         #{id},
         #{qrCode},
-        #{mcode}
+        #{mcode},
+        2
         )
     </insert>
 
 
     <insert id="addQrCodeAndMaterialForMoreOne" parameterType="map">
-        insert into qrcodeandmaterial(id,mcode,qrcode)
+        insert into qrcodeandmaterial(id,mcode,barCode,flag)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{id},
             #{code},
-            #{item})
+            #{item},
+            2
+            )
         </foreach>
     </insert>
 
     <select id="selectQrCodeByMcode" parameterType="string" resultType="string">
-        select qrcode
+        select barCode
         from qrcodeandmaterial
-        where mcode = #{mcode}
+        where mcode = #{mcode} and flag = 2
     </select>
 
 
     <select id="findMaterialCodeByQrCode" parameterType="string" resultType="string">
         select mcode
         from qrcodeandmaterial
-        where qrcode = #{qrcode}
+        where barCode = #{qrcode} and flag = 2
     </select>
 
 
@@ -94,10 +97,23 @@
         <if test="id != null and id != ''">
             and id = #{id}
         </if>
+        <if test="codeFlag != null and codeFlag != ''">
+            and flag = #{codeFlag}
+        </if>
 
     </delete>
 
 
+    <update id="updateQrCodeType">
+        update qrcodeandmaterial
+        <set>
+            <if test="codeFlag != null and codeFlag != ''">
+                flag = #{codeFlag}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
     <select id="selectQrCodeByDepositoryOrPlace" parameterType="map" resultType="string">
         select code
         from pidordidandcode
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
index 7b1e311c..c6b113e7 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
@@ -962,6 +962,7 @@ public class MaterialServiceImpl implements MaterialService {
     public MaterialAndBarCode findMaterialByBarCode(String barCode) {
         Map<String, Object> map = new HashMap<>();
         map.put("barCode", barCode);
+        map.put("codeFlag",1);
         List<MaterialAndBarCode> materialByBarCodeByCondition = materialMapper.findMaterialByBarCodeByCondition(map);
         if (materialByBarCodeByCondition.size() > 0) {
             return materialByBarCodeByCondition.get(0);
diff --git a/src/main/resources/static/js/JcPrinter/index_Demo.js b/src/main/resources/static/js/JcPrinter/index_Demo.js
index 83b5e08f..60d71ab0 100644
--- a/src/main/resources/static/js/JcPrinter/index_Demo.js
+++ b/src/main/resources/static/js/JcPrinter/index_Demo.js
@@ -387,6 +387,9 @@ var app = new Vue({
         DrawLableBarCodeApiDemo(drawLableBarCodeParamDemo, callableFunction) {
             DrawLableBarCode(drawLableBarCodeParamDemo, callableFunction)
         },
+        DrawLableQrCodeApiDemo(drawLableQrCodeParamDemo,callableFunction){
+            DrawLableQrCode(drawLableQrCodeParamDemo,callableFunction)
+        },
 
         /**
          * 开始打印任务
@@ -434,27 +437,53 @@ var app = new Vue({
             }
 
             // 为了防止打印时未生成对应图像
+
+
             // 初始化画板
             InitDrawingBoard(this.InitDrawingBoardParam, (data1 => {
-                // 添加文字
-                this.DrawLableBarCodeApiDemo(this.DrawLableBarCodeParam, (data => {
-                    // 提交数据
-                    var totalCount = parseInt(pageCount) * parseInt(quantityCount);
+
+
+                if(this.dialogDrawLableBarCodeParam){
+
+                    this.DrawLableBarCodeApiDemo(this.DrawLableBarCodeParam, (data => {
+                        // 提交数据
+                        var totalCount = parseInt(pageCount) * parseInt(quantityCount);
                         startJob(parseInt(density), parseInt(paperType), parseInt(printMode), totalCount, function (data) {
-                        bCanclePrint = false;
-                        var arrParse = JSON.parse(JSON.stringify(data));
-                        if (arrParse.resultAck.result !== 0) {
-                            self.$message({
-                                message: '打印失败！',
-                                type: 'warning'
-                            });
-                            return;
-                        }
-                        var intPageCount = parseInt(pageCount);
-                        var intQuantityCount = parseInt(quantityCount);
-                        self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
-                    });
-                }))
+                            bCanclePrint = false;
+                            var arrParse = JSON.parse(JSON.stringify(data));
+                            if (arrParse.resultAck.result !== 0) {
+                                self.$message({
+                                    message: '打印失败！',
+                                    type: 'warning'
+                                });
+                                return;
+                            }
+                            var intPageCount = parseInt(pageCount);
+                            var intQuantityCount = parseInt(quantityCount);
+                            self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
+                        });
+                    }))
+                }else{
+                    this.DrawLableQrCodeApiDemo(this.DrawLableBarCodeParam, (data => {
+                        // 提交数据
+                        var totalCount = parseInt(pageCount) * parseInt(quantityCount);
+                        startJob(parseInt(density), parseInt(paperType), parseInt(printMode), totalCount, function (data) {
+                            bCanclePrint = false;
+                            var arrParse = JSON.parse(JSON.stringify(data));
+                            if (arrParse.resultAck.result !== 0) {
+                                self.$message({
+                                    message: '打印失败！',
+                                    type: 'warning'
+                                });
+                                return;
+                            }
+                            var intPageCount = parseInt(pageCount);
+                            var intQuantityCount = parseInt(quantityCount);
+                            self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
+                        });
+                    }))
+                }
+
             }))
 
 
@@ -506,10 +535,19 @@ var app = new Vue({
                     setTimeout(function () {
                         // 初始化画板
                         InitDrawingBoard(self.InitDrawingBoardParam, (data1 => {
-                            // 添加文字
-                            self.DrawLableBarCodeApiDemo(self.DrawLableBarCodeParam, (data => {
-                                self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
-                            }))
+
+                            if(this.dialogDrawLableBarCodeParam){
+                                // 添加文字
+                                self.DrawLableBarCodeApiDemo(self.DrawLableBarCodeParam, (data => {
+                                    self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
+                                }))
+                            }else{
+                                // 添加文字
+                                self.DrawLableQrCodeApiDemo(self.DrawLableQrCodeParam, (data => {
+                                    self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
+                                }))
+                            }
+
 
                         }))// 提交数据
                     }, 500);
diff --git a/src/main/resources/static/js/application-out/application-out.js b/src/main/resources/static/js/application-out/application-out.js
index 1b0189fa..8149a15e 100644
--- a/src/main/resources/static/js/application-out/application-out.js
+++ b/src/main/resources/static/js/application-out/application-out.js
@@ -866,6 +866,7 @@ layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
                 var result = res.resultStr;//当needResult为1时返回处理结果
                 var req = {};
                 req.qrCode = result;
+                req.codeFlag = 1;
                 $.ajax({
                     url: "/material/qywxApplicationOutScanBarCode",
                     type: "post",
@@ -924,6 +925,7 @@ layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
                 var result = res.resultStr;//当needResult为1时返回处理结果
                 var req = {};
                 req.qrCode = result;
+                req.codeFlag = 2;
                 $.ajax({
                     url: "/material/qywxApplicationOutScanQrCode",
                     type: "post",
diff --git a/src/main/resources/templates/pages/application/application-in.html b/src/main/resources/templates/pages/application/application-in.html
index 3a1a5ed3..4fbfd2c8 100644
--- a/src/main/resources/templates/pages/application/application-in.html
+++ b/src/main/resources/templates/pages/application/application-in.html
@@ -951,16 +951,16 @@
         };
         // 用于扫码入库
         scanCodeInStorage = function (obj) {
-            var objIdNumber = obj.id.split("qrCodeImg")[1];
             parent.wx.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                scanType: ["qrCode,barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
                 success: function (res) {
                     // 回调
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $("#qrCode" + objIdNumber).val(result);
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
@@ -1052,6 +1052,8 @@
                 }
             })
         };
+
+
         // 用于扫描条形码
         scanBarCode = function (obj) {
             parent.wx.scanQRCode({
@@ -1063,6 +1065,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
diff --git a/src/main/resources/templates/pages/application/application-out.html b/src/main/resources/templates/pages/application/application-out.html
index 9b50812b..e567a1b7 100644
--- a/src/main/resources/templates/pages/application/application-out.html
+++ b/src/main/resources/templates/pages/application/application-out.html
@@ -1263,6 +1263,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationOutScanBarCode",
                         type: "post",
@@ -1330,6 +1331,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationOutScanQrCode",
                         type: "post",
diff --git a/src/main/resources/templates/pages/application/application-transfer.html b/src/main/resources/templates/pages/application/application-transfer.html
index 17f9a178..ff666880 100644
--- a/src/main/resources/templates/pages/application/application-transfer.html
+++ b/src/main/resources/templates/pages/application/application-transfer.html
@@ -416,6 +416,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationTransferScanBarCode",
                         type: "post",
@@ -507,6 +508,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationTransferScanQrCode",
                         type: "post",
diff --git a/src/main/resources/templates/pages/group/group-add_back.html b/src/main/resources/templates/pages/group/group-add_back.html
index f7770d2d..56bad03f 100644
--- a/src/main/resources/templates/pages/group/group-add_back.html
+++ b/src/main/resources/templates/pages/group/group-add_back.html
@@ -394,6 +394,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
@@ -461,6 +462,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
                         type: "post",
diff --git a/src/main/resources/templates/pages/split/split_add.html b/src/main/resources/templates/pages/split/split_add.html
index 30e5fce4..d466d168 100644
--- a/src/main/resources/templates/pages/split/split_add.html
+++ b/src/main/resources/templates/pages/split/split_add.html
@@ -366,6 +366,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
                         type: "post",
@@ -440,6 +441,7 @@
                      var result = res.resultStr;//当needResult为1时返回处理结果
                      var req = {};
                      req.qrCode = result;
+                     req.codeFlag = 1;
                      let barCode =  $("#barCode");
                      barCode.empty();
                      barCode.append(new Option(result, result));
diff --git a/src/main/resources/templates/pages/split/split_edit.html b/src/main/resources/templates/pages/split/split_edit.html
index f4617d12..f068c7c6 100644
--- a/src/main/resources/templates/pages/split/split_edit.html
+++ b/src/main/resources/templates/pages/split/split_edit.html
@@ -338,6 +338,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $("#qrCode" + objIdNumber).val(result);
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
@@ -364,6 +365,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
diff --git a/src/main/resources/templates/pages/stockTaking/stockTaking.html b/src/main/resources/templates/pages/stockTaking/stockTaking.html
index c87c42d8..cc3f13e9 100644
--- a/src/main/resources/templates/pages/stockTaking/stockTaking.html
+++ b/src/main/resources/templates/pages/stockTaking/stockTaking.html
@@ -613,6 +613,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/place/qywxApplicationInScanQrCode",
                         type: "post",
@@ -1201,6 +1202,7 @@
                         req.qrCode = result;
                         req.placeId = placeId;
                         req.depositoryId = depositoryId;
+                        req.codeFlag = 2;
                         $.ajax({
                             url: "/material/qywxStockTakingScanQrCode",
                             type: "post",
@@ -1322,6 +1324,7 @@
                         req.qrCode = result;
                         req.depositoryId = depositoryId;
                         req.placeId = placeId;
+                        req.codeFlag = 1;
                         $.ajax({
                             url: "/material/qywxStockTakingScanBarCode",
                             type: "post",
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
index b149d0f5..da3c7426 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml
@@ -557,6 +557,9 @@
         <if test="remark != '' and remark != null">
             and remark LIKE CONCAT('%', #{remark}, '%')
         </if>
+        <if test="codeFlag != '' and codeFlag != null">
+            and codeFlag = #{codeFlag}
+        </if>
         group by bmcode
     </select>
 
@@ -569,12 +572,13 @@
         <if test="mcode != null and mcode != ''">
             and mcode = #{mcode}
         </if>
+        and codeFlag = 2
         group by mcode
     </select>
 
     <select id="findMaterialByBarCodeCountByCondition" resultType="int" parameterType="map">
         select count(*)
-        from barcodeandmaterial
+        from qrcodeandmaterial
         where 1 = 1
         <if test="barCode != null and barCode != ''">
             and barCode = #{barCode}
@@ -582,6 +586,7 @@
         <if test="mcode != null and mcode != ''">
             and mcode = #{mcode}
         </if>
+        and flag = 1
     </select>
 
 
@@ -674,7 +679,7 @@
         </foreach>
     </select>
 
-    
+
     <!-- 插入数据 -->
     <insert id="insertMaterial"  useGeneratedKeys="true" keyProperty="id">
         INSERT INTO material (
@@ -754,26 +759,28 @@
     </insert>
 
     <insert id="addBarCodeAndMcode" parameterType="map">
-        insert into barcodeandmaterial(id,barCode,mcode)
+        insert into qrcodeandmaterial(id,barCode,mcode,flag)
         values (
         #{id},
         #{barCode},
-        #{code}
+        #{code},
+        1
         )
     </insert>
 
 
     <insert id="addBarCodeAndMaterialForMoreOne" parameterType="map">
-        insert into barcodeandmaterial(id,mcode,barCode)
+        insert into qrcodeandmaterial(id,mcode,barCode,1)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{id},
             #{code},
-            #{item})
+            #{item},
+            1)
         </foreach>
     </insert>
 
-    
+
 <!--     批量插入数据-->
         <insert id="insertMaterials" parameterType="list">
         INSERT INTO material (
@@ -800,7 +807,7 @@
 <!--    删除映射-->
     <delete id="deleteBarCodeAndMaterial" parameterType="map">
         delete
-        from barcodeandmaterial
+        from qrcodeandmaterial
         where 1 = 1
         <if test="barCode != null and barCode != ''">
             and barCode = #{barCode}
@@ -811,10 +818,13 @@
         <if test="id != null and id != ''">
             and id = #{id}
         </if>
+        and flag = 1
 
     </delete>
 
 
+
+
     <update id="updateMaterialAndProducedDate">
         update materialandproduceddate
         <set>
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
index c9b7a423..ab0748e2 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/QrCodeMapper.xml
@@ -47,36 +47,39 @@
     </select>
 
     <insert id="addQrCodeAndMaterial" parameterType="map">
-        insert into qrcodeandmaterial(id,qrcode,mcode)
+        insert into qrcodeandmaterial(id,barCode,mcode,flag)
         values (
         #{id},
         #{qrCode},
-        #{mcode}
+        #{mcode},
+        2
         )
     </insert>
 
 
     <insert id="addQrCodeAndMaterialForMoreOne" parameterType="map">
-        insert into qrcodeandmaterial(id,mcode,qrcode)
+        insert into qrcodeandmaterial(id,mcode,barCode,flag)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{id},
             #{code},
-            #{item})
+            #{item},
+            2
+            )
         </foreach>
     </insert>
 
     <select id="selectQrCodeByMcode" parameterType="string" resultType="string">
-        select qrcode
+        select barCode
         from qrcodeandmaterial
-        where mcode = #{mcode}
+        where mcode = #{mcode} and flag = 2
     </select>
 
 
     <select id="findMaterialCodeByQrCode" parameterType="string" resultType="string">
         select mcode
         from qrcodeandmaterial
-        where qrcode = #{qrcode}
+        where barCode = #{qrcode} and flag = 2
     </select>
 
 
@@ -94,10 +97,23 @@
         <if test="id != null and id != ''">
             and id = #{id}
         </if>
+        <if test="codeFlag != null and codeFlag != ''">
+            and flag = #{codeFlag}
+        </if>
 
     </delete>
 
 
+    <update id="updateQrCodeType">
+        update qrcodeandmaterial
+        <set>
+            <if test="codeFlag != null and codeFlag != ''">
+                flag = #{codeFlag}
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
     <select id="selectQrCodeByDepositoryOrPlace" parameterType="map" resultType="string">
         select code
         from pidordidandcode
diff --git a/target/classes/static/js/JcPrinter/index_Demo.js b/target/classes/static/js/JcPrinter/index_Demo.js
index 83b5e08f..60d71ab0 100644
--- a/target/classes/static/js/JcPrinter/index_Demo.js
+++ b/target/classes/static/js/JcPrinter/index_Demo.js
@@ -387,6 +387,9 @@ var app = new Vue({
         DrawLableBarCodeApiDemo(drawLableBarCodeParamDemo, callableFunction) {
             DrawLableBarCode(drawLableBarCodeParamDemo, callableFunction)
         },
+        DrawLableQrCodeApiDemo(drawLableQrCodeParamDemo,callableFunction){
+            DrawLableQrCode(drawLableQrCodeParamDemo,callableFunction)
+        },
 
         /**
          * 开始打印任务
@@ -434,27 +437,53 @@ var app = new Vue({
             }
 
             // 为了防止打印时未生成对应图像
+
+
             // 初始化画板
             InitDrawingBoard(this.InitDrawingBoardParam, (data1 => {
-                // 添加文字
-                this.DrawLableBarCodeApiDemo(this.DrawLableBarCodeParam, (data => {
-                    // 提交数据
-                    var totalCount = parseInt(pageCount) * parseInt(quantityCount);
+
+
+                if(this.dialogDrawLableBarCodeParam){
+
+                    this.DrawLableBarCodeApiDemo(this.DrawLableBarCodeParam, (data => {
+                        // 提交数据
+                        var totalCount = parseInt(pageCount) * parseInt(quantityCount);
                         startJob(parseInt(density), parseInt(paperType), parseInt(printMode), totalCount, function (data) {
-                        bCanclePrint = false;
-                        var arrParse = JSON.parse(JSON.stringify(data));
-                        if (arrParse.resultAck.result !== 0) {
-                            self.$message({
-                                message: '打印失败！',
-                                type: 'warning'
-                            });
-                            return;
-                        }
-                        var intPageCount = parseInt(pageCount);
-                        var intQuantityCount = parseInt(quantityCount);
-                        self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
-                    });
-                }))
+                            bCanclePrint = false;
+                            var arrParse = JSON.parse(JSON.stringify(data));
+                            if (arrParse.resultAck.result !== 0) {
+                                self.$message({
+                                    message: '打印失败！',
+                                    type: 'warning'
+                                });
+                                return;
+                            }
+                            var intPageCount = parseInt(pageCount);
+                            var intQuantityCount = parseInt(quantityCount);
+                            self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
+                        });
+                    }))
+                }else{
+                    this.DrawLableQrCodeApiDemo(this.DrawLableBarCodeParam, (data => {
+                        // 提交数据
+                        var totalCount = parseInt(pageCount) * parseInt(quantityCount);
+                        startJob(parseInt(density), parseInt(paperType), parseInt(printMode), totalCount, function (data) {
+                            bCanclePrint = false;
+                            var arrParse = JSON.parse(JSON.stringify(data));
+                            if (arrParse.resultAck.result !== 0) {
+                                self.$message({
+                                    message: '打印失败！',
+                                    type: 'warning'
+                                });
+                                return;
+                            }
+                            var intPageCount = parseInt(pageCount);
+                            var intQuantityCount = parseInt(quantityCount);
+                            self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, intPageCount, intQuantityCount);
+                        });
+                    }))
+                }
+
             }))
 
 
@@ -506,10 +535,19 @@ var app = new Vue({
                     setTimeout(function () {
                         // 初始化画板
                         InitDrawingBoard(self.InitDrawingBoardParam, (data1 => {
-                            // 添加文字
-                            self.DrawLableBarCodeApiDemo(self.DrawLableBarCodeParam, (data => {
-                                self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
-                            }))
+
+                            if(this.dialogDrawLableBarCodeParam){
+                                // 添加文字
+                                self.DrawLableBarCodeApiDemo(self.DrawLableBarCodeParam, (data => {
+                                    self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
+                                }))
+                            }else{
+                                // 添加文字
+                                self.DrawLableQrCodeApiDemo(self.DrawLableQrCodeParam, (data => {
+                                    self.sendCommitJob(self.DrawLableTextParamDemo, pageIndex, pageCount, quantityCount);
+                                }))
+                            }
+
 
                         }))// 提交数据
                     }, 500);
diff --git a/target/classes/static/js/application-out/application-out.js b/target/classes/static/js/application-out/application-out.js
index 1b0189fa..8149a15e 100644
--- a/target/classes/static/js/application-out/application-out.js
+++ b/target/classes/static/js/application-out/application-out.js
@@ -866,6 +866,7 @@ layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
                 var result = res.resultStr;//当needResult为1时返回处理结果
                 var req = {};
                 req.qrCode = result;
+                req.codeFlag = 1;
                 $.ajax({
                     url: "/material/qywxApplicationOutScanBarCode",
                     type: "post",
@@ -924,6 +925,7 @@ layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
                 var result = res.resultStr;//当needResult为1时返回处理结果
                 var req = {};
                 req.qrCode = result;
+                req.codeFlag = 2;
                 $.ajax({
                     url: "/material/qywxApplicationOutScanQrCode",
                     type: "post",
diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html
index 3a1a5ed3..4fbfd2c8 100644
--- a/target/classes/templates/pages/application/application-in.html
+++ b/target/classes/templates/pages/application/application-in.html
@@ -951,16 +951,16 @@
         };
         // 用于扫码入库
         scanCodeInStorage = function (obj) {
-            var objIdNumber = obj.id.split("qrCodeImg")[1];
             parent.wx.scanQRCode({
                 desc: 'scanQRCode desc',
                 needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-                scanType: ["qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+                scanType: ["qrCode,barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
                 success: function (res) {
                     // 回调
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $("#qrCode" + objIdNumber).val(result);
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
@@ -1052,6 +1052,8 @@
                 }
             })
         };
+
+
         // 用于扫描条形码
         scanBarCode = function (obj) {
             parent.wx.scanQRCode({
@@ -1063,6 +1065,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
diff --git a/target/classes/templates/pages/application/application-out.html b/target/classes/templates/pages/application/application-out.html
index 9b50812b..e567a1b7 100644
--- a/target/classes/templates/pages/application/application-out.html
+++ b/target/classes/templates/pages/application/application-out.html
@@ -1263,6 +1263,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationOutScanBarCode",
                         type: "post",
@@ -1330,6 +1331,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationOutScanQrCode",
                         type: "post",
diff --git a/target/classes/templates/pages/application/application-transfer.html b/target/classes/templates/pages/application/application-transfer.html
index 17f9a178..ff666880 100644
--- a/target/classes/templates/pages/application/application-transfer.html
+++ b/target/classes/templates/pages/application/application-transfer.html
@@ -416,6 +416,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationTransferScanBarCode",
                         type: "post",
@@ -507,6 +508,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationTransferScanQrCode",
                         type: "post",
diff --git a/target/classes/templates/pages/group/group-add_back.html b/target/classes/templates/pages/group/group-add_back.html
index f7770d2d..56bad03f 100644
--- a/target/classes/templates/pages/group/group-add_back.html
+++ b/target/classes/templates/pages/group/group-add_back.html
@@ -394,6 +394,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
@@ -461,6 +462,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
                         type: "post",
diff --git a/target/classes/templates/pages/split/split_add.html b/target/classes/templates/pages/split/split_add.html
index 30e5fce4..d466d168 100644
--- a/target/classes/templates/pages/split/split_add.html
+++ b/target/classes/templates/pages/split/split_add.html
@@ -366,6 +366,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
                         type: "post",
@@ -440,6 +441,7 @@
                      var result = res.resultStr;//当needResult为1时返回处理结果
                      var req = {};
                      req.qrCode = result;
+                     req.codeFlag = 1;
                      let barCode =  $("#barCode");
                      barCode.empty();
                      barCode.append(new Option(result, result));
diff --git a/target/classes/templates/pages/split/split_edit.html b/target/classes/templates/pages/split/split_edit.html
index f4617d12..f068c7c6 100644
--- a/target/classes/templates/pages/split/split_edit.html
+++ b/target/classes/templates/pages/split/split_edit.html
@@ -338,6 +338,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $("#qrCode" + objIdNumber).val(result);
                     $.ajax({
                         url: "/material/qywxApplicationInScanQrCode",
@@ -364,6 +365,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 1;
                     $.ajax({
                         url: "/material/qywxApplicationInScanBarCode",
                         type: "post",
diff --git a/target/classes/templates/pages/stockTaking/stockTaking.html b/target/classes/templates/pages/stockTaking/stockTaking.html
index c87c42d8..cc3f13e9 100644
--- a/target/classes/templates/pages/stockTaking/stockTaking.html
+++ b/target/classes/templates/pages/stockTaking/stockTaking.html
@@ -613,6 +613,7 @@
                     var result = res.resultStr;//当needResult为1时返回处理结果
                     var req = {};
                     req.qrCode = result;
+                    req.codeFlag = 2;
                     $.ajax({
                         url: "/place/qywxApplicationInScanQrCode",
                         type: "post",
@@ -1201,6 +1202,7 @@
                         req.qrCode = result;
                         req.placeId = placeId;
                         req.depositoryId = depositoryId;
+                        req.codeFlag = 2;
                         $.ajax({
                             url: "/material/qywxStockTakingScanQrCode",
                             type: "post",
@@ -1322,6 +1324,7 @@
                         req.qrCode = result;
                         req.depositoryId = depositoryId;
                         req.placeId = placeId;
+                        req.codeFlag = 1;
                         $.ajax({
                             url: "/material/qywxStockTakingScanBarCode",
                             type: "post",