Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java

@@ -1,10 +1,10 @@
 package com.bonus.sgzb.app.controller;
 
 import com.bonus.sgzb.app.domain.AppVersion;
-import com.bonus.sgzb.app.domain.BackApplyInfo;
 import com.bonus.sgzb.app.domain.CriticalData;
 import com.bonus.sgzb.app.domain.ToDoList;
 import com.bonus.sgzb.app.service.AppService;
+import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.log.annotation.Log;
 import com.bonus.sgzb.common.log.enums.BusinessType;
@@ -57,7 +57,7 @@ public class AppController {
             List<AppVersion> list = service.getVersion();
             return success(list);
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new ServiceException();
         }
     }
 

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -120,7 +120,7 @@ public class BackReceiveController extends BaseController {
     public AjaxResult getReceiveViewWebNum(@RequestBody BackApplyInfo record) {
         List<BackApplyInfo> list = backReceiveService.receiveView(record);
         for (BackApplyInfo backApplyInfo : list) {
-            if (Integer.valueOf(backApplyInfo.getNum()) > 0) {
+            if (Double.valueOf(backApplyInfo.getNum()).intValue() > 0) {
                 return AjaxResult.success(0);
             }
         }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -272,27 +272,32 @@ public class TmTaskServiceImpl implements TmTaskService {
     }
 
     private void smsNotification(LeaseApplyDetails details, String code) {
+        log.info("短信通知：{}", code);
         TmTask tmTask = new TmTask();
         tmTask.setId(details.getParenntId().toString());
         //获取机具所属人员
         List<TmTask> leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask);
+        HashSet<String> set=new HashSet<>();
+        String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + code + "的领料申请待处理，请及时查看";
         for (TmTask tmTaskNew : leaseDetailByParent) {
             //对手机号进行处理，因为存在一种类型的机具归属多个人的情况
             log.info("短信通知人为：{}", tmTaskNew.getUserName());
             if (tmTaskNew.getPhoneNumber() != null) {
                 String[] phoneNumberList = tmTaskNew.getPhoneNumber().split(",");
-                String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + code + "的领料申请待处理，请及时查看";
                 for (int i = 0; i < phoneNumberList.length; i++) {
+                    //当一个订单中包含多个机具归属一个管理员，需要去重，只需要通知一次就好了
+                    set.add(phoneNumberList[i]);
+                }
+            }
+        }
+        for (String str :set) {
              try {
-                        remoteUserService.send(phoneNumberList[i], message);
+                        remoteUserService.send(str, message);
                     } catch (Exception e) {
-                        log.info("手机号为：{}发送短信失败", phoneNumberList[i]);
+                        log.info("手机号为：{}发送短信失败",str);
              }
         }
     }
-        }
-    }
-
     @Override
     public int updateLeaseTaskAuditInfoCq(TmTask record) {
         int result = 0;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/StorageStatusController.java

@@ -5,9 +5,7 @@ import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.common.log.annotation.Log;
 import com.bonus.sgzb.common.log.enums.BusinessType;
-import com.bonus.sgzb.material.domain.ProjUsingRecord;
 import com.bonus.sgzb.material.domain.StorageStatus;
-import com.bonus.sgzb.material.service.ProjUsingRecordService;
 import com.bonus.sgzb.material.service.StorageStatusService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,7 +50,7 @@ public class StorageStatusController extends BaseController {
     public void export(HttpServletResponse response, StorageStatus bean)
     {
         List<StorageStatus> list = storageStatusService.getStorageStatusList(bean);
-        ExcelUtil<StorageStatus> util = new ExcelUtil<StorageStatus>(StorageStatus.class);
+        ExcelUtil<StorageStatus> util = new ExcelUtil<>(StorageStatus.class);
         util.exportExcel(response, list, "综合查询--工程机具使用");
     }
 

sgzb-ui/src/api/claimAndRefund/return.js

@@ -221,7 +221,7 @@ export function getRecord(query) {
 // 退料完成之前 判断所有设备是否全部操作退料
 export function endBackBeforeQueryApi(data) {
   return request({
-    url: 'backReceive/getReceiveViewWebNum',
+    url: 'base/backReceive/getReceiveViewWebNum',
     method: 'post',
     data
   })

sgzb-ui/src/views/warehouseManage/warehousing/Inventory/index.vue

@@ -203,7 +203,7 @@
                                 placeholder="请输入待入库总数"
                                 clearable
                                 :min="1"
-                                :max="99"
+                                :max="99999"
                                 :controls="false"
                                 style="width: 13vw"
                             />
@@ -738,7 +738,7 @@
                             clearable
                             :controls="false"
                             :min="1"
-                            :max="99"
+                            :max="99999"
                             style="width: 10vw"
                         />
                     </template>