合并出库审批时的相同仓库名称

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -2903,6 +2903,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     QyWxMessageMap.put("responseCode", jsonObject.getString("response_code"));
                     // key user:300450:QyWxOut:1
                     // 部门负责人number
+
                     redisPool.getRedisTemplateByDb(15).opsForHash().putAll("user:" + userToken.getNumber() + ":QyWxOutId:" + id, QyWxMessageMap);
                     // 设置过期时间为三天
                     redisPool.getRedisTemplateByDb(15).expire("user:" + userToken.getNumber() + ":QyWxOutId:" + id, 72, TimeUnit.HOURS);
@@ -2925,6 +2926,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 String key = "user:" + applicantUser.getNumber() + ":QyWxOutId:" + id;
                 String responseCode = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "responseCode");
                 qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), finalResult, userAgent);
+                redisPool.getRedisTemplateByDb(15).delete(key);
             });
 
             // 开启流程通知其他人忽略审批流程
@@ -3182,6 +3184,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 String key = "user:" + departHead.getNumber() + ":QyWxOutId:" + id;
                 String responseCode = (String) redisPool.getRedisTemplateByDb(15).opsForHash().get(key, "responseCode");
                 qyWxOperationService.updateButtonTemplateCardToUnEnable(responseCode, userToken.getName(), finalResult, userAgent);
+                redisPool.getRedisTemplateByDb(15).delete(key);
             });
         }
         map.put("id", id);
@@ -3379,9 +3382,10 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 QyWxMessageMap.put("MsgId", jsonObject.getString("msgid"));
                 QyWxMessageMap.put("responseCode", jsonObject.getString("response_code"));
                 // key user:300450:QyWxOut:1
-                redisPool.getRedisTemplateByDb(15).opsForHash().putAll("user:" + userByPort.getNumber() + ":QyWxOutId:" + outId, QyWxMessageMap);
+                String OutIdKey = "user:" + userByPort.getNumber() + ":QyWxOutId:" + outId;
+                redisPool.getRedisTemplateByDb(15).opsForHash().putAll(OutIdKey, QyWxMessageMap);
                 // 设置过期时间为三天
-                redisPool.getRedisTemplateByDb(15).expire("user:" + userByPort.getNumber() + ":QyWxOutId:" + outId, 72, TimeUnit.HOURS);
+                redisPool.getRedisTemplateByDb(15).expire(OutIdKey, 72, TimeUnit.HOURS);
             } else {
                 updateInventoryForOutRefused(recordP);
                 // 如果点击的是驳回

src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@@ -63,7 +63,11 @@
         } else {
             wxScan = wxScan.parent.wx;
         }
-        wxScan.scanQRCode({
+        var result = "1614903417674964992";//当needResult为1时返回处理结果
+        var req = {};
+        req.qrCode = result;
+        outboundLogic(req);
+        /*wxScan.scanQRCode({
             desc: 'scanQRCode desc',
             needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
             scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
@@ -82,7 +86,7 @@
 
             }
 
-        });
+        });*/
 
     });
 
@@ -176,7 +180,8 @@
                         var index = parent.layer.getFrameIndex(window.name);
                         parent.layer.close(index);
                     })
-                } else if (flag === 1) {
+                }
+                else if (flag === 1) {
                     // 如果是物料
                     material = data.material;
                     if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) {
@@ -290,7 +295,8 @@
                         }
                     }
 
-                } else if (flag === 2) {
+                }
+                else if (flag === 2) {
                     // 如果扫描的为库位
                     place = data.place;// 将扫描结果保存到vue中
                     if (material == null) {
@@ -373,7 +379,8 @@
                     }
 
 
-                } else if (flag === 3) {
+                }
+                else if (flag === 3) {
                     // 如果是仓库
                     depository = data.depository;// 将扫描结果保存到vue中