Merge remote-tracking branch 'origin/dev-nx' into dev-nx

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

@@ -101,6 +101,7 @@ public class TmTaskServiceImpl implements TmTaskService {
         int result = 0;
         int taskId = 0;
         int num = 0;
+        HashSet<String> set = new HashSet<>();
         Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         if (StringUtils.isNotNull(record)) {
             // 内部审核
@@ -154,9 +155,15 @@ public class TmTaskServiceImpl implements TmTaskService {
                 //短信通知人员进行出库
                 for (LeaseApplyDetails details : leaseApplyDetails) {
                     //内部审核以后通知机具管理人进行出库
-                    smsNotification(details, record.getCode());
+                    set = smsNotification(details, record.getCode(), set);
+                }
+                for (String str : set) {
+                    try {
+                        remoteUserService.send(str, "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + record.getCode() + "的领料申请待处理，请及时查看");
+                    } catch (Exception e) {
+                        log.info("手机号为：{}发送短信失败", str);
+                    }
                 }
-
             } else if (record.getTaskStatus() == 32 && companyId != null) {
                 // 再审核领料任务信息表
                 List<LeaseApplyInfo> leaseApplyInfoList = record.getLeaseApplyInfoList();
@@ -275,14 +282,12 @@ public class TmTaskServiceImpl implements TmTaskService {
         }
     }
 
-    private void smsNotification(LeaseApplyDetails details, String code) {
+    private HashSet<String> smsNotification(LeaseApplyDetails details, String code, HashSet<String> set) {
         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());
@@ -294,13 +299,7 @@ public class TmTaskServiceImpl implements TmTaskService {
                 }
             }
         }
-        for (String str : set) {
+        return set;
-            try {
-                remoteUserService.send(str, message);
-            } catch (Exception e) {
-                log.info("手机号为：{}发送短信失败", str);
-            }
-        }
     }
 
     @Override

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java

@@ -88,6 +88,18 @@ public class PurchaseMacodeInfo extends BaseEntity
     @ApiModelProperty(value = "验收数量")
     private BigDecimal checkNum;
 
+    public String getCheckUrl() {
+        return checkUrl;
+    }
+
+    public void setCheckUrl(String checkUrl) {
+        this.checkUrl = checkUrl;
+    }
+
+    /** 验收材料 */
+    @ApiModelProperty(value = "验收材料")
+    private String checkUrl;
+
     /** 验收数量 */
     @ApiModelProperty(value = "绑定数量")
     private Integer bindNum;

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java

@@ -157,10 +157,10 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
                     log.error("insertMaWholeSet方法插入异常");
                     throw new RuntimeException("insertMaWholeSet方法插入异常");
                 }
-            int count = selectByWholeTypeName(dto);
+               /* int count = selectByWholeTypeName(dto);
                 if (count > 1) {
                     throw new RuntimeException("配套名称已重复，请重新输入");
-            }
+                }*/
             } catch (Exception e) {
                 e.printStackTrace();
                 return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml

@@ -375,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmi.fix_code                                  fixCode,
         pcd.type_id                                   typeId,
         pcd.task_id                                   taskId,
+        pcd.check_url                                 checkUrl,
         tt.task_status								  taskStatus,
         mt.code                                       specsCode,
         mt1.code                                      typeCode,