From b71ca1e9572c5b3a087089398920994107a532f0 Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Fri, 22 Dec 2023 15:57:59 +0800
Subject: [PATCH 01/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/material/domain/TypeTreeNode.java    | 29 +++++++
 .../bonus/sgzb/material/vo/TypeTreeBuild.java | 79 +++++++++++++++++++
 2 files changed, 108 insertions(+)
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/TypeTreeBuild.java

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java
new file mode 100644
index 00000000..dcfa8702
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TypeTreeNode.java
@@ -0,0 +1,29 @@
+package com.bonus.sgzb.material.domain;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 下拉树-实体类
+ */
+@Data
+public class TypeTreeNode {
+
+    private long typeId;
+
+    private long parentId;
+
+    private String num;
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String level;
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String typeName;
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TypeTreeNode> children = new ArrayList<>();
+}
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/TypeTreeBuild.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/TypeTreeBuild.java
new file mode 100644
index 00000000..7726dec9
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/TypeTreeBuild.java
@@ -0,0 +1,79 @@
+package com.bonus.sgzb.material.vo;
+
+import com.bonus.sgzb.material.domain.TypeTreeNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *  BuildTree 构建树形结构
+ * @author 10488
+ */
+public class TypeTreeBuild {
+
+    public List<TypeTreeNode> nodeList = new ArrayList<>();
+
+    /**
+     *  构造方法
+     *  @param nodeList 将数据集合赋值给nodeList，即所有数据作为所有节点。
+     */
+    public TypeTreeBuild(List<TypeTreeNode> nodeList){
+        this.nodeList = nodeList;
+    }
+
+    /**
+     *   获取需构建的所有根节点（顶级节点） "0"
+     *   @return 所有根节点List集合
+     */
+    public List<TypeTreeNode> getRootNode(){
+        // 保存所有根节点（所有根节点的数据）
+        List<TypeTreeNode> rootNodeList = new ArrayList<>();
+        // treeNode：查询出的每一条数据（节点）
+        for (TypeTreeNode treeNode : nodeList){
+            // 判断当前节点是否为根节点，此处注意：若parentId类型是String，则要采用equals()方法判断。
+            if (0 == treeNode.getParentId()) {
+                // 是，添加
+                rootNodeList.add(treeNode);
+            }
+        }
+        return rootNodeList;
+    }
+
+    /**
+     *  根据每一个顶级节点（根节点）进行构建树形结构
+     *  @return  构建整棵树
+     */
+    public List<TypeTreeNode> buildTree(){
+        // treeNodes：保存一个顶级节点所构建出来的完整树形
+        List<TypeTreeNode> treeNodes = new ArrayList<TypeTreeNode>();
+        // getRootNode()：获取所有的根节点
+        for (TypeTreeNode treeRootNode : getRootNode()) {
+            // 将顶级节点进行构建子树
+            treeRootNode = buildChildTree(treeRootNode);
+            // 完成一个顶级节点所构建的树形，增加进来
+            treeNodes.add(treeRootNode);
+        }
+        return treeNodes;
+    }
+
+    /**
+     *  递归-----构建子树形结构
+     *  @param  pNode 根节点（顶级节点）
+     *  @return 整棵树
+     */
+    public TypeTreeNode buildChildTree(TypeTreeNode pNode){
+        List<TypeTreeNode> childTree = new ArrayList<TypeTreeNode>();
+        // nodeList：所有节点集合（所有数据）
+        for (TypeTreeNode treeNode : nodeList) {
+            // 判断当前节点的父节点ID是否等于根节点的ID，即当前节点为其下的子节点
+            if (treeNode.getParentId() == pNode.getTypeId()) {
+                // 再递归进行判断当前节点的情况，调用自身方法
+                childTree.add(buildChildTree(treeNode));
+            }
+        }
+        // for循环结束，即节点下没有任何节点，树形构建结束，设置树结果
+        pNode.setChildren(childTree);
+        return pNode;
+    }
+
+}

From d51ec0bbf3bcb8477352018ee31341a2ba78c6ac Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 22 Dec 2023 16:17:57 +0800
Subject: [PATCH 02/19] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89-=E8=AE=BE=E5=A4=87=E6=A0=91=E6=B7=BB=E5=8A=A0company?=
 =?UTF-8?q?=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/sgzb/system/domain/TreeNode.java   | 3 +++
 .../src/main/resources/mapper/system/SelectMapper.xml          | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
index b723e1a3..f8ee7d3c 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/domain/TreeNode.java
@@ -25,6 +25,9 @@ public class TreeNode {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private String unitName;
 
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private String companyId;
+
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeNode> children = new ArrayList<>();
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index 0eeed8c2..c8672bf9 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -93,7 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT type_id AS id,
                type_name AS label,
                parent_id AS parentId,
-               unit_name AS unitName
+               unit_name AS unitName,
+               company_id AS companyId
         FROM ma_type
         WHERE del_flag = '0'
         <if test="level!=null and level!=''">

From 04d79ac8b0be045be4e9afbde89fc6105a8808bd Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Fri, 22 Dec 2023 16:24:25 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=86=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/api/domain/LeaseApplyDetails.java    |  2 +-
 .../sgzb/app/controller/TmTaskController.java | 32 +++++++++++++++----
 .../app/mapper/LeaseApplyDetailsMapper.java   |  2 ++
 .../bonus/sgzb/app/mapper/TmTaskMapper.java   |  2 ++
 .../app/service/LeaseApplyDetailsService.java |  4 ++-
 .../bonus/sgzb/app/service/TmTaskService.java |  2 ++
 .../impl/LeaseApplyDetailsServiceImpl.java    | 12 +++++--
 .../app/service/impl/TmTaskServiceImpl.java   | 10 ++++++
 .../mapper/app/LeaseApplyDetailsMapper.xml    |  8 ++++-
 .../resources/mapper/app/TmTaskMapper.xml     |  4 +++
 10 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
index 3e7fe13c..c0e89232 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyDetails.java
@@ -95,7 +95,7 @@ public class LeaseApplyDetails implements Serializable {
     /**
      * 更新时间
      */
-    @ApiModelProperty(value = "更新时间")
+    @ApiModelProperty(value = "更新时间 ")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
index 5f96bfd7..682bf98c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
@@ -275,14 +275,32 @@ public class TmTaskController extends BaseController {
         try {
             int taskResult = tmTaskService.updateByPrimaryKeySelective(task);
             if (taskResult > 0) {
-                if (CollUtil.isNotEmpty(task.getLeaseApplyDetails())) {
-                    for (LeaseApplyDetails leaseApplyDetails : task.getLeaseApplyDetails()) {
-                        leaseApplyDetailsService.updateByPrimaryKeySelective(leaseApplyDetails);
-                    }
-                    return AjaxResult.success("修改成功");
-                } else {
-                    return AjaxResult.error("任务表修改成功,但领料任务明细修改信息为空");
+                if (CollUtil.isEmpty(task.getLeaseApplyInfoList())){
+                    return AjaxResult.error("任务表修改完成,但领料任务明细为空，执行失败！");
                 }
+                // 先删除原有的领料任务明细
+                for (LeaseApplyInfo leaseApplyInfo : task.getLeaseApplyInfoList()) {
+                    if (leaseApplyInfo == null || leaseApplyInfo.getId() == null) {
+                        continue;
+                    }
+                    if (StringUtils.isEmpty(leaseApplyInfo.getLeaseApplyDetails())) {
+                        continue;
+                    }
+                    // 执行删除
+                    tmTaskService.deleteDetailsByParentId(String.valueOf(leaseApplyInfo.getId()));
+                    // 删除后,插入新地领料任务明细
+                    if (StringUtils.isNotNull(leaseApplyInfo.getId())) {
+                        for (LeaseApplyDetails leaseApplyDetails : leaseApplyInfo.getLeaseApplyDetails()) {
+                            leaseApplyDetails.setParenntId(leaseApplyInfo.getId()); // 设置领料任务ID
+                        }
+                        // 插入领料任务明细
+                        boolean addLeaseTaskDetailsResult = leaseApplyDetailsService.batchInsert(leaseApplyInfo.getLeaseApplyDetails()) > 0;
+                        System.out.println(addLeaseTaskDetailsResult ? "领料任务明细插入成功" : "领料任务明细插入失败");
+                    } else {
+                        return AjaxResult.error("领料任务ID为空,修改失败!");
+                    }
+                }
+                return AjaxResult.success("修改成功");
             } else {
                 return AjaxResult.error("任务表修改失败");
             }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java
index 22ca6cef..a6de5e4b 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/LeaseApplyDetailsMapper.java
@@ -17,6 +17,8 @@ import java.util.List;
 public interface LeaseApplyDetailsMapper {
     int deleteByPrimaryKey(Integer id);
 
+    int deleteByParentId(String parentId);
+
     int insert(LeaseApplyDetails record);
 
     int insertOrUpdate(LeaseApplyDetails record);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
index 999288fa..84af30b0 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
@@ -45,6 +45,8 @@ public interface TmTaskMapper {
 
     int deleteDetailsByTaskId(@Param("id") String id);
 
+    int deleteDetailsByParentId(String parentId);
+
     int insert(TmTask record);
 
     int insertOrUpdate(TmTask record);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java
index 1ec9c91d..992297de 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/LeaseApplyDetailsService.java
@@ -1,7 +1,8 @@
 package com.bonus.sgzb.app.service;
 
-import java.util.List;
 import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
+
+import java.util.List;
     /**
 * Description:
 * @Author 阮世耀
@@ -11,6 +12,7 @@ import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
 
 public interface LeaseApplyDetailsService{
 
+    int deleteByParentId(String parentId);
 
     int deleteByPrimaryKey(Integer id);
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
index 1ce66d49..072bf814 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
@@ -27,6 +27,8 @@ public interface TmTaskService{
 
     int deleteDetailsByTaskId(@Param("id") String id);
 
+    int deleteDetailsByParentId(String parentId);
+
     int createTask(TmTask record);
 
     int insertOrUpdate(TmTask record);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java
index ac1ee305..94ecfbbe 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseApplyDetailsServiceImpl.java
@@ -1,11 +1,12 @@
 package com.bonus.sgzb.app.service.impl;
 
+import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper;
+import com.bonus.sgzb.app.service.LeaseApplyDetailsService;
+import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.List;
-import com.bonus.sgzb.app.mapper.LeaseApplyDetailsMapper;
-import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
-import com.bonus.sgzb.app.service.LeaseApplyDetailsService;
 /**
 * Description:
 * @Author 阮世耀
@@ -24,6 +25,11 @@ public class LeaseApplyDetailsServiceImpl implements LeaseApplyDetailsService{
         return leaseApplyDetailsMapper.deleteByPrimaryKey(id);
     }
 
+    @Override
+    public int deleteByParentId(String id) {
+        return leaseApplyDetailsMapper.deleteByParentId(id);
+    }
+
     @Override
     public int insert(LeaseApplyDetails record) {
         return leaseApplyDetailsMapper.insert(record);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index a31bb0c1..9c5d98de 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -150,6 +150,16 @@ public class TmTaskServiceImpl implements TmTaskService{
         return tmTaskMapper.deleteDetailsByTaskId(id);
     }
 
+    /**
+     * 根据parentID删除详情表配置的设备
+     * @param parentId 所属ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDetailsByParentId(String parentId) {
+        return tmTaskMapper.deleteDetailsByParentId(parentId);
+    }
+
     @Override
     public int createTask(TmTask record) {
         return tmTaskMapper.insert(record);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml
index 675fc9a5..4f761b5b 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/LeaseApplyDetailsMapper.xml
@@ -29,11 +29,17 @@
     from lease_apply_details
     where id = #{id,jdbcType=INTEGER}
   </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--@mbg.generated-->
     delete from lease_apply_details
     where id = #{id,jdbcType=INTEGER}
   </delete>
+
+  <delete id="deleteByParentId" parameterType="java.lang.Integer">
+    delete from lease_apply_details
+    where parennt_id = #{parentId,jdbcType=INTEGER}
+  </delete>
+
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.bonus.sgzb.base.api.domain.LeaseApplyDetails" useGeneratedKeys="true">
     <!--@mbg.generated-->
     insert into lease_apply_details (parennt_id, type_id, pre_num, 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 6634fa73..884de84c 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -46,6 +46,10 @@
         delete from lease_apply_details where id = #{id}
     </delete>
 
+  <delete id="deleteDetailsByParentId" parameterType="java.lang.String">
+    delete from lease_apply_details where parennt_id = #{parentId}
+  </delete>
+
   <insert id="insert" keyColumn="task_id" keyProperty="taskId" parameterType="com.bonus.sgzb.base.api.domain.TmTask" useGeneratedKeys="true">
     insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id)
     values (#{taskType,jdbcType=INTEGER}, #{taskStatus,jdbcType=INTEGER}, #{code,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},

From 2495ce88f591b60d3ec349a8630c6e9f96bd2e38 Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Fri, 22 Dec 2023 17:07:32 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BA=8C=E6=94=B9=20=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/base/api/domain/MaMachine.java |  6 +++---
 .../sgzb/base/mapper/MaLabelBindMapper.java   |  9 +++++++++
 .../service/impl/MaLabelBindServiceImpl.java  | 19 +++++++++++++------
 .../mapper/base/MaLabelBindMapper.xml         | 15 +++++++++++++++
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
index 05d938ef..af2927ab 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
@@ -4,8 +4,10 @@ package com.bonus.sgzb.base.api.domain;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 @ApiModel(value="com.bonus.sgzb.base.api.domain.MaMachine")
+@Data
 public class MaMachine extends BaseEntity {
   /**
    * 机具ID
@@ -149,9 +151,7 @@ public class MaMachine extends BaseEntity {
   private String labelCode;
 
 
-  public long getMaId() {
-    return maId;
-  }
+
 
   public void setMaId(long maId) {
     this.maId = maId;
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
index 1d1ff479..78477b80 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java
@@ -1,6 +1,7 @@
 package com.bonus.sgzb.base.mapper;
 import java.util.List;
 
+import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.domain.MaLabelBind;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -44,6 +45,14 @@ public interface MaLabelBindMapper
      * @return 结果
      */
     public int insertMaLabelBindS(MaLabelBindVO maLabelBindVO);
+
+    /**
+     * 新增机具设备标签ma_label_bind
+     *
+     * @param maMachine 机具设备标签ma_label_bind
+     * @return 结果
+     */
+    public int insertMaLabel(MaMachine maMachine);
     /**
      * 查询机具设备ma_id
      *
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
index c4493f64..cbcebc3e 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaLabelBindServiceImpl.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.base.service.impl;
 
+import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.mapper.MaLabelBindMapper;
 import com.bonus.sgzb.base.service.IMaLabelBindService;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
@@ -8,6 +9,7 @@ import lombok.extern.flogger.Flogger;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -58,7 +60,7 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
         return maLabelBindMapper.selecthistoryList(maLabelBindVO);
     }
     /**
-     * 新增机具设备标签ma_label_bind
+     * 绑定机具设备标签ma_label_bind
      *
      * @param maLabelBind 机具设备标签ma_label_bind
      * @return 结果
@@ -69,15 +71,20 @@ public class MaLabelBindServiceImpl implements IMaLabelBindService
         int i = 0;
         int b =0;
         MaLabelBindVO bean = maLabelBindMapper.selectMaMachineMaId(maLabelBind.getMaCode());
-        if(StringHelper.isNotEmpty(bean.getMaId())){
-            maLabelBind.setMaId(bean.getMaId());
-            maLabelBind.setTypeId(bean.getTypeId());
+        if(null != bean){
+             return b;
+        }else {
+            MaMachine maMachine =new MaMachine();
+            maMachine.setMaCode(maLabelBind.getMaCode());
+            maMachine.setTypeId(maLabelBind.getTypeId());
+            maLabelBindMapper.insertMaLabel(maMachine);
+            maLabelBind.setMaId(String.valueOf(maMachine.getMaId()));
             maLabelBind.setStatus("1");
             maLabelBind.setIsBind("1");
             b=maLabelBindMapper.updateMaLabelBindMaIds(maLabelBind);
             i = maLabelBindMapper.insertMaLabelBindS(maLabelBind);
-        }
-        return i ;
+            }
+        return i;
     }
 
     /**
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 33ffaf8e..7bc9597c 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -176,4 +176,19 @@
           ma_id = #{maId},is_bind =#{isBind}
           where label_id =#{labelId}
     </update>
+    <insert id="insertMaLabels">
+        insert into ma_maLabel
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="typeId != null">type_id,</if>
+            <if test="maCode != null">ma_code,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="typeId != null">#{typeId},</if>
+            <if test="labelCode != null">#{maCode},</if>
+        </trim>
+    </insert>
+    <insert id="insertMaLabel" useGeneratedKeys="true" keyProperty="maId">
+        insert into ma_machine (type_id,ma_code,create_time)
+        values (#{typeId},#{maCode},now());
+    </insert>
 </mapper>
\ No newline at end of file

From 5ead43e5dfd1a213c40c251a680b6b98ad1d44a5 Mon Sep 17 00:00:00 2001
From: zhouxain01 <zhouxian44159095>
Date: Fri, 22 Dec 2023 17:13:57 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/base/section/index.vue      | 197 ++++++++++++------
 .../src/views/store/label/labelBinding.vue    |  37 +++-
 .../views/store/label/labelBindingHistory.vue |   5 +-
 3 files changed, 167 insertions(+), 72 deletions(-)

diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue
index 1a16e0cc..15155e83 100644
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="名称" prop="lotName">
         <el-input
           v-model="queryParams.lotName"
@@ -12,8 +19,16 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
@@ -25,7 +40,8 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -36,49 +52,92 @@
           @click="handleExport"
         >导出</el-button>
       </el-col> -->
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="projectLot" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="projectLot"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="lotId" />
-      <el-table-column label="标段工程名称" align="center" prop="lotName" :show-overflow-tooltip="true" />
-      <el-table-column label="工程类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
-      <el-table-column label="所属工程项目" align="center" prop="ownPro" :show-overflow-tooltip="true" />
-      <el-table-column label="所属上级" align="center" prop="deptName" :show-overflow-tooltip="true" />
-      <el-table-column label="联系人" align="center" prop="linkMan" :show-overflow-tooltip="true" />
-      <el-table-column label="联系电话" align="center" prop="telphone" :show-overflow-tooltip="true" />
+      <el-table-column
+        label="标段工程名称"
+        align="center"
+        prop="lotName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="工程类型"
+        align="center"
+        prop="typeName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="所属工程项目"
+        align="center"
+        prop="ownPro"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="所属上级"
+        align="center"
+        prop="deptName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="联系人"
+        align="center"
+        prop="linkMan"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="联系电话"
+        align="center"
+        prop="telphone"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column label="状态" align="center" prop="status" width="180">
         <template slot-scope="scope">
           <el-switch
-          active-value="0"
+            active-value="0"
             inactive-value="1"
             @change="changeStatus(scope.row)"
-            v-model="scope.row.status">
+            v-model="scope.row.status"
+          >
           </el-switch>
-
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-          >编辑</el-button>
+            >编辑</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -93,30 +152,44 @@
         </el-form-item>
         <el-form-item label="所属工程项目" prop="ownPro">
           <!-- <el-input v-model="form.ownPro" placeholder="请输入所属工程项目" /> -->
-          <el-select v-model="form.ownPro" placeholder="请选择所属工程项目" style="width: 100%;">
+          <el-select
+            v-model="form.ownPro"
+            placeholder="请选择所属工程项目"
+            style="width: 100%"
+          >
             <el-option
               v-for="item in ProjectSelect"
               :key="item.proName"
               :label="item.proName"
               :value="item.proName"
-              v-if="item.status !='1'"
+              v-if="item.status != '1'"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="工程类型" prop="typeId">
           <!-- <el-input v-model="form.typeId" placeholder="请选择工程类型" /> -->
-          <el-select v-model="form.typeId" placeholder="请选择工程类型" style="width: 100%;" @change="selecType">
+          <el-select
+            v-model="form.typeId"
+            placeholder="请选择工程类型"
+            style="width: 100%"
+            @change="selecType"
+          >
             <el-option
               v-for="item in typeList"
               :key="item.id"
               :label="item.name"
               :value="item.id"
-              v-if="item.status !='1'"
+              v-if="item.status != '1'"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="所属上级" prop="deptId">
-          <treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择所属上级" @select="select"/>
+          <treeselect
+            v-model="form.deptId"
+            :options="deptOptions"
+            placeholder="请选择所属上级"
+            @select="select"
+          />
         </el-form-item>
         <el-form-item label="联系人" prop="linkMan">
           <el-input v-model="form.linkMan" placeholder="请输入联系人" />
@@ -124,8 +197,6 @@
         <el-form-item label="联系电话" prop="telphone">
           <el-input v-model="form.telphone" placeholder="请输入联系电话" />
         </el-form-item>
-
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -136,8 +207,8 @@
 </template>
 
 <script>
-import {addProjectLot, delProjectLot, ProjectLotList, updateProjectLot, getProjectSelect} from "@/api/base/base";
-import { unitTypeList} from "@/api/base/base";
+import { addProjectLot, delProjectLot, ProjectLotList, updateProjectLot, getProjectSelect } from "@/api/base/base";
+import { unitTypeList } from "@/api/base/base";
 import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -161,10 +232,10 @@ export default {
       total: 0,
       // 表格数据
       projectLot: [],
-       //字典数据
-       typeList: [],
-       //所属项目工程列表
-       ProjectSelect: [],
+      //字典数据
+      typeList: [],
+      //所属项目工程列表
+      ProjectSelect: [],
       // 部门树选项
       deptOptions: undefined,
       // 弹出层标题
@@ -188,9 +259,9 @@ export default {
         lotName: [
           { required: true, message: "标段工程名称不能为空", trigger: "blur" }
         ],
-        ownPro: [
-          { required: true, message: "所属工程项目不能为空", trigger: "blur" }
-        ],
+        // ownPro: [
+        //   { required: true, message: "所属工程项目不能为空", trigger: "blur" }
+        // ],
         typeId: [
           { required: true, message: "工程类型不能为空", trigger: "blur" }
         ],
@@ -211,18 +282,18 @@ export default {
   },
   methods: {
     //获取所属项目工程下拉数据
-    getProjectSelect(){
+    getProjectSelect() {
       getProjectSelect().then(response => {
-        this.ProjectSelect =  response.rows;
-        })
+        this.ProjectSelect = response.rows;
+      })
     },
     //获取工程类型
-    getType(){
-      unitTypeList({id:"5"}).then(response => {
-        this.typeList =  response.rows;
-        })
+    getType() {
+      unitTypeList({ id: "5" }).then(response => {
+        this.typeList = response.rows;
+      })
     },
-    selecType(id){
+    selecType(id) {
       // this.typeList.forEach(item => {
       //   if(item.id == id){
       //     this.form.typeName = item.name
@@ -235,28 +306,28 @@ export default {
         this.deptOptions = response.data;
       });
     },
-    select(row){
+    select(row) {
       // console.log(row.label)  
       // this.form.deptName = row.label;
     },
     //更新
-    changeStatus(row){
+    changeStatus(row) {
       let param = {
-        lotId:row.lotId,
-        status:row.status
+        lotId: row.lotId,
+        status: row.status
       }
       updateProjectLot(param).then(response => {
-              this.getList();
-            });
+        this.getList();
+      });
     },
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
       ProjectLotList(this.queryParams).then(response => {
-          this.projectLot = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
+        this.projectLot = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      }
       );
     },
     // 取消按钮
@@ -295,21 +366,21 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.lotId)
-      this.single = selection.length!=1
+      this.single = selection.length != 1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-        this.reset();
-        ProjectLotList({lotId:row.lotId}).then(response => {
-          this.form = response.rows[0]
-        });
-        this.open = true;
-        this.title = "编辑";
+      this.reset();
+      ProjectLotList({ lotId: row.lotId }).then(response => {
+        this.form = response.rows[0]
+      });
+      this.open = true;
+      this.title = "编辑";
 
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.lotId != undefined) {
@@ -331,12 +402,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const lotIds = row.lotId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该数据项？').then(function () {
         return delProjectLot(lotIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index 170652a2..43a1ae3b 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -273,6 +273,14 @@
           </el-select>
           <!-- <el-input v-model="form.labelCode" placeholder="请输入标签编号" /> -->
         </el-form-item>
+        <el-form-item label="规格型号" prop="typeId">
+          <treeselect
+            v-model="form.typeId"
+            :options="deptOptions"
+            placeholder="请选择规格型号"
+            @select="select"
+          />
+        </el-form-item>
         <el-form-item label="设备编码" prop="maCode">
           <el-input v-model="form.maCode" placeholder="请输入设备编码" />
         </el-form-item>
@@ -378,11 +386,16 @@ import html2canvas from "html2canvas";
 import QRCode from 'qrcodejs2'
 import JSZip from 'jszip'
 import FileSaver from "file-saver"
+import { getDeviceTypeTree } from "@/api/claimAndRefund/receive";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Dict",
   dicts: ['sys_normal_disable'],
+  components: { Treeselect },
   data() {
     return {
+      deptOptions: undefined,
       rowObj: {},
       userInfo: user.state,
       // 遮罩层
@@ -423,11 +436,14 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        labelType: [
-          { required: true, message: "标签类型不能为空", trigger: "blur" }
-        ],
-        labelCode: [
-          { required: true, message: "标签编号不能为空", trigger: "blur" }
+        // labelType: [
+        //   { required: true, message: "标签类型不能为空", trigger: "blur" }
+        // ],
+        // labelCode: [
+        //   { required: true, message: "标签编号不能为空", trigger: "blur" }
+        // ],
+        typeId: [
+          { required: true, message: "规格型号不能为空", trigger: "blur" }
         ],
         maCode: [
           { required: true, message: "设备编码不能为空", trigger: "blur" }
@@ -530,11 +546,14 @@ export default {
       this.open = true;
       this.title = "绑定";
       this.form.id = this.ids[0].id;
-      this.form.typeId = this.ids[0].typeId;
+      // this.form.typeId = this.ids[0].typeId;
       this.form.maId = this.ids[0].maId;
       this.form.labelId = this.ids[0].labelId;
       this.form.labelType = this.ids[0].labelType;
       this.form.labelCode = this.ids[0].labelCode;
+      getDeviceTypeTree({ "level": "4" }).then(response => {
+        this.deptOptions = response.data;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -549,7 +568,8 @@ export default {
     /** 提交按钮 */
     submitForm: function () {
       this.form.binder = this.userInfo.id + '';
-      this.form.typeId
+      // this.form.typeId
+      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           addLabelBind(this.form).then(response => {
@@ -560,6 +580,9 @@ export default {
         }
       });
     },
+    select(val) {
+      this.form.typeId = val.id
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;
diff --git a/sgzb-ui/src/views/store/label/labelBindingHistory.vue b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
index 1a0678e8..02d5f610 100644
--- a/sgzb-ui/src/views/store/label/labelBindingHistory.vue
+++ b/sgzb-ui/src/views/store/label/labelBindingHistory.vue
@@ -169,10 +169,11 @@
       <el-table-column label="绑定时间" align="center" prop="bindTime" />
       <el-table-column label="操作类型" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag
+          {{ scope.row.status == 0 ? '停用' : '正常' }}
+          <!-- <dict-tag
             :options="dict.type.sys_normal_disable"
             :value="scope.row.status"
-          />
+          /> -->
         </template>
       </el-table-column>
 

From 1a7fac7cb9512b4b4ce5a178de867e85eeb0f97c Mon Sep 17 00:00:00 2001
From: zhouxain01 <zhouxian44159095>
Date: Fri, 22 Dec 2023 17:29:57 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/label/labelBinding.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index 43a1ae3b..9efc95c4 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -194,7 +194,15 @@
 
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <span>{{ scope.row.status == 1 ? '已绑定' : '未绑定' }}</span>
+            <span>{{
+              scope.row.status == 0
+                ? '未绑定'
+                : scope.row.status == 1
+                ? '已绑定'
+                : scope.row.status == 2
+                ? '已解绑'
+                : ''
+            }}</span>
             <!-- <dict-tag
             :options="dict.type.sys_normal_disable"
             :value="scope.row.status"

From 0abdca2751a79476d57fba8513d8321e9cddeddb Mon Sep 17 00:00:00 2001
From: liuchuan <1084917737@qq.com>
Date: Fri, 22 Dec 2023 17:59:58 +0800
Subject: [PATCH 07/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/controller/RepairController.java     | 24 +++++++++++++++++++
 .../controller/RepairTestInputController.java | 14 +++++++++++
 .../resources/mapper/system/SelectMapper.xml  |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
index eaf34708..a8a21f29 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java
@@ -40,6 +40,18 @@ public class RepairController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取维修任务列表
+     */
+    @ApiOperation(value = "获取维修任务列表")
+    @Log(title = "维修任务列表", businessType = BusinessType.QUERY)
+    @GetMapping("/getAppRepairTaskList")
+    public AjaxResult getAppRepairTaskList(RepairTask bean)
+    {
+        List<RepairTask> list = service.getRepairTaskList(bean);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 获取维修任务机具列表
      */
@@ -53,6 +65,18 @@ public class RepairController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取维修任务机具列表
+     */
+    @ApiOperation(value = "获取维修任务机具列表")
+    @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY)
+    @GetMapping("/getAppRepairMaTypeList")
+    public AjaxResult getAppRepairMaTypeList(RepairTaskDetails bean)
+    {
+        List<RepairTaskDetails> list = service.getRepairMaTypeList(bean);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 新增维修记录
      */
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
index a8448a26..fb1c5a97 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairTestInputController.java
@@ -33,6 +33,13 @@ public class RepairTestInputController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "获取修试后入库列表")
+    @PostMapping("getAppRepairedList")
+    public AjaxResult getAppRepairedList(@Validated @RequestBody RepairTestInputDto dto){
+        List<RepairTestInputVo> list = service.getRepairedList(dto);
+        return AjaxResult.success(list);
+    }
+
     @ApiOperation(value = "获取修试后入库列表-详情")
     @GetMapping("getRepairedDetailList")
     public TableDataInfo getRepairedDetailList(RepairTestInputDto dto){
@@ -41,6 +48,13 @@ public class RepairTestInputController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation(value = "获取修试后入库列表-详情")
+    @PostMapping("getAppRepairedDetailList")
+    public AjaxResult getAppRepairedDetailList(@Validated @RequestBody RepairTestInputDto dto){
+        List<RepairTestInputDetailVo> list = service.getRepairedDetailList(dto);
+        return AjaxResult.success(list);
+    }
+
     @ApiOperation(value = "修试后入库-入库操作")
     @PostMapping("inputByType")
     public AjaxResult inputByType(@RequestBody RepairTestInputDto dto){
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
index c8672bf9..0488276b 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                parent_id AS parentId,
                level
         FROM ma_part_type
-        WHERE del_flag = '0' and level != '4'
+        WHERE del_flag = '0' and level != '3'
         ORDER BY create_time
     </select>
     <!--货架-->

From 5adcc356552748e03c92b4bcaac2ed7580d0eb1d Mon Sep 17 00:00:00 2001
From: zhouxain01 <zhouxian44159095>
Date: Fri, 22 Dec 2023 18:26:50 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/views/store/label/labelBinding.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index 9efc95c4..f61be733 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -224,8 +224,9 @@
             <!-- status   未绑定0  已绑定1   已解绑2   -->
             <!-- isBind   不展示解绑0  展示解绑1    -->
             <el-button
-              v-if="scope.row.isBind == 1"
-              :disabled="scope.row.status == 0"
+              :disabled="
+                !(scope.row.status === '1' && scope.row.isBind === '1')
+              "
               size="mini"
               type="text"
               icon="el-icon-delete"

From 689abd905d573f5179bf4fbb065b417288cb7262 Mon Sep 17 00:00:00 2001
From: gmhao <1285330039@qq.com>
Date: Fri, 22 Dec 2023 18:49:20 +0800
Subject: [PATCH 09/19] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E4=BA=8C=E6=94=B9=20=E6=96=B0=E5=A2=9E=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/MaLabelBindMapper.xml    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
index 7bc9597c..03d3a92e 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml
@@ -60,17 +60,19 @@
         ORDER BY b.is_bind ASC
     </select>
     <select id="selecthistoryList" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" resultMap="MaLabelBindVOResult">
-        SELECT a.ma_id,a.label_code,a.bind_time,a.label_type,mt.type_id,mt.type_name,
+        SELECT b.label_id,a.id,b.is_bind,b.label_code,a.bind_time,b.label_type,mt.type_id,mt.type_name,
         mt2.type_id as modelId , mt2.type_name as modelName,mt3.type_name as wpName,
-        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code
-        FROM ma_label_bind a
+        mt4.type_name as kindName ,a.status,a.binder,dic.name,ma.ma_code,user.user_name
+        FROM ma_machine_label b
+        left join ma_label_bind a on a.ma_id = b.ma_id
         LEFT JOIN ma_type mt  ON a.type_id = mt.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
         LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
         LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
         LEFT JOIN ma_type_repair mtk ON mtk.type_id = mt.type_id
-        LEFT JOIN sys_dic dic ON dic.id = a.label_type
-        LEFT JOIN ma_machine  ma on ma.ma_id = a.ma_id
+        LEFT JOIN sys_dic dic ON dic.id = b.label_type
+        LEFT JOIN ma_machine  ma ON ma.ma_id = a.ma_id
+        LEFT JOIN sys_user user on user.user_id =a.binder
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
         <where>
             <if test="labelCode != null  and labelCode != ''"> and a.label_code = #{labelCode}</if>
@@ -163,7 +165,7 @@
     </delete>
 
     <update id="updateMaLabelBindByMaIds" parameterType="Long">
-        update ma_label_bind set status = '0' where id = #{id}
+        update ma_label_bind set status = '2' where id = #{id}
     </update>
 
     <select id="selectMaMachineMaId" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">

From 294fbc4d3e67238f0fcb429e0b3f2f502e43d055 Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Fri, 22 Dec 2023 18:57:52 +0800
Subject: [PATCH 10/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sgzb-ui/src/api/store/newBuy.js               |  70 ++-
 sgzb-ui/src/api/store/warehousing.js          |  14 +-
 sgzb-ui/src/views/base/section/index.vue      |   6 +-
 .../claimAndRefund/receive/agreement.vue      |  74 +++-
 .../newBuy/newDevices/newDevicesAccept.vue    | 135 +++---
 .../newBuy/newDevices/newDevicesArrival.vue   | 135 +++---
 .../newBuy/newDevices/newDevicesCode.vue      | 166 ++++---
 .../newBuy/newDevices/newDevicesList.vue      |   1 +
 .../newDevices/newDevicesWarehousing.vue      | 413 ++++++++++++------
 sgzb-ui/src/views/store/tools/devices.vue     |   8 +-
 sgzb-ui/src/views/store/tools/toolsType.vue   |  16 +-
 .../store/warehousing/repairWarehousing.vue   |  27 +-
 12 files changed, 696 insertions(+), 369 deletions(-)

diff --git a/sgzb-ui/src/api/store/newBuy.js b/sgzb-ui/src/api/store/newBuy.js
index b3045a72..fb6ad59b 100644
--- a/sgzb-ui/src/api/store/newBuy.js
+++ b/sgzb-ui/src/api/store/newBuy.js
@@ -133,18 +133,64 @@ export function delMacodeList(maCode) {
   })
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
+//新购验收-验收-通知-常用人员
+export function getNoticeUserList(query) {
+  return request({
+    url: '/system/person/list',
+    method: 'get',
+    params: query
+  })
+}
+//新购验收-验收-通知-所有人员
+export function getAllNotificationList(query) {
+  return request({
+    url: '/system/person/notification',
+    method: 'get',
+    params: query
+  })
+}
+//新购验收-验收-通知-常用人员-添加
+export function addNoticeUser(data) {
+  return request({
+    url: '/system/person',
+    method: 'post',
+    data: data
+  })
+}
+// 删除
+export function delNoticeUser(id) {
+  return request({
+    url: '/system/person/' + id,
+    method: 'delete'
+  })
+}
+
+
+
+//新购验收-入库列表
+export function getPutInList(query) {
+  return request({
+    url: '/material/purchaseCheckInfo/putInList',
+    method: 'get',
+    params: query
+  })
+}
+export function getPutinDetailsList(query) {
+  return request({
+    url: '/material/purchaseMacode/putinDetails',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改状态-审核
+export function changePutinStatus(data) {
+  return request({
+    url: '/material/purchaseMacode/manageStatus',
+    method: 'put',
+    data: data
+  })
+}
 
 
 
diff --git a/sgzb-ui/src/api/store/warehousing.js b/sgzb-ui/src/api/store/warehousing.js
index 0b18cccd..f1cabc18 100644
--- a/sgzb-ui/src/api/store/warehousing.js
+++ b/sgzb-ui/src/api/store/warehousing.js
@@ -23,24 +23,24 @@ export function getTypeList(query) {
 //修试后入库--列表
 export function getRepairedList(data) {
     return request({
-      url: '/material/RepairTestInput/getRepairedList',
-      method: 'post',
-      data: data
+      url: '/sgzb-material/RepairTestInput/getRepairedList',
+      method: 'get',
+      params: data
     })
   }
   
 //修试后入库--详情
 export function getRepairedDetailList(data) {
     return request({
-      url: '/material//RepairTestInput/getRepairedDetailList',
-      method: 'post',
-      data: data
+      url: '/sgzb-material//RepairTestInput/getRepairedDetailList',
+      method: 'get',
+      params: data
     })
   }
   //修试后入库--审核
 export function inputByType(data) {
     return request({
-      url: '/material/RepairTestInput/inputByType',
+      url: '/sgzb-material/RepairTestInput/inputByType',
       method: 'post',
       data: data
     })
diff --git a/sgzb-ui/src/views/base/section/index.vue b/sgzb-ui/src/views/base/section/index.vue
index 1a16e0cc..d1a01e37 100644
--- a/sgzb-ui/src/views/base/section/index.vue
+++ b/sgzb-ui/src/views/base/section/index.vue
@@ -188,9 +188,9 @@ export default {
         lotName: [
           { required: true, message: "标段工程名称不能为空", trigger: "blur" }
         ],
-        ownPro: [
-          { required: true, message: "所属工程项目不能为空", trigger: "blur" }
-        ],
+        // ownPro: [
+        //   { required: true, message: "所属工程项目不能为空", trigger: "blur" }
+        // ],
         typeId: [
           { required: true, message: "工程类型不能为空", trigger: "blur" }
         ],
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
index 01bb76ce..50890816 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
@@ -190,7 +190,19 @@
         </el-form-item>
 
         <el-form-item label="合同照片" prop="fileName">
-          <el-input v-model="form.fileName" placeholder="图片上传" />
+          <el-upload 
+                :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
+                action="#" :limit='1'
+                :file-list="fileList"
+                :show-file-list="true"
+                list-type="picture-card"
+                accept=".png,.jpg,.jpeg"
+                :on-success="handleAvatarSuccess"
+                :on-preview="handlePictureCardPreview"
+                :on-remove="handleRemove">
+                <i  class="el-icon-plus avatar-uploader-icon"></i>
+              </el-upload>
+
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@@ -202,7 +214,9 @@
       </div>
     </el-dialog>
 
-
+    <el-dialog :visible.sync="dialogVisible">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt="">
+    </el-dialog>
 
   </div>
 </template>
@@ -211,7 +225,7 @@
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
 import { getAgreementList, getAgreementInfoId,addAgreement, updateAgreement, removeAgreement,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
-
+import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
 
 
 export default {
@@ -253,6 +267,16 @@ export default {
       },
       // 表单参数
       form: {},
+      //图片上传
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl:'',
+      imageName:'',
+      fileList:[],
+      field101fileList:[],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      //上传地址
+      uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
       // 表单校验
       rules: {
         contractCode: [
@@ -331,9 +355,12 @@ export default {
         agreementId: undefined,
         dictName: undefined,
         dictType: undefined,
+        fileUrl: undefined,
+        fileName: undefined,
         status: "0",
         remark: undefined
       };
+      this.fileList = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -353,9 +380,50 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+       
       this.open = true;
+
       this.title = "新建";
     },
+    // 图片上传
+    imgUpLoad(param,name,index) {
+      console.log(param,'image')
+      param.type = 'ma'
+      imgUpLoad(param).then(res => {
+        if(res.code == 200) {
+          this.form.fileUrl = res.data.fileUrl;
+          this.form.fileName = res.data.fileName;
+          this.imageUrl = res.data.fileUrl;
+          this.imageName = res.data.fileName;
+        }else{
+          // this.$msgError(res.msg)
+          this.$modal.msgError(res.msg);
+        }
+      }).catch((error) => {
+        // this.$msgError(error)
+        this.$modal.msgError(error);
+      })
+    },
+    handleAvatarSuccess(res,file) {
+      console.log("success")
+      },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      this.imageUrl = "";
+      this.form.fileUrl = "";
+      this.form.fileName = "";
+    },
+    //图片点击查看
+    handlePictureCardPreview(file) {
+      console.log(file)
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    //图片查看
+    openImg(url){
+      this.dialogImageUrl = this.uploadUrl + url;
+      this.dialogVisible = true;
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.agreementId)
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
index fa6930c0..e2c22588 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
@@ -79,6 +79,8 @@
           <span v-if="scope.row.status==0">未验收</span>
           <span v-if="scope.row.status==1">已验收</span>
           <span v-if="scope.row.status==2">待通知</span>
+          <span v-if="scope.row.status==3">不通过</span>
+          <span v-if="scope.row.status==4">已入库</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
@@ -87,6 +89,7 @@
               size="mini"
               type="text"
               icon="el-icon-edit"
+              v-show="scope.row.status==0 || scope.row.status==3"
               @click="handleCheck(scope.row)"
           >验收</el-button>
           <!-- <el-button
@@ -174,13 +177,13 @@
         </el-form-item>
       </el-form>
 
-      <el-table v-loading="loading" :data="noticeUserList" height="400">
-            <!-- <el-table-column type="selection" width="50" align="center" /> -->
-            <el-table-column label="序号" align="center" key="userId" prop="userId" />
+      <el-table v-loading="loading" :data="noticeUserList" height="400" @selection-change="handleSelectionNotice">
+            <el-table-column type="selection" width="50" align="center" />
+            <el-table-column label="序号" align="center" type="index"/>
             <el-table-column label="人员名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
             <el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" />
-            <el-table-column label="角色" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
-            <el-table-column label="联系电话" align="center" key="phonenumber" prop="phonenumber" width="120" />
+            <el-table-column label="角色" align="center" key="roleName" prop="roleName" :show-overflow-tooltip="true" />
+            <el-table-column label="联系电话" align="center" key="telphone" prop="telphone" width="120" />
             <el-table-column
                 label="操作"
                 align="center"
@@ -199,7 +202,7 @@
             </el-table-column>
           </el-table>
       <div slot="footer" class="dialog-footer" style="text-align: center">
-        <el-button type="primary" @click="peopleOpen = true">人员添加</el-button>
+        <el-button type="primary" @click="addUserOpen">人员添加</el-button>
         <el-button type="primary" @click="configNotice">消息通知</el-button>
       </div>
     </el-dialog>
@@ -210,9 +213,9 @@
         <el-table-column type="selection" width="50" align="center" />
         <el-table-column label="序号" align="center" key="userId" prop="userId" />
         <el-table-column label="人员名称" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
-        <el-table-column label="所属机构" align="center" key="" prop="" :show-overflow-tooltip="true" />
-        <el-table-column label="角色" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
-        <el-table-column label="联系电话" align="center" key="phonenumber" prop="phonenumber" width="120" />
+        <el-table-column label="所属机构" align="center" key="deptName" prop="deptName" :show-overflow-tooltip="true" />
+        <el-table-column label="角色" align="center" key="roleName" prop="roleName" :show-overflow-tooltip="true" />
+        <el-table-column label="联系电话" align="center" key="telphone" prop="telphone" width="120" />
         <!-- <el-table-column
           label="操作"
           align="center"
@@ -244,8 +247,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getPurchaseCheckInfo,bmNoticeInfo,updatePurchaseCheckDetails } from "@/api/store/newBuy";
-import { getUserByRoleList } from "@/api/system/user";
+import { getPurchaseCheckInfo,bmNoticeInfo,updatePurchaseCheckDetails,getNoticeUserList,getAllNotificationList,addNoticeUser,delNoticeUser } from "@/api/store/newBuy";
 import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
 
 export default {
@@ -273,6 +275,8 @@ export default {
       noticeUserList:[],
       //选择人员
       chosenUserList:[],
+      //确认消息通知人员-勾选的通知人员
+      configUserList:[],
       //任务数据
       taskInfo:{},
       // 表格数据
@@ -344,7 +348,8 @@ export default {
     this.taskId = taskId;
     console.log(this.taskId)
     this.getTaskInfo();
-    this.getUserList()
+    this.getAllUserList()
+    this.getNoticeUserList()
   },
   methods: {
     
@@ -357,6 +362,8 @@ export default {
         this.loading = false;
       })
     },
+
+
     // 返回列表页
     jumpList(){
       const obj = { path: "/store/newBuy/newDevicesList" }
@@ -391,6 +398,9 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    
+
+    //----消息通知
     getNowTime(){
       var today = new Date();
       var year = today.getFullYear();//获取年份
@@ -402,73 +412,88 @@ export default {
     //通知按钮
     handleNotice(){
       this.noticeOpen = true;
-      // console.log(this.getNowTime())
-      // var str = ''
-      // this.equipmentList.forEach(item => {
-      //   str = str+'机具类型：'+ item.machineTypeName +'，规格型号：K87-AD4/38-36.52-M1-B，数量：8.000；'
-      // });
       this.nform.notice = '各位同事您好，请于'+this.getNowTime()+'进行机具验收。验收单号：'+this.taskInfo.code;
     },
-     /** 查询用户列表--库管员 */
-     getUserList() {
-      getUserByRoleList({roleId:'101'}).then(response => {
+    //查询短信通知人员
+    getNoticeUserList() {
+      getNoticeUserList().then(response => {
+        this.noticeUserList = response.data;
+        }
+      );
+    },
+     /** 查询所有用户列表--可添加人员 */
+     getAllUserList() {
+      getAllNotificationList().then(response => {
         this.userList = response.data;
         }
       );
     },
-    // 多选框选中数据
+    addUserOpen(){
+      this.getAllUserList()
+      this.peopleOpen = true;
+    },
+    // 多选框选中-添加人员
     handleSelectionUser(selection) {
       console.log(selection)
       this.chosenUserList = selection;
     },
     //添加人员
     addUser(){
-        console.log(this.noticeUserList,"noticeUserList")
         console.log(this.chosenUserList,"chosenUserList")
-        this.noticeUserList = this.chosenUserList;
-        // this.chosenUserList.forEach((chosen,index)=>{
-         
-        //     this.noticeUserList.unshift(chosen) 
-          
-          
-        // })
-        // console.log(this.noticeUserList,"noticeUserList")
-        // console.log(this.chosenUserList,"chosenUserList")
-        this.peopleOpen = false;
+
+        addNoticeUser(this.chosenUserList).then(response => {
+          if(response.code==200){
+            this.getNoticeUserList()
+            this.peopleOpen = false;
+          }
+        });
+        
     },
     delUser(row){
-      this.noticeUserList.forEach((item,index)=>{
-        if(item.userId == row.userId){
-          console.log('del')
-          this.noticeUserList.splice(index,1)
-        }
-      })
+      delNoticeUser(row.userId).then(response => {
+          if(response.code==200){
+            this.getNoticeUserList()
+          }
+        });
+      
+      
     },
+    // 多选框选中-添加消息通知
+    handleSelectionNotice(selection) {
+      this.configUserList = selection;
+    },
+    //确认消息通知
     configNotice(){
-      // console.log(this.nform.notice,'message')
-      // console.log(this.taskInfo.taskId,'taskId')
-      // console.log(this.noticeUserList,'bmNoticeInfoList')
-      this.noticeUserList.forEach((item,index)=>{
+      
+      this.configUserList.forEach((item,index)=>{
         item.noticeUser = item.userId;
-        item.phone = item.phonenumber;
+        item.phone = item.telphone;
       })
       let param = {
         message:this.nform.notice,
         taskId:this.taskInfo.taskId,
-        bmNoticeInfoList:this.noticeUserList,
+        bmNoticeInfoList:this.configUserList,
       }
-      bmNoticeInfo(param).then(response=>{
-        console.log(response)
-        if(response.code==200){
-          this.$message({
-            message: '操作成功',
-            type: 'success'
-          })
-          this.noticeOpen = false
-          this.getTaskInfo()
-        }
+      if(this.configUserList.length>0){
+        bmNoticeInfo(param).then(response=>{
+          console.log(response)
+          if(response.code==200){
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.noticeOpen = false
+            this.getTaskInfo()
+          }
 
-      })
+        })
+      }else{
+        this.$message({
+              message: '请选择通知人员！',
+              type: 'error'
+            })
+      }
+      
       
     },
     // 多选框选中数据
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
index e33cfb68..25b22bf3 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
@@ -41,11 +41,11 @@
           <el-col :span="9"></el-col>
         </el-form>
     </el-row>
-    <el-form :model="dataForm" ref="dataForm" :rules="rules" size="small" :inline="true">
+    <el-form :model="maForm" ref="maForm" :rules="rules" size="small" :inline="true">
       <el-row>
         <el-form-item label="采购日期" prop="purchaseTime">
           <el-date-picker
-              v-model="dataForm.purchaseTime"
+              v-model="maForm.purchaseTime"
               style="width: 240px"
               value-format="yyyy-MM-dd"
               type="date"
@@ -56,7 +56,7 @@
         </el-form-item>
         <el-form-item label="到货日期" prop="arrivalTime"> 
           <el-date-picker 
-              v-model="dataForm.arrivalTime"
+              v-model="maForm.arrivalTime"
               style="width: 240px"
               value-format="yyyy-MM-dd"
               type="date"
@@ -66,7 +66,7 @@
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="采购员" prop="purchaser">
-          <el-select v-model="dataForm.purchaser" placeholder="请选择采购员" style="width: 100%;">
+          <el-select v-model="maForm.purchaser" placeholder="请选择采购员" style="width: 100%;">
             <el-option
               v-for="item in userList"
               :key="item.userId"
@@ -77,7 +77,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input
-              v-model="dataForm.remark"
+              v-model="maForm.remark"
               placeholder="请输入备注"
               clearable
               type="textarea"
@@ -135,7 +135,8 @@
     <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="55"/>
-      <el-table-column label="机具类型" prop="machineTypeName" :show-overflow-tooltip="true"   width="200"/>
+      <el-table-column label="机具类型" prop="machineTypeName" :show-overflow-tooltip="true"   width="200">
+      </el-table-column>
       <el-table-column label="规格型号" prop="specificationType" :show-overflow-tooltip="true"  width="200"/>
       <el-table-column label="单位" prop="unitName" width="100" />
       <el-table-column label="购置单价(元)" prop="purchasePrice" align="center"  width="150">
@@ -143,7 +144,7 @@
           <el-input v-model="scope.row.purchasePrice" type="number" maxlength="10"></el-input>
         </template>
       </el-table-column>
-      <el-table-column label="*采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
+      <el-table-column label="采购数量" prop="purchaseNum" width="150" type="number" maxlength="10">
         <template slot-scope="scope">
           <el-input v-model="scope.row.purchaseNum"></el-input>
         </template>
@@ -276,7 +277,7 @@ export default {
         productionTime:'', 
         supplierId:'',
       },
-      dataForm:{
+      maForm:{
         purchaseTime:'',
         arrivalTime:'',
         purchaser:'',
@@ -359,6 +360,7 @@ export default {
     },
     //添加机具类型
     select(row){
+      console.log(row)
       if(row.level==4){
         for(let i = 0; i < this.equipmentList.length; i++) {
             if (this.equipmentList[i].typeId == row.typeId) {
@@ -366,8 +368,9 @@ export default {
                 break;
             }
         }
-        row.productionTime = this.queryParams.productionTime
-        row.supplierId = this.queryParams.supplierId
+        this.$set(row, 'productionTime', this.queryParams.productionTime);
+        this.$set(row, 'supplierId', this.queryParams.supplierId);
+        
         this.equipmentList.unshift(row)
       }
     },
@@ -391,10 +394,10 @@ export default {
       // this.loading = true;
       getPurchaseCheckInfo({taskId:this.taskId,keyWord:this.queryParams.keyWord}).then(response => {
         // this.taskInfo = response.data
-        this.dataForm.purchaseTime = response.data.purchaseTime;
-        this.dataForm.arrivalTime = response.data.arrivalTime;
-        this.dataForm.purchaser = response.data.purchaser;
-        this.dataForm.remark = response.data.remark;
+        this.maForm.purchaseTime = response.data.purchaseTime;
+        this.maForm.arrivalTime = response.data.arrivalTime;
+        this.maForm.purchaser = response.data.purchaser;
+        this.maForm.remark = response.data.remark;
         this.equipmentList = response.data.checkDetailsList;
         // this.loading = false;
       })
@@ -452,59 +455,67 @@ export default {
   
     /** 新增按钮操作 */
     handleSave() {
-      // this.$modal.confirm('是否确认').then(function() {
-        this.$refs["dataForm"].validate(valid => {
-          if (valid) {
-            console.log(this.dataForm,'dataForm')
-            console.log(this.equipmentList,'equipmentList')
-            let isEmpty = true
-            this.equipmentList.forEach(item=>{
-              if(item.purchaseNum=='' || !item.purchaseNum){
-                isEmpty = false
-              }
-            })
-            console.log(this.taskId)
-           
-            this.dataForm.taskId = this.taskId
-            this.dataForm.checkDetailsList = this.equipmentList;
-            console.log(this.dataForm)
-            if(isEmpty){
-              if(this.equipmentList.length>0){
-                if(this.isEdit){
-                  console.log('编辑')
-                  this.loading = true;
-                  updatePurchaseCheckInfo(this.dataForm).then(response => {
-                    if(response.code == 200){
-                      this.$modal.msgSuccess("编辑成功");
-                      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
-                    }
-                    this.loading = false;
-                  })
-                  
-                }else if(!this.isEdit){
-                  console.log('新增')
-                  this.loading = true;
-                  addPurchaseCheckInfo(this.dataForm).then(response => {
-                    if(response.code == 200){
-                      this.$modal.msgSuccess("新增成功");
-                      this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
-                    }
-                    this.loading = false;
-                  })
+      if(this.equipmentList.length>0){
+         this.$refs["maForm"].validate(valid => {
+            if (valid) {
+              
+              console.log(this.maForm,'maForm')
+              console.log(this.equipmentList,'equipmentList')
+              let isEmpty = true
+              this.equipmentList.forEach(item=>{
+                if(item.purchaseNum=='' || !item.purchaseNum){
+                  isEmpty = false
+                }
+              })
+              console.log(this.taskId)
+            
+              this.maForm.taskId = this.taskId
+              this.maForm.checkDetailsList = this.equipmentList;
+              console.log(this.maForm)
+              if(isEmpty){
+                if(this.equipmentList.length>0){
+                  this.$modal.confirm('是否确认保存当前页面').then(function() { }).then(() => {
+                    
+                  if(this.isEdit){
+                    console.log('编辑')
+                    this.loading = true;
+                    updatePurchaseCheckInfo(this.maForm).then(response => {
+                      if(response.code == 200){
+                        this.$modal.msgSuccess("编辑成功");
+                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
+                      }
+                      this.loading = false;
+                    })
+                    
+                  }else if(!this.isEdit){
+                    console.log('新增')
+                    this.loading = true;
+                    addPurchaseCheckInfo(this.maForm).then(response => {
+                      if(response.code == 200){
+                        this.$modal.msgSuccess("新增成功");
+                        this.$tab.closeOpenPage({ path: "/store/newBuy/newDevicesList" });
+                      }
+                      this.loading = false;
+                    })
+                  }
+                }).catch(() => {});
+                }else{
+                  this.$modal.msgError("请先选择并添加机具类型！！！");
                 }
               }else{
-                this.$modal.msgError("请先选择并添加机具类型！！！");
+                this.$modal.msgError("请填写采购数量！！！");
               }
-            }else{
-              this.$modal.msgError("请填写采购数量！！！");
-            }
-            
-            
            
-          }
+            }
+          
+          
         })
-        
-      // })
+
+
+      }else{
+        this.$modal.msgError("请先添加机具类型");
+      }
+
       
       // this.reset();
       // this.open = true;
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index fdf08465..6c47b0fe 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -66,10 +66,10 @@
       <!-- <el-table-column label="编码类型" align="center" prop="codeType" :show-overflow-tooltip="true" />
       <el-table-column label="二维码" align="center" prop="dictName" :show-overflow-tooltip="true" /> -->
       <el-table-column label="状态" align="center" prop="status" width="180">
-        <!-- <template slot-scope="scope">
-          <span v-if="scope.row.status==0">删除</span>
-          <span v-if="scope.row.status==1">正常</span>
-        </template> -->
+        <template slot-scope="scope">
+          <span v-if="scope.row.status==0">待入库</span>
+          <span v-if="scope.row.status==1">已入库</span>
+        </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -108,8 +108,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="7">
-            <el-form-item label="生成数量" prop="count">
-              <el-input-number controls-position="right" v-model="form.count" type="number" :min="1" placeholder="请输入编码生成数量" />
+            <el-form-item label="后缀范围" prop="count">
+              <div style="display: flex;"><el-input v-model="form.str" placeholder="0001"></el-input> - <el-input v-model="form.str1" placeholder="0005"></el-input></div>
+               
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -120,14 +121,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2">
+          <!-- <el-col :span="2">
             <el-button
               type="primary"
               plain
               size="mini" 
               @click="createCodeList"
             >生成</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="2">
             <el-button
               type="primary"
@@ -143,7 +144,11 @@
             <el-table-column label="序号" align="center" type="index"/>
             <el-table-column label="机具种类" align="center" prop="typeName" :show-overflow-tooltip="true" />
             <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
-            <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
+            <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.maCode" v-bind:class="[scope.row.statusFlag==1 ? redColor : '']"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="固定资产编码" align="center" prop="assetsCode" width="120" />
             <el-table-column
                 label="操作"
@@ -183,6 +188,7 @@ import { getMacodeList,getMacodeDetailList,makeEquipmentNumber,editPurchaseMacod
 
 import { getTypeList } from "@/api/store/warehousing";
 import { getListByMaType } from "@/api/store/tools";
+import { number } from 'echarts';
 
 
 export default {
@@ -221,9 +227,9 @@ export default {
       },
       // 表单参数
       form: {
-        exCode:'NXJJ',
+        exCode:'NSJJ',
         count:1,
-        isFixed:'1',
+        // isFixed:'',
         typeId:''
       },
       codeList: [],//弹窗列表list
@@ -316,33 +322,25 @@ export default {
     /** 编码按钮操作 */ //getCodeList newCodeList
     handleCode(row) {
       console.log(row)
-      let param = {
-        taskId:this.taskId,
-        typeId:row.typeId,
-      }
-      this.newCodeList = [];
-      getMacodeDetailList(param).then(response => {
-        this.getCodeList = response.data;
-        this.codeList = this.getCodeList.concat(this.newCodeList)
-        this.open = true;
-        this.title = "生成编码";
-      });
-      this.form = row
-      // this.form.count = row.checkNum;
+      this.form = row;
+       let arr = this.form.arrivalTime.split('-')
+      this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
       this.form.count = row.checkNum;
-      this.form.typeId = row.typeId;
-      this.form.taskId = row.taskId;
-      this.form.isFixed = '1';
-      this.form.exCode = 'NXJJ'+this.form.typeCode+this.form.specsCode;
-      // this.open = true;
-      // this.title = "生成编码";
+      this.codeList=[]
+      this.open = true;
+      this.title = "生成编码";
+      // let param = {
+      //   taskId:this.taskId,
+      //   typeId:row.typeId,
+      // }
+      // getMacodeDetailList(param).then(response => {
+      //   this.codeList = response.data;
+      
+      // });
+     
     },
     //生成列表codeList
     createCodeList(){
-      // console.log(this.form.checkNum)
-      // console.log(this.codeList.length)
-      // console.log(this.newCodeList)
-      
       if(this.codeList.length>=this.form.checkNum){
         this.$modal.msgError("生成编码数量不可超过采购验收数量！！！");
       }else{
@@ -363,52 +361,71 @@ export default {
     },
     //填充按钮
     fillingCodeList(){
-      // console.log(this.form.checkNum)
-      
-      // console.log(this.getCodeList,'getCodeList')
-      // console.log(this.newCodeList,'newCodeList')
-      // console.log(this.codeList)
-      // let emptyNum = 0;
-      // for(let i = 0; i < this.codeList.length; i++) {
-      //      if(!this.codeList.maCode || this.codeList.maCode==''){
-      //       emptyNum = emptyNum+1;
-      //      }
-      // };
-      // console.log(emptyNum,'emptyNum')
-      if(this.newCodeList.length>0){
-        let param = {
-          "typeId": this.form.typeId,
-          "count": this.newCodeList.length
-        }
-        makeEquipmentNumber(param).then(response => {
-          // this.newCodeList.forEach((item,index) => {
-          //   this.$set(item,'maCode',response.data.equipmentNum);
+      console.log(Number(this.form.str))
+      this.codeList = []
+      let num = Number(this.form.str)
+      console.log(Number(this.form.str1))
+      let num1 = Number(this.form.str1)
+      let count= num1-num+1;//生成数量
 
-          // });
-          response.data.equipmentNum.forEach((item,index) => {
-            this.$set(this.newCodeList[index], 'maCode', item);
-            // this.newCodeList[index].maCode = item
-          });
-          console.log(this.newCodeList)
-          this.codeList = this.getCodeList.concat(this.newCodeList)
-          
-          // response.equipmentNum
-        });
+      let sum = count + this.form.bindNum;
+      console.log(sum)
+      if(sum>this.form.checkNum){
+        this.$modal.msgError("编码数量已超过验收数量");
       }else{
-        this.$modal.msgError("已全部绑定过设备编码");
+        if(num1>num){
+          for(let i = 0; i < count; i++) {
+              let obj = {
+                typeName:this.form.typeName,
+                specificationType:this.form.specificationType,
+                typeId: this.form.typeId,
+                taskId: this.form.taskId,
+                maCode:this.form.exCode+(i+num),
+                assetsCode:'',
+                isFixed:this.form.isFixed,
+              }
+              this.codeList.push(obj)
+          }
+        }
       }
     },
 
     /** 提交按钮 */
     submitForm: function() {
-      console.log(this.newCodeList)
-      if(this.newCodeList.length==0){
+      console.log(this.codeList)
+
+      // for(let i = 0; i < this.codeListt; i++) {
+      //   if(this.codeList[i].maCode==''){
+      //     this.$modal.msgError("设备编码不能为空");
+      //     return false
+      //   }
+      // }
+
+
+      if(this.codeList.length==0){
         this.$modal.msgError("无新增编码绑定");
       }else{
-        editPurchaseMacode(this.newCodeList).then(response => {
-          this.$modal.msgSuccess("绑定成功");
-          this.open = false;
-          this.getList();
+        
+
+
+        editPurchaseMacode(this.codeList).then(response => {
+          console.log(response.data)
+          if(response.data && response.data.length>0){
+            this.codeList = response.data;
+            // this.codeList.forEach(item=>{
+            //   if(item.statusFlag==1){
+            //     item.maCode=''
+            //   }
+            // })
+
+
+          }else{
+            this.$modal.msgSuccess("绑定成功");
+            this.open = false;
+            this.getList();
+          } 
+          
+          
         });
       }
       
@@ -466,3 +483,10 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+.redColor{
+  color: red;
+}
+
+</style>
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
index 85cecf00..d3121124 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue
@@ -98,6 +98,7 @@
               size="mini"
               type="text"
               icon="el-icon-edit"
+              v-if="scope.row.purchasingStatus=='已验收合格'"
               @click="handleCode(scope.row)"
           >编码管理</el-button>
           <el-button
diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
index 7a2f4a8b..9cb19e2b 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
@@ -1,56 +1,55 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="名称" prop="dictName">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="关键字" prop="keyWord">
         <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入名称"
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
           clearable
           style="width: 240px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="提交入库时间">-->
-<!--        <el-date-picker-->
-<!--          v-model="dateRange"-->
-<!--          style="width: 240px"-->
-<!--          value-format="yyyy-MM-dd"-->
-<!--          type="daterange"-->
-<!--          range-separator="-"-->
-<!--          start-placeholder="开始日期"-->
-<!--          end-placeholder="结束日期"-->
-<!--        ></el-date-picker>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="规格型号" prop="status">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.status"-->
-<!--          placeholder="请选择规格型号"-->
-<!--          clearable-->
-<!--          style="width: 240px"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.sys_normal_disable"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="设备类型" prop="status">-->
-<!--        <el-select-->
-<!--          v-model="queryParams.status"-->
-<!--          placeholder="请选择设备类型"-->
-<!--          clearable-->
-<!--          style="width: 240px"-->
-<!--        >-->
-<!--          <el-option-->
-<!--            v-for="dict in dict.type.sys_normal_disable"-->
-<!--            :key="dict.value"-->
-<!--            :label="dict.label"-->
-<!--            :value="dict.value"-->
-<!--          />-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!-- <el-form-item label="提交入库时间">
+        <el-date-picker
+          v-model="queryParams.submitStorageTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="date"
+          range-separator="-"
+           placeholder="提交入库时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="设备类型" prop="typeId">
+        <el-select
+          v-model="queryParams.typeId"
+          placeholder="请选择设备类型"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="typeItem in typeList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="规格型号" prop="modelId">
+        <el-select
+          v-model="queryParams.modelId"
+          placeholder="请选择规格型号"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="model in modelList"
+            :key="model.typeId"
+            :label="model.typeName"
+            :value="model.typeId"
+          />
+        </el-select>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -59,7 +58,7 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -69,7 +68,7 @@
           @click="handleAdd"
           v-hasPermi="['system:dict:add']"
         >入库审核</el-button>
-      </el-col>
+      </el-col> -->
       <!--      <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          type="success"-->
@@ -92,7 +91,7 @@
       <!--          v-hasPermi="['system:dict:remove']"-->
       <!--        >删除</el-button>-->
       <!--      </el-col>-->
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -101,47 +100,42 @@
           @click="handleExport"
           v-hasPermi="['system:dict:export']"
         >导出</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="dictId" />
-      <el-table-column label="采购单号" align="center" prop="dictId" />
-      <el-table-column label="采购日期" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="到货日期" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="采购机具设备" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="采购员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="发布人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="发布日期" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="status">
-        <template slot-scope="scope">
+    <el-table v-loading="loading" :data="tableList" >
+      <!-- <el-table-column type="selection" width="55" align="center" /> -->
+      <el-table-column label="序号" align="center" type="index" width="55px"/>
+      
+    
+      <el-table-column label="采购单号" align="center" prop="code" :show-overflow-tooltip="true" />
+      <el-table-column label="采购日期" align="center" prop="purchaseTime" :show-overflow-tooltip="true" />
+      <el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
+      <el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
+      <el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="发布人员" align="center" prop="createBy" :show-overflow-tooltip="true" width="100"/>
+      <el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
+      <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="taskStatus">
+        <!-- <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
+        </template> -->
       </el-table-column>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleView(scope.row)"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dict:edit']"
           >审核</el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
@@ -165,23 +159,63 @@
 
 
 
-    <!-- 审核对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="名称" prop="dictName">
+    <!-- 添加或修改参数配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form :model="query" ref="query" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="关键字" prop="dictName">
           <el-input
-            v-model="queryParams.dictName"
-            placeholder="请输入名称"
+            v-model="query.dictName"
+            placeholder="请输入关键字"
             clearable
             style="width: 240px"
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-
-
+        <!-- <el-form-item label="状态" prop="status">
+          <el-select
+            v-model="query.status"
+            placeholder="审核状态"
+            clearable
+            style="width: 240px"
+          >
+            <el-option label="未审核" value="0" />
+            <el-option label="已入库" value="1" />
+            <el-option label="驳回" value="2" />
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item label="设备类型" prop="typeId">
+        <el-select
+          v-model="query.typeId"
+          placeholder="请选择设备类型"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="typeItem in typeList"
+            :key="typeItem.typeId"
+            :label="typeItem.typeName"
+            :value="typeItem.typeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="规格型号" prop="modelId">
+        <el-select
+          v-model="query.modelId"
+          placeholder="请选择规格型号"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="model in modelList"
+            :key="model.typeId"
+            :label="model.typeName"
+            :value="model.typeId"
+          />
+        </el-select>
+      </el-form-item> -->
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
+          <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
         </el-form-item>
       </el-form>
       <el-row :gutter="10" class="mb8">
@@ -189,21 +223,19 @@
           <el-button
             type="primary"
             plain
-            icon="el-icon-plus"
             size="mini"
             :disabled="multiple"
-            v-hasPermi="['system:dict:add']"
-          >通过</el-button>
+            @click="passAll"
+          >批量通过</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button
-            type="primary"
+            type="danger"
             plain
-            icon="el-icon-plus"
             size="mini"
+            @click="refusedAll"
             :disabled="multiple"
-            v-hasPermi="['system:dict:add']"
-          >不通过</el-button>
+          >批量不通过</el-button>
         </el-col>
         <!--        <el-col :span="1.5">-->
         <!--          <el-button-->
@@ -216,34 +248,30 @@
         <!--          >导出</el-button>-->
         <!--        </el-col>-->
       </el-row>
-      <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="detailTableList" @selection-change="handleSelectionChange" height="400">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="机具类型" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="数量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
+        <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
+        <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
+        <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
+ 
+        <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-          </template>
+           
         </el-table-column>
 
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
-              v-hasPermi="['system:dict:edit']"
+              @click="pass(scope.row)"
             >通过</el-button>
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['system:dict:remove']"
+              @click="refused(scope.row)"
             >不通过</el-button>
             <!--          <el-button-->
             <!--            size="mini"-->
@@ -257,26 +285,24 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        v-show="dialogTotal>0"
+        :total="dialogTotal"
+        :page.sync="query.pageNum"
+        :limit.sync="query.pageSize"
+        @pagination="getDialogTable"
       />
 
 
 
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
+     
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-
+import { getRepairedDetailList, inputByType } from "@/api/store/warehousing";
+import { getPutInList,getPutinDetailsList ,changePutinStatus} from "@/api/store/newBuy";
 export default {
   name: "Dict",
   dicts: ['sys_normal_disable'],
@@ -294,12 +320,19 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 字典表格数据
+      // 总条数
+      dialogTotal: 0,
+      //搜索下拉数据
       typeList: [],
+      modelList: [],
+      // 表格数据
+      tableList: [],
+      detailTableList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
+      showHandle: true,
       // 日期范围
       dateRange: [],
       // 查询参数
@@ -310,6 +343,11 @@ export default {
         dictType: undefined,
         status: undefined
       },
+      query: {
+        pageNum: 1,
+        pageSize: 10,
+        
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -327,16 +365,28 @@ export default {
     this.getList();
   },
   methods: {
+    
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.typeList = response.rows;
+      getPutInList(this.queryParams).then(response => {
+          this.tableList = response.rows;
           this.total = response.total;
           this.loading = false;
         }
       );
     },
+
+    getDialogTable(){
+      this.loading = true;
+      getPutinDetailsList(this.query).then(response => {
+          this.detailTableList = response.rows;
+          this.dialogTotal = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    
     // 取消按钮
     cancel() {
       this.open = false;
@@ -358,34 +408,133 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    /** 搜索按钮操作 */
+    handleDialogQuery() {
+      this.query.pageNum = 1;
+      this.getDialogTable();
+    },
     /** 重置按钮操作 */
     resetQuery() {
-      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      // this.reset();
       this.open = true;
       this.title = "添加字典类型";
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
+      this.ids = selection.map(item => item)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改字典类型";
-      });
+      // this.reset();
+      this.query.taskId = row.taskId
+      this.getDialogTable()
+      this.open = true;
+      this.showHandle = true
+      this.title = "审核";
     },
+    //查看
+    handleView(row) {
+      this.query.taskId = row.taskId
+      this.getDialogTable()
+      this.open = true;
+      this.showHandle = false
+      this.title = "查看";
+    },
+    pass(row) {
+      console.log(row)
+      console.log(this.query.taskId)
+      row.taskId = this.query.taskId;
+      let obj = {
+        taskId:this.query.taskId,
+        checkResult:'1',//1 审核通过 2 驳回 -必填
+        maId:row.maId,
+        maCode:row.maCode,
+        typeId:row.typeId,
+        
+        // remark:row.remark,
+        // repairNum:row.repairNum,
+      }
+
+      let param =[obj]
+      changePutinStatus(param).then(response => {
+            if(response.code==200){
+              this.$modal.msgSuccess("审批成功");
+              this.getDialogTable();
+            }else{
+              this.$modal.msgSuccess("审批失败");
+            }
+            });
+    },
+    passAll() {
+      console.log(this.query.taskId)
+      console.log(this.ids)
+      this.ids.forEach(item => {
+        item.taskId = this.query.taskId;
+        item.checkType = '1'
+        item.type= item.manageType//0.编号 1.计数
+      });
+      
+      changePutinStatus(this.ids).then(response => {
+            if(response.code==200){
+              this.$modal.msgSuccess("审批成功");
+              this.getDialogTable();
+            }else{
+              this.$modal.msgSuccess("审批失败");
+            }
+            });
+    },
+
+    refused(row) {
+      console.log(row)
+      console.log(this.query.taskId)
+      row.taskId = this.query.taskId;
+      let obj = {
+        taskId:this.query.taskId,
+        id:row.id,
+        checkType:'2',//1 审核通过 2 驳回 -必填
+        type:row.manageType,//0.编号 1.计数
+        maId:row.maId,
+        typeId:row.typeId,
+        remark:row.remark,
+        repairNum:row.repairNum,
+      }
+
+      let param =[obj]
+      changePutinStatus(param).then(response => {
+            if(response.code==200){
+              this.$modal.msgSuccess("审批成功");
+              this.getDialogTable();
+            }else{
+              this.$modal.msgSuccess("审批失败");
+            }
+            });
+    },
+    refusedAll() {
+      console.log(this.query.taskId)
+      console.log(this.ids)
+      this.ids.forEach(item => {
+        item.taskId = this.query.taskId;
+        item.checkType = '2'
+        item.type=item.manageType
+      });
+      
+      changePutinStatus(this.ids).then(response => {
+            if(response.code==200){
+              this.$modal.msgSuccess("审批成功");
+              this.getDialogTable();
+            }else{
+              this.$modal.msgSuccess("审批失败");
+            }
+            });
+    },
+
     /** 提交按钮 */
     submitForm: function() {
       this.$refs["form"].validate(valid => {
diff --git a/sgzb-ui/src/views/store/tools/devices.vue b/sgzb-ui/src/views/store/tools/devices.vue
index 8002a483..0b48c134 100644
--- a/sgzb-ui/src/views/store/tools/devices.vue
+++ b/sgzb-ui/src/views/store/tools/devices.vue
@@ -131,24 +131,24 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="物品种类" prop="itemType">
-              <el-input v-model="form.itemType" placeholder="请输入物品种类" />
+              <el-input v-model="form.itemType" placeholder="请输入物品种类" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="设备类型" prop="deviceType">
-              <el-input v-model="form.deviceType" placeholder="请输入设备类型" />
+              <el-input v-model="form.deviceType" placeholder="请输入设备类型" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="规格型号" prop="specificationType">
-              <el-input v-model="form.specificationType" placeholder="请输入规格型号" />
+              <el-input v-model="form.specificationType" placeholder="请输入规格型号" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="设备编号" prop="maCode">
-              <el-input v-model="form.maCode" placeholder="请输入设备编号" />
+              <el-input v-model="form.maCode" placeholder="请输入设备编号" disabled/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
diff --git a/sgzb-ui/src/views/store/tools/toolsType.vue b/sgzb-ui/src/views/store/tools/toolsType.vue
index f2a203b5..2e84dd11 100644
--- a/sgzb-ui/src/views/store/tools/toolsType.vue
+++ b/sgzb-ui/src/views/store/tools/toolsType.vue
@@ -167,7 +167,7 @@
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -273,16 +273,15 @@
             <el-form-item label="图片" prop="photoName">
               <el-upload 
                 :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                action="#" 
+                action="#" :limit='1'
                 :file-list="fileList"
-                :show-file-list="false"
+                :show-file-list="true"
                 list-type="picture-card"
                 accept=".png,.jpg,.jpeg"
                 :on-success="handleAvatarSuccess"
                 :on-preview="handlePictureCardPreview"
                 :on-remove="handleRemove">
-                <img v-if="imageUrl" :src="uploadUrl+imageUrl" style="width: 140px;height: 140px;" class="avatar">
-                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <i  class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
           </el-col>
@@ -337,7 +336,7 @@
 
 
     <el-dialog :visible.sync="dialogVisible">
-      <img width="100%" :src="dialogImageUrl" alt="">
+      <img width="100%" height="650px" :src="dialogImageUrl" alt="">
     </el-dialog>
 
 
@@ -728,13 +727,10 @@ export default {
     },
     handleAvatarSuccess(res,file) {
       console.log("success")
-       
-        // this.imageUrl = URL.createObjectURL(file.raw);
-        // console.log(this.imageUrl)
       },
     handleRemove(file, fileList) {
       console.log(file, fileList);
-      console.log(this.form,'222222')
+      this.imageUrl = "";
       this.form.photoUrl = "";
       this.form.photoName = "";
     },
diff --git a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
index 2ed4b63c..e6f624e4 100644
--- a/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
+++ b/sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
@@ -10,9 +10,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="提交入库时间">
+      <el-form-item label="维修时间时间">
         <el-date-picker
-          v-model="queryParams.submitStorageTime"
+          v-model="queryParams.wxTime"
           style="width: 240px"
           value-format="yyyy-MM-dd"
           type="date"
@@ -20,7 +20,7 @@
            placeholder="提交入库时间"
         ></el-date-picker>
       </el-form-item>
-      <el-form-item label="设备类型" prop="typeId">
+      <!-- <el-form-item label="设备类型" prop="typeId">
         <el-select
           v-model="queryParams.typeId"
           placeholder="请选择设备类型"
@@ -49,7 +49,7 @@
             :value="model.typeId"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -136,6 +136,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="taskStatus=='入库进行中'"
           >审核</el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
@@ -183,9 +184,9 @@
             <el-option label="驳回" value="2" />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="设备类型" prop="typeId">
+        <el-form-item label="设备类型" prop="deviceTypeId">
         <el-select
-          v-model="query.typeId"
+          v-model="query.deviceTypeId"
           placeholder="请选择设备类型"
           clearable
           style="width: 240px"
@@ -198,9 +199,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="规格型号" prop="modelId">
+      <el-form-item label="规格型号" prop="typeId">
         <el-select
-          v-model="query.modelId"
+          v-model="query.typeId"
           placeholder="请选择规格型号"
           clearable
           style="width: 240px"
@@ -212,7 +213,7 @@
             :value="model.typeId"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
           <!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> -->
@@ -260,7 +261,11 @@
         </el-table-column>
         <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
         <el-table-column label="状态" align="center" prop="status">
-           
+          <template slot-scope="scope">
+            <span v-if="scope.row.status=='0'">未审核</span>
+            <span v-if="scope.row.status=='1'">已入库</span>
+            <span v-if="scope.row.status=='2'">驳回 </span>
+          </template>
         </el-table-column>
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
@@ -269,10 +274,12 @@
               size="mini"
               type="text"
               @click="pass(scope.row)"
+              v-if="scope.row.status=='0'"
             >通过</el-button>
             <el-button
               size="mini"
               type="text"
+              v-if="scope.row.status=='0'"
               @click="refused(scope.row)"
             >不通过</el-button>
             <!--          <el-button-->

From a18aff4d23d0aed65d349c1c7156848903ad337c Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Fri, 22 Dec 2023 19:14:59 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/MaHouseMapper.xml   |   3 +-
 .../resources/mapper/base/MaMachineMapper.xml |   1 +
 .../PurchaseMacodeInfoController.java         |  18 ++-
 .../sgzb/material/domain/MaInputRecord.java   |  25 ++--
 .../material/domain/PurchaseCheckDetails.java |  22 ++++
 .../material/domain/PurchaseMacodeInfo.java   |  23 ++++
 .../mapper/PurchaseCheckDetailsMapper.java    |   7 ++
 .../mapper/PurchaseMacodeInfoMapper.java      |   6 +
 .../service/IPurchaseMacodeInfoService.java   |   9 +-
 .../impl/PurchaseCheckDetailsServiceImpl.java |   2 +-
 .../impl/PurchaseMacodeInfoServiceImpl.java   | 116 +++++++++++++-----
 .../com/bonus/sgzb/material/vo/MaInputVO.java |  25 ++++
 .../material/PurchaseCheckDetailsMapper.xml   |  15 ++-
 .../material/PurchaseCheckInfoMapper.xml      |   1 +
 .../material/PurchaseMacodeInfoMapper.xml     |  23 +++-
 .../PurchaseNoticePersonController.java       |  22 +++-
 .../mapper/PurchaseNoticePersonMapper.java    |   8 +-
 .../service/IPurchaseNoticePersonService.java |  11 +-
 .../impl/PurchaseNoticePersonServiceImpl.java |  31 ++++-
 .../system/PurchaseNoticePersonMapper.xml     |  19 ++-
 .../resources/mapper/system/SysUserMapper.xml |   5 +-
 21 files changed, 312 insertions(+), 80 deletions(-)
 create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
index 3fd243ef..9571caed 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseMapper.xml
@@ -83,11 +83,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHouseList" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
         select house_id, house_name, parent_id, status, dept_id, del_flag, create_by, create_time, remark, company_id, sort,concat,phone
         from ma_house_info
-        <where>
+        where del_flag = '0'
             <if test="houseName != null and houseName != ''">
                 AND house_name like concat('%', #{houseName}, '%')
             </if>
-        </where>
     </select>
 
     <select id="selectHouseById" parameterType="com.bonus.sgzb.base.domain.MaHouse" resultMap="SysHouseResult">
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 9d511e87..19490687 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND type_id = #{typeId}
             </if>
         </where>
+        order by m.id desc
     </select>
 
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
index bd72094a..0fcee176 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseMacodeInfoController.java
@@ -7,6 +7,7 @@ import com.bonus.sgzb.material.domain.MaInputRecord;
 import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
 import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
+import com.bonus.sgzb.material.vo.MaInputVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,13 +66,24 @@ public class PurchaseMacodeInfoController extends BaseController
         return success(purchaseMacodeInfoService.selectPurchaseMacodeInfo(purchaseMacodeInfo));
     }
 
+    /**
+     * 获取新购验收编号管理详细信息
+     */
+    @ApiOperation(value = "新购入库清单明细")
+    @GetMapping(value = "/putinDetails")
+    public TableDataInfo putinDetails(PurchaseMacodeInfo purchaseMacodeInfo)
+    {
+        startPage();
+        return getDataTable(purchaseMacodeInfoService.selectPutinDetails(purchaseMacodeInfo));
+    }
+
     /**
      * 新增新购验收编号管理
      */
     @ApiOperation(value = "新增新购验收编号管理")
     @PostMapping
     public AjaxResult add(@RequestBody List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
-        return toAjax(purchaseMacodeInfoService.insertPurchaseMacodeInfo(purchaseMacodeInfoList));
+        return purchaseMacodeInfoService.insertPurchaseMacodeInfo(purchaseMacodeInfoList);
     }
 
     /**
@@ -104,8 +116,8 @@ public class PurchaseMacodeInfoController extends BaseController
      */
     @ApiOperation(value = "修改编码管理的入库状态")
     @PutMapping("/manageStatus")
-    public AjaxResult modifyManageStatus(@RequestBody MaInputRecord maInputRecord) throws Exception {
-        return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputRecord));
+    public AjaxResult modifyManageStatus(@RequestBody MaInputVO maInputVO) throws Exception {
+        return toAjax(purchaseMacodeInfoService.modifyManageStatus(maInputVO));
     }
 
     /**
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java
index 9109a1d2..37571ef8 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaInputRecord.java
@@ -20,39 +20,37 @@ public class MaInputRecord extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** $column.columnComment */
+    @ApiModelProperty(value = "主键id")
     private Long id;
 
     /** 任务ID */
-    @Excel(name = "任务ID")
+    @ApiModelProperty(value = "任务ID")
     private Long taskId;
 
     /** 类型ID */
-    @Excel(name = "类型ID")
+    @ApiModelProperty(value = "类型ID")
     private Long typeId;
 
     /** 机具ID */
-    @Excel(name = "机具ID")
+    @ApiModelProperty(value = "机具ID")
     private Long maId;
 
     /** 入库类型(1新购入库，2退料入库，3修试后入库) */
-    @Excel(name = "入库类型(1新购入库，2退料入库，3修试后入库)")
+    @ApiModelProperty(value = "入库类型(1新购入库，2退料入库，3修试后入库)")
     private String inputType;
 
     /** 入库数量 */
-    @Excel(name = "入库数量")
+    @ApiModelProperty(value = "入库数量")
     private BigDecimal inputNum;
 
     /** 状态（0删除，1正常） */
-    @Excel(name = "状态", readConverterExp = "0=删除，1正常")
+    @ApiModelProperty(value = "状态 0=删除，1正常")
     private String status;
 
     /** 数据所属组织 */
-    @Excel(name = "数据所属组织")
+    @ApiModelProperty(value = "数据所属组织")
     private Long companyId;
 
-    @ApiModelProperty("验收的编码id")
-    private List<Long> maCodeInfoIdList;
-
     @ApiModelProperty(value = "验收结论")
     private String checkResult;
 
@@ -134,13 +132,6 @@ public class MaInputRecord extends BaseEntity
         return companyId;
     }
 
-    public List<Long> getMaCodeInfoIdList() {
-        return maCodeInfoIdList;
-    }
-
-    public void setMaCodeInfoIdList(List<Long> maCodeInfoIdList) {
-        this.maCodeInfoIdList = maCodeInfoIdList;
-    }
 
     public String getCheckResult() {
         return checkResult;
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java
index 07a6501d..f99b3da8 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckDetails.java
@@ -98,6 +98,12 @@ public class PurchaseCheckDetails extends BaseEntity
     @ApiModelProperty(value = "规格型号")
     private String specificationType;
 
+    @ApiModelProperty(value = "规格型号")
+    private String typeName;
+
+    @ApiModelProperty(value = "单位")
+    private String unitName;
+
     @ApiModelProperty(value = "机具类型名称")
     private String machineTypeName;
 
@@ -302,6 +308,22 @@ public class PurchaseCheckDetails extends BaseEntity
         this.bindNum = bindNum;
     }
 
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
index db74092c..f6140716 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
@@ -102,6 +102,13 @@ public class PurchaseMacodeInfo extends BaseEntity
     @ApiModelProperty(value = "出厂日期")
     private Date productionTime;
 
+    /** 到货日期 */
+    @ApiModelProperty(value = "到货日期")
+    private String arrivalTime;
+
+    @ApiModelProperty(value = "0,正常 1, 重复数据")
+    private int statusFlag;
+
     public Long getId() {
         return id;
     }
@@ -278,6 +285,22 @@ public class PurchaseMacodeInfo extends BaseEntity
         this.assetsCode = assetsCode;
     }
 
+    public String getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(String arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public int getStatusFlag() {
+        return statusFlag;
+    }
+
+    public void setStatusFlag(int statusFlag) {
+        this.statusFlag = statusFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java
index 2c21ef7f..59328115 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckDetailsMapper.java
@@ -4,6 +4,7 @@ import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -71,4 +72,10 @@ public interface PurchaseCheckDetailsMapper {
     int deleteCheckDetailsByTaskId(Long taskId);
 
     int updateByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails);
+
+    int updateBindByTaskIdTypeId(PurchaseCheckDetails purchaseCheckDetails);
+
+    BigDecimal selectInputNUmByTypeId(@Param("taskId") Long taskId, @Param("typeId") Long typeId);
+
+    Integer selectBindNUmByTypeId(@Param("typeId") Long typeId, @Param("taskId") Long taskId);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
index 41aa1220..2dcb949d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseMacodeInfoMapper.java
@@ -96,4 +96,10 @@ public interface PurchaseMacodeInfoMapper {
     int deleteMaMachineInfoByMaCode(String maCode);
 
     List<PurchaseMacodeInfo> selectPurchaseMacodeInfo(PurchaseMacodeInfo purchaseMacodeInfo);
+
+    List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo);
+
+    int selectMaCode(String maCode);
+
+    int updateMacodeByType(PurchaseMacodeInfo purchaseMacodeInfo);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java
index c9d67558..e069255b 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseMacodeInfoService.java
@@ -1,9 +1,11 @@
 package com.bonus.sgzb.material.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import com.bonus.sgzb.material.domain.MaInputRecord;
 import com.bonus.sgzb.material.domain.PurchaseMacodeInfo;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
+import com.bonus.sgzb.material.vo.MaInputVO;
 
 import java.util.List;
 
@@ -37,7 +39,7 @@ public interface IPurchaseMacodeInfoService
      * @param purchaseMacodeInfoList 新购验收编号管理purchase_macode_info
      * @return 结果
      */
-    public int insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception;
+    public AjaxResult insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception;
 
     /**
      * 修改新购验收编号管理purchase_macode_info
@@ -67,9 +69,12 @@ public interface IPurchaseMacodeInfoService
 
     int deletePurchaseMacodeInfoById(Long id);
 
-    int modifyManageStatus(MaInputRecord maInputRecord);
+    int modifyManageStatus(MaInputVO maInputVO);
 
     int deletePurchaseMacodeInfoByMaCode(String maCode);
 
     List<PurchaseMacodeInfo> selectPurchaseMacodeInfo(PurchaseMacodeInfo purchaseMacodeInfo);
+
+    List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo);
+
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
index efa47473..590c7f14 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckDetailsServiceImpl.java
@@ -89,7 +89,7 @@ public class PurchaseCheckDetailsServiceImpl implements IPurchaseCheckDetailsSer
 //                    macodeInfoService.insertPurchaseMacodeInfo(macodeInfo);
 //                }
             } else if ("不通过".equals(purchaseCheckDetails.getCheckResult())) {
-                purchaseCheckDetails.setStatus(0);
+                purchaseCheckDetails.setStatus(3);
             } else {
                 purchaseCheckDetails.setStatus(2);
             }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index 72476a36..64373612 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -11,6 +11,8 @@ import com.bonus.sgzb.base.api.domain.MaMachine;
 import com.bonus.sgzb.base.api.domain.MaType;
 import com.bonus.sgzb.base.api.domain.TmTask;
 import com.bonus.sgzb.common.core.utils.StringUtils;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
+import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.BmQrcodeInfo;
 import com.bonus.sgzb.material.domain.MaInputRecord;
 import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
@@ -19,6 +21,7 @@ import com.bonus.sgzb.material.mapper.*;
 import com.bonus.sgzb.material.service.IPurchaseMacodeInfoService;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.material.vo.EquipmentNumberVO;
+import com.bonus.sgzb.material.vo.MaInputVO;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,7 +49,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     private PurchaseCheckDetailsMapper checkDetailsMapper;
 
 
-
     /**
      * 查询新购验收编号管理
      *
@@ -76,10 +78,27 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * @return 结果
      */
     @Override
-    public int insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
+    @Transactional
+    public AjaxResult insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
+        boolean b = true;
+        for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
+            int i = purchaseMacodeInfoMapper.selectMaCode(purchaseMacodeInfo.getMaCode());
+            if (i > 0) {
+                purchaseMacodeInfo.setStatusFlag(1);
+                b = false;
+            } else {
+                purchaseMacodeInfo.setStatusFlag(0);
+            }
+        }
+        if (!b) {
+            return AjaxResult.success(purchaseMacodeInfoList);
+        }
+        PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
             Long typeId = purchaseMacodeInfo.getTypeId();
             String maCode = purchaseMacodeInfo.getMaCode();
+            purchaseCheckDetails.setTypeId(typeId);
+            purchaseCheckDetails.setTaskId(purchaseMacodeInfo.getTaskId());
             if (StringUtils.isNotEmpty(maCode)) {
                 MaMachine maMachine = new MaMachine();
                 maMachine.setTypeId(typeId);
@@ -96,6 +115,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 }
                 maMachine.setMaCode(maCode);
                 maMachine.setCreateTime(new Date());
+                maMachine.setCreateBy(SecurityUtils.getUsername());
                 purchaseMacodeInfoMapper.maMachineAdd(maMachine);
             }
             String qrCode = purchaseMacodeInfo.getQrCode();
@@ -112,8 +132,12 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             purchaseMacodeInfo.setCreateTime(DateUtils.getNowDate());
             purchaseMacodeInfoMapper.insertPurchaseMacodeInfo(purchaseMacodeInfo);
         }
-
-        return 1;
+        Integer bindNum = checkDetailsMapper.selectBindNUmByTypeId(purchaseCheckDetails.getTypeId(), purchaseCheckDetails.getTaskId());
+        // 添加绑定数量
+        purchaseCheckDetails.setBindNum(bindNum + purchaseMacodeInfoList.size());
+        purchaseCheckDetails.setUpdateTime(new Date());
+        checkDetailsMapper.updateBindByTaskIdTypeId(purchaseCheckDetails);
+        return AjaxResult.success();
     }
 
 
@@ -125,10 +149,12 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      */
     @Override
     public int updatePurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
+
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
 
             Long typeId = purchaseMacodeInfo.getTypeId();
             String maCode = purchaseMacodeInfo.getMaCode();
+
             if (StringUtils.isNotEmpty(maCode)) {
                 MaMachine maMachine = new MaMachine();
                 maMachine.setTypeId(typeId);
@@ -160,6 +186,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             purchaseMacodeInfo.setUpdateTime(DateUtils.getNowDate());
             purchaseMacodeInfoMapper.updatePurchaseMacodeInfo(purchaseMacodeInfo);
         }
+
         return 1;
     }
 
@@ -208,17 +235,17 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         for (int i = 0; i < equipmentNumberVO.getCount(); i++) {
             int i1 = count + i;
             // 编码规则
-            String codingRule = "NXJJ" + typeCode + format + specsCode;
+            String codingRule = "NSJJ" + specsCode + format + typeCode;
             String codeNum = "";
             String code = format;
             String code1 = format;
-            if (i1>9 && i1<100){
+            if (i1 > 9 && i1 < 100) {
                 codeNum = "-00" + i1;
                 code1 = "-00" + i1;
-            }else if (i1>99 && i1<1000){
-                codeNum =  "-0" + i1;
-                code1 =  "-0" + i1;
-            }else {
+            } else if (i1 > 99 && i1 < 1000) {
+                codeNum = "-0" + i1;
+                code1 = "-0" + i1;
+            } else {
                 codeNum = "-000" + i1;
                 code1 = "-000" + i1;
             }
@@ -233,14 +260,15 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         }
 
         JSONObject result = new JSONObject();
-        result.put("equipmentNum",list);
-        result.put("twoDimensionalCode",codeList);
+        result.put("equipmentNum", list);
+        result.put("twoDimensionalCode", codeList);
 
         return result;
     }
 
     /**
      * 删除机具编码
+     *
      * @param id 机具编码id
      * @return 结果
      */
@@ -251,52 +279,59 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
 
     /**
      * 修改编码管理的入库状态
-     * @param maInputRecord 入库信息
+     *
+     * @param maInputVO 入库信息
      * @return 结果
      */
     @Override
-    public int modifyManageStatus(MaInputRecord maInputRecord) {
-        Long taskId = maInputRecord.getTaskId();
-        Long typeId = maInputRecord.getTypeId();
-        String checkResult = maInputRecord.getCheckResult();
-        List<Long> maCodeInfoIdList = maInputRecord.getMaCodeInfoIdList();
-        // 修改编码管理的入库状态
-        for (Long maCodeInfoId : maCodeInfoIdList) {
-            MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId);
-            // 库存添加
-            maType.setNum(String.valueOf(maInputRecord.getInputNum().add(new BigDecimal(Integer.parseInt(maType.getNum())))));
-            purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
+    public int modifyManageStatus(MaInputVO maInputVO) {
+        Long taskId = maInputVO.getTaskId();
+        List<MaInputRecord> inputRecordList = maInputVO.getInputRecordList();
+        for (MaInputRecord maInputRecord : inputRecordList) {
+            Long typeId = maInputRecord.getTypeId();
+            String checkResult = maInputRecord.getCheckResult();
 
             // 修改机具入库状态
             MaMachine maMachine = new MaMachine();
             maMachine.setMaId(maInputRecord.getMaId());
             maMachine.setMaCode(maInputRecord.getMaCode());
-            maMachine.setMaStatus("15");
+            maMachine.setMaStatus("1".equals(checkResult) ? "15":"14");
             purchaseMacodeInfoMapper.updateMaMachine(maMachine);
 
             // 修改验收任务详细表入库数量
-            PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
-            purchaseCheckDetails.setTaskId(taskId);
-            purchaseCheckDetails.setTypeId(typeId);
-            purchaseCheckDetails.setInputNum(maInputRecord.getInputNum());
-            checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails);
+            if ("1".equals(checkResult)) {
+                // 修改编码管理的入库状态
+                MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId);
+                // 库存添加
+                maType.setNum(String.valueOf(maInputRecord.getInputNum().add(new BigDecimal(Integer.parseInt(maType.getNum())))));
+                purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
+
+                BigDecimal inputNum = checkDetailsMapper.selectInputNUmByTypeId(taskId, typeId);
+                PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
+                purchaseCheckDetails.setTaskId(taskId);
+                purchaseCheckDetails.setTypeId(typeId);
+                purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum()));
+                purchaseCheckDetails.setStatus(4);
+                checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails);
+            }
 
             // 修改编码管理表入库状态
             PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo();
-            purchaseMacodeInfo.setId(maCodeInfoId);
             purchaseMacodeInfo.setTaskId(taskId);
-            purchaseMacodeInfo.setStatus("通过".equals(checkResult) ? "54":"55");
-            purchaseMacodeInfoMapper.updatePurchaseMacodeInfo(purchaseMacodeInfo);
+            purchaseMacodeInfo.setTypeId(typeId);
+            purchaseMacodeInfo.setStatus("1".equals(checkResult) ? "1" : "0");
+            purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo);
             // 新增入库记录
             purchaseMacodeInfoMapper.insertMaInputRecord(maInputRecord);
         }
 
+
         // 当全部为已入库的时候任务改为入库状态
         Integer count = purchaseMacodeInfoMapper.selectMacodeInfoStatusByTaskId(taskId);
         if (count <= 0) {
             TmTask task = new TmTask();
             task.setTaskId(taskId);
-            task.setTaskStatus(54);
+            task.setTaskStatus(28);
             taskMapper.updateTmTask(task);
         }
 
@@ -305,6 +340,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
 
     /**
      * 根据机具编码删除编码
+     *
      * @param maCode 机具编码
      * @return 结果
      */
@@ -317,6 +353,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
 
     /**
      * 根据类型id和任务id查询编码详情
+     *
      * @param purchaseMacodeInfo
      * @return 结果
      */
@@ -325,4 +362,15 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         return purchaseMacodeInfoMapper.selectPurchaseMacodeInfo(purchaseMacodeInfo);
     }
 
+    /**
+     * 获取入库清单明细
+     *
+     * @param purchaseMacodeInfo 查询条件
+     * @return 结果
+     */
+    @Override
+    public List<PurchaseMacodeInfo> selectPutinDetails(PurchaseMacodeInfo purchaseMacodeInfo) {
+        return purchaseMacodeInfoMapper.selectPutinDetails(purchaseMacodeInfo);
+    }
+
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java
new file mode 100644
index 00000000..02f0a192
--- /dev/null
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/vo/MaInputVO.java
@@ -0,0 +1,25 @@
+package com.bonus.sgzb.material.vo;
+
+import com.bonus.sgzb.material.domain.MaInputRecord;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MaInputVO {
+
+
+    /** 任务ID */
+    @ApiModelProperty(value = "任务ID")
+    private Long taskId;
+
+    @ApiModelProperty(value = "验收结论")
+    private String checkResult;
+
+    /**
+     * 入库记录
+     */
+    private List<MaInputRecord> inputRecordList;
+
+}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
index 1df9c1d1..320db0b6 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
@@ -35,7 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select pcd.id,pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_num, pcd.check_num, pcd.check_result,
         pcd.supplier_id, pcd.status, msi.supplier, pcd.create_by, pcd.production_time, pcd.create_time, pcd.check_url_name,
         pcd.check_url, pcd.file_name, pcd.file_url,pcd.update_by, pcd.update_time, pcd.remark, pcd.company_id,
-        mt1.type_name machineTypeName,mt.type_name specificationType, mt.manage_type manageType, tk.code
+        mt1.type_name machineTypeName,mt.type_name specificationType, mt.manage_type manageType, tk.code ,mt.type_name typeName,
+        mt.unit_name unitName
         from purchase_check_details pcd
         left join ma_type mt on pcd.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
@@ -196,6 +197,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPurchaseCheckDetailsStatus" resultType="int">
         select count(*) from purchase_check_details where task_id = #{taskId} and status != 1
     </select>
+    <select id="selectInputNUmByTypeId" resultType="java.math.BigDecimal">
+        select IFNULL(input_num,0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId}
+    </select>
+    <select id="selectBindNUmByTypeId" resultType="java.lang.Integer">
+        select IFNULL(bind_num, 0) from purchase_check_details where task_id = #{taskId} and type_id = #{typeId}
+    </select>
 
     <delete id="deleteCheckDetailsByTaskId">
         delete from purchase_check_details where task_id = #{taskId}
@@ -204,4 +211,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateByTaskIdTypeId">
         update purchase_check_details set check_num = #{checkNum} where task_id = #{taskId} and type_id = #{typeId}
     </update>
+    <update id="updateCheckDetails">
+        update purchase_check_details set status = '0' where task_id = #{taskId}
+    </update>
+    <update id="updateBindByTaskIdTypeId">
+        update purchase_check_details set bind_num = #{bindNum} where task_id = #{taskId} and type_id = #{typeId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 60f3adc7..021380bd 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -154,5 +154,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="arrivalTime != null  and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
         <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
         <if test="companyId != null "> and pci.company_id = #{companyId}</if>
+        order by pci.id desc
     </select>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index a4c52b06..1970c17b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPurchaseMacodeInfoList" parameterType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo" resultMap="PurchaseMacodeInfoResult">
         select distinct pcd.task_id, pcd.type_id, pmi.qr_code, pmi.fix_code, pmi.code_type, pmi.status,
-        pmi.remark, pmi.company_id, mt.type_name specificationType,
+        pmi.remark, pmi.company_id, mt.type_name specificationType, pt.arrival_time arrivalTime,
         mt1.type_name typeName, pcd.check_num checkNum, pcd.purchase_num purchaseNum ,
         IFNULL(pcd.bind_num,0) bindNum, mt.code typeCode,mt.model_code specsCode,pt.purchase_time purchaseTime
         from purchase_check_details pcd
@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
         left join purchase_check_info pt on pcd.task_id = pt.task_id
         where pcd.task_id = #{taskId}
+        and mt.manage_type = '0'
         <if test="typeId != null "> and pmi.type_id = #{typeId}</if>
         <if test="keyWord != null and keyWord != ''">(mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})</if>
         <if test="typeName != null  and typeName != ''"> and mt1.type_name = #{typeName}</if>
@@ -200,7 +201,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <select id="selectMacodeInfoStatusByTaskId" resultType="java.lang.Integer">
-        select count(*) from purchase_macode_info where task_id = #{taskId} and status != '54'
+        select count(*) from purchase_macode_info where task_id = #{taskId} and status != '1'
     </select>
 
     <insert id="insertMaInputRecord" parameterType="com.bonus.sgzb.material.domain.MaInputRecord" useGeneratedKeys="true" keyProperty="id">
@@ -256,6 +257,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productionTime != null">pcd.production_time = #{productionTime}</if>
 
     </select>
+    <select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
+        select pcd.production_time productionTime,mt.type_name specificationType, mt1.type_name typeName, pmi.ma_code maCode,
+               mm.assets_code assetsCode ,pmi.fix_code fixCode,pcd.type_id typeId,pcd.task_id taskId, mt.code specsCode,mt1.code typeCode,
+               if(pmi.ma_code is null, if(pcd.status != 4, 0 , pcd.status), pmi.status) status,
+               if(pmi.ma_code is not null,1,pcd.check_num)  checkNum
+        from purchase_check_details pcd
+                     left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id
+                     left join ma_machine mm on pmi.ma_code = mm.ma_code
+                     left join ma_type mt on pcd.type_id = mt.type_id
+                     left join ma_type mt1 on mt.parent_id = mt1.type_id
+        where pcd.task_id = #{taskId}
+    </select>
+    <select id="selectMaCode" resultType="java.lang.Integer">
+        select count(ma_id) from ma_machine where ma_code = #{maCode}
+    </select>
 
     <update id="updateTypeByTypeId">
         update ma_type set num = #{num} where type_id = #{typeId}
@@ -264,4 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateMaMachine">
         update ma_machine set ma_status = #{maStatus} where ma_id = #{maId}
     </update>
+    <update id="updateMacodeByType">
+        update purchase_macode_info set status = #{status} where task_id = #{taskId} and type_id = #{typeId}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/PurchaseNoticePersonController.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/PurchaseNoticePersonController.java
index 3ef7e9ba..1b92733c 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/PurchaseNoticePersonController.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/PurchaseNoticePersonController.java
@@ -2,6 +2,7 @@ package com.bonus.sgzb.system.controller;
 
 import java.util.List;
 
+import com.bonus.sgzb.system.api.domain.SysUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,9 +54,9 @@ public class PurchaseNoticePersonController extends BaseController
     @ApiOperation(value ="新增新购短信通知人员")
     @Log(title = "新购短信通知人员", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PurchaseNoticePerson purchaseNoticePerson)
+    public AjaxResult add(@RequestBody List<PurchaseNoticePerson> purchaseNoticePersonList)
     {
-        return toAjax(purchaseNoticePersonService.insertPurchaseNoticePerson(purchaseNoticePerson));
+        return toAjax(purchaseNoticePersonService.insertPurchaseNoticePersonList(purchaseNoticePersonList));
     }
 
     /**
@@ -63,9 +64,20 @@ public class PurchaseNoticePersonController extends BaseController
      */
     @RequiresPermissions("删除新购短信通知人员")
     @Log(title = "删除新购短信通知人员", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{id}")
-    public AjaxResult remove(@PathVariable Long id)
+	@DeleteMapping("/{userId}")
+    public AjaxResult remove(@PathVariable Long userId)
     {
-        return toAjax(purchaseNoticePersonService.deletePurchaseNoticePersonById(id));
+        return toAjax(purchaseNoticePersonService.deletePurchaseNoticePersonById(userId));
+    }
+
+
+    /**
+     * 通知人员添加查询接口
+     * @param sysUser
+     * @return
+     */
+    @GetMapping("/notification")
+    public AjaxResult notification(SysUser sysUser) {
+        return success(purchaseNoticePersonService.getUserByRoleList(sysUser));
     }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/PurchaseNoticePersonMapper.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/PurchaseNoticePersonMapper.java
index 1df292e0..cc36f641 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/PurchaseNoticePersonMapper.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/PurchaseNoticePersonMapper.java
@@ -1,6 +1,8 @@
 package com.bonus.sgzb.system.mapper;
 
 import java.util.List;
+
+import com.bonus.sgzb.system.api.domain.SysUser;
 import com.bonus.sgzb.system.domain.PurchaseNoticePerson;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -48,10 +50,10 @@ public interface PurchaseNoticePersonMapper
     /**
      * 删除新购短信通知人员purchase_notice_person
      * 
-     * @param id 新购短信通知人员purchase_notice_person主键
+     * @param userId 新购短信通知人员purchase_notice_person主键
      * @return 结果
      */
-    public int deletePurchaseNoticePersonById(Long id);
+    public int deletePurchaseNoticePersonById(Long userId);
 
     /**
      * 批量删除新购短信通知人员purchase_notice_person
@@ -60,4 +62,6 @@ public interface PurchaseNoticePersonMapper
      * @return 结果
      */
     public int deletePurchaseNoticePersonByIds(Long[] ids);
+
+    List<PurchaseNoticePerson> getUserByRoleList(SysUser sysUser);
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/IPurchaseNoticePersonService.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/IPurchaseNoticePersonService.java
index c8cfd8dd..c2c2ec54 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/IPurchaseNoticePersonService.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/IPurchaseNoticePersonService.java
@@ -1,6 +1,8 @@
 package com.bonus.sgzb.system.service;
 
 import java.util.List;
+
+import com.bonus.sgzb.system.api.domain.SysUser;
 import com.bonus.sgzb.system.domain.PurchaseNoticePerson;
 
 /**
@@ -54,8 +56,13 @@ public interface IPurchaseNoticePersonService
     /**
      * 删除新购短信通知人员purchase_notice_person信息
      * 
-     * @param id 新购短信通知人员purchase_notice_person主键
+     * @param userId 新购短信通知人员purchase_notice_person主键
      * @return 结果
      */
-    public int deletePurchaseNoticePersonById(Long id);
+    public int deletePurchaseNoticePersonById(Long userId);
+
+    List<PurchaseNoticePerson> getUserByRoleList(SysUser sysUser);
+
+    int insertPurchaseNoticePersonList(List<PurchaseNoticePerson> purchaseNoticePersonList);
+
 }
diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/PurchaseNoticePersonServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/PurchaseNoticePersonServiceImpl.java
index ec623671..41d90d29 100644
--- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/PurchaseNoticePersonServiceImpl.java
+++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/PurchaseNoticePersonServiceImpl.java
@@ -1,6 +1,8 @@
 package com.bonus.sgzb.system.service.impl;
 
 import java.util.List;
+
+import com.bonus.sgzb.system.api.domain.SysUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bonus.sgzb.system.mapper.PurchaseNoticePersonMapper;
@@ -84,12 +86,35 @@ public class PurchaseNoticePersonServiceImpl implements IPurchaseNoticePersonSer
     /**
      * 删除新购短信通知人员purchase_notice_person信息
      * 
-     * @param id 新购短信通知人员purchase_notice_person主键
+     * @param userId 新购短信通知人员purchase_notice_person主键
      * @return 结果
      */
     @Override
-    public int deletePurchaseNoticePersonById(Long id)
+    public int deletePurchaseNoticePersonById(Long userId)
     {
-        return purchaseNoticePersonMapper.deletePurchaseNoticePersonById(id);
+        return purchaseNoticePersonMapper.deletePurchaseNoticePersonById(userId);
+    }
+
+    /**
+     * 查询添加人员
+     * @param sysUser
+     * @return
+     */
+    @Override
+    public List<PurchaseNoticePerson> getUserByRoleList(SysUser sysUser) {
+        return purchaseNoticePersonMapper.getUserByRoleList(sysUser);
+    }
+
+    /**
+     * 批量添加人员
+     * @param purchaseNoticePersonList
+     * @return
+     */
+    @Override
+    public int insertPurchaseNoticePersonList(List<PurchaseNoticePerson> purchaseNoticePersonList) {
+        for (PurchaseNoticePerson purchaseNoticePerson : purchaseNoticePersonList) {
+            insertPurchaseNoticePerson(purchaseNoticePerson);
+        }
+        return 1;
     }
 }
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml
index b206e6a5..7055873e 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/PurchaseNoticePersonMapper.xml
@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          left join sys_dept d on u.dept_id = d.dept_id
          left join sys_dept d1 on d.parent_id = d1.dept_id
          left join sys_dept d2 on d1.parent_id = d2.dept_id
-        where r.role_id = #{roleId} and u.status = '0'
+        where u.status = '0'
 
     </select>
     
@@ -32,17 +32,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectPurchaseNoticePersonVo"/>
         where id = #{id}
     </select>
-        
+    <select id="getUserByRoleList" resultType="com.bonus.sgzb.system.domain.PurchaseNoticePerson">
+        select u.user_id userId, u.dept_id deptId, u.nick_name nickName, u.user_name userName, u.avatar, u.phonenumber telphone,
+               concat(d2.dept_name,'/',d1.dept_name,'/',d.dept_name) deptName,r.role_name roleName
+        from sys_user u
+         left join sys_user_role sur on u.user_id = sur.user_id
+         left join sys_role r on sur.role_id = r.role_id
+         left join sys_dept d on u.dept_id = d.dept_id
+         left join sys_dept d1 on d.parent_id = d1.dept_id
+         left join sys_dept d2 on d1.parent_id = d2.dept_id
+        where u.status = '0' and u.del_flag = '0' and u.user_id not in (select user_id from purchase_notice_person)
+    </select>
+
     <insert id="insertPurchaseNoticePerson" parameterType="com.bonus.sgzb.system.domain.PurchaseNoticePerson">
         insert into purchase_notice_person
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="userId != null">user_id,</if>
             <if test="userName != null">user_name,</if>
             <if test="telphone != null">telphone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="userId != null">#{userId},</if>
             <if test="userName != null">#{userName},</if>
             <if test="telphone != null">#{telphone},</if>
@@ -60,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deletePurchaseNoticePersonById" parameterType="Long">
-        delete from purchase_notice_person where id = #{id}
+        delete from purchase_notice_person where user_id = #{userId}
     </delete>
 
     <delete id="deletePurchaseNoticePersonByIds" parameterType="String">
diff --git a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
index 91d6c5ec..3547a57d 100644
--- a/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/sgzb-modules/sgzb-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -229,6 +229,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.remark
 		from sys_user u
 		left join sys_user_role sur on u.user_id = sur.user_id
-		where u.status = '0' and u.del_flag = '0' and sur.role_id = #{roleId}
+		where u.status = '0' and u.del_flag = '0'
+			<if test="roleId != null" >
+				and sur.role_id = #{roleId}
+			</if>
     </select>
 </mapper>
\ No newline at end of file

From 1666636caba83d863b2ec2825c0bcc9e236d696e Mon Sep 17 00:00:00 2001
From: zhouzy062 <zhouzy062@tydic.com>
Date: Fri, 22 Dec 2023 19:16:39 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/store/newBuy/newDevices/newDevicesCode.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
index 6c47b0fe..5b0177b9 100644
--- a/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
+++ b/sgzb-ui/src/views/store/newBuy/newDevices/newDevicesCode.vue
@@ -405,20 +405,10 @@ export default {
       if(this.codeList.length==0){
         this.$modal.msgError("无新增编码绑定");
       }else{
-        
-
-
         editPurchaseMacode(this.codeList).then(response => {
           console.log(response.data)
-          if(response.data && response.data.length>0){
+          if(response.data && response.length>0){
             this.codeList = response.data;
-            // this.codeList.forEach(item=>{
-            //   if(item.statusFlag==1){
-            //     item.maCode=''
-            //   }
-            // })
-
-
           }else{
             this.$modal.msgSuccess("绑定成功");
             this.open = false;

From 7f73c243f50cf32a769f56fd0fc00ed09121b4ea Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Fri, 22 Dec 2023 20:27:35 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E4=B8=8E=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E5=8F=8A=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/controller/TmTaskController.java  | 13 +++++++++++--
 .../bonus/sgzb/app/mapper/TmTaskMapper.java    |  4 ++++
 .../bonus/sgzb/app/service/TmTaskService.java  |  4 ++++
 .../app/service/impl/TmTaskServiceImpl.java    | 18 ++++++++++++++++++
 .../main/resources/mapper/app/TmTaskMapper.xml | 13 ++++++++++++-
 5 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
index 682bf98c..6fffcb5d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java
@@ -278,7 +278,16 @@ public class TmTaskController extends BaseController {
                 if (CollUtil.isEmpty(task.getLeaseApplyInfoList())){
                     return AjaxResult.error("任务表修改完成,但领料任务明细为空，执行失败！");
                 }
-                // 先删除原有的领料任务明细
+
+                // 根据参数判断是否需要修改工程与往来单位
+                if (StringUtils.isNotNull(task.getProjectId()) && StringUtils.isNotNull(task.getUnitId())) {
+                    Integer agreementId = tmTaskService.getAgreementIdByUnit(task);
+                    if (StringUtils.isNotNull(agreementId)) {
+                        task.setAgreementId(agreementId);
+                        tmTaskService.updateAgreementByTask(task);  // 修改任务关联的协议
+                    }
+                }
+
                 for (LeaseApplyInfo leaseApplyInfo : task.getLeaseApplyInfoList()) {
                     if (leaseApplyInfo == null || leaseApplyInfo.getId() == null) {
                         continue;
@@ -286,7 +295,7 @@ public class TmTaskController extends BaseController {
                     if (StringUtils.isEmpty(leaseApplyInfo.getLeaseApplyDetails())) {
                         continue;
                     }
-                    // 执行删除
+                    // 先删除之前的领料明细
                     tmTaskService.deleteDetailsByParentId(String.valueOf(leaseApplyInfo.getId()));
                     // 删除后,插入新地领料任务明细
                     if (StringUtils.isNotNull(leaseApplyInfo.getId())) {
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
index 84af30b0..c5f029ad 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java
@@ -76,9 +76,13 @@ public interface TmTaskMapper {
 
     int insertAgreement(TmTask record);
 
+    int updateAgreementByTask(TmTask record);
+
     int selectNumByMonth(Date nowDate);
 
     TmTask getLeaseListTmTask(TmTask task);
 
     LeaseApplyInfo getLeaseListByLeaseInfo(TmTask task);
+
+    Integer getAgreementIdByUnit(TmTask task);
 }
\ No newline at end of file
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
index 072bf814..5447b5ae 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java
@@ -41,6 +41,10 @@ public interface TmTaskService{
 
     int updateByPrimaryKeySelective(TmTask record);
 
+    Integer getAgreementIdByUnit(TmTask task);
+
+    int updateAgreementByTask(TmTask record);
+
     int updateByPrimaryKey(TmTask record);
 
     int updateBatch(List<TmTask> list);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
index 9c5d98de..2c6953d8 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java
@@ -190,6 +190,24 @@ public class TmTaskServiceImpl implements TmTaskService{
         return tmTaskMapper.updateByPrimaryKeySelective(record);
     }
 
+    /**
+     * @param task 查询条件
+     * @return 协议的id
+     */
+    @Override
+    public Integer getAgreementIdByUnit(TmTask task) {
+        return tmTaskMapper.getAgreementIdByUnit(task);
+    }
+
+    /**
+     * @param record 修改信息
+     * @return 结果
+     */
+    @Override
+    public int updateAgreementByTask(TmTask record) {
+        return tmTaskMapper.updateAgreementByTask(record);
+    }
+
     @Override
     public int updateByPrimaryKey(TmTask record) {
         return tmTaskMapper.updateByPrimaryKey(record);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index 884de84c..a080d55a 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -442,12 +442,17 @@
     </trim>
   </insert>
 
-
     <insert id="insertAgreement">
         INSERT INTO tm_task_agreement ( `task_id`, `agreement_id`, `create_by`, `create_time`, `company_id` )
         VALUES(#{id},#{agreementId},#{createBy},NOW(),#{companyId})
     </insert>
 
+
+  <update id="updateAgreementByTask">
+      update tm_task_agreement set agreement_id = #{agreementId}, update_time = now()
+      where task_id = #{taskId}
+  </update>
+
   <select id="getAuditListByLeaseTmTask" resultType="com.bonus.sgzb.base.api.domain.TmTask">
       SELECT
       tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
@@ -600,4 +605,10 @@
     where
         parennt_id = #{record.parenntId}
   </update>
+
+  <select id="getAgreementIdByUnit" resultType="java.lang.Integer">
+    select agreement_id from bm_agreement_info
+    where unit_id = #{unitId} and project_id = #{projectId}
+  </select>
+
 </mapper>
\ No newline at end of file

From 439536142af23793ba0c932a6a78bd4d691c72e3 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Fri, 22 Dec 2023 21:07:56 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PurchaseMacodeInfoServiceImpl.java       | 8 +++++---
 .../resources/mapper/material/PurchaseCheckInfoMapper.xml | 2 +-
 .../mapper/material/PurchaseMacodeInfoMapper.xml          | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index 64373612..6122bf84 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -137,7 +137,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         purchaseCheckDetails.setBindNum(bindNum + purchaseMacodeInfoList.size());
         purchaseCheckDetails.setUpdateTime(new Date());
         checkDetailsMapper.updateBindByTaskIdTypeId(purchaseCheckDetails);
-        return AjaxResult.success();
+        return AjaxResult.success(new ArrayList<PurchaseMacodeInfo>());
     }
 
 
@@ -286,10 +286,11 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
     @Override
     public int modifyManageStatus(MaInputVO maInputVO) {
         Long taskId = maInputVO.getTaskId();
+        String checkResult = maInputVO.getCheckResult();
         List<MaInputRecord> inputRecordList = maInputVO.getInputRecordList();
         for (MaInputRecord maInputRecord : inputRecordList) {
             Long typeId = maInputRecord.getTypeId();
-            String checkResult = maInputRecord.getCheckResult();
+
 
             // 修改机具入库状态
             MaMachine maMachine = new MaMachine();
@@ -303,7 +304,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 // 修改编码管理的入库状态
                 MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId);
                 // 库存添加
-                maType.setNum(String.valueOf(maInputRecord.getInputNum().add(new BigDecimal(Integer.parseInt(maType.getNum())))));
+                maType.setNum(maInputRecord.getInputNum().add(maType.getNum() == null ? new BigDecimal(0):maType.getNum()));
                 purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
 
                 BigDecimal inputNum = checkDetailsMapper.selectInputNUmByTypeId(taskId, typeId);
@@ -319,6 +320,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
             PurchaseMacodeInfo purchaseMacodeInfo = new PurchaseMacodeInfo();
             purchaseMacodeInfo.setTaskId(taskId);
             purchaseMacodeInfo.setTypeId(typeId);
+            purchaseMacodeInfo.setMaCode(maInputRecord.getMaCode());
             purchaseMacodeInfo.setStatus("1".equals(checkResult) ? "1" : "0");
             purchaseMacodeInfoMapper.updateMacodeByType(purchaseMacodeInfo);
             // 新增入库记录
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index 021380bd..dd57cac0 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
         left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index 1970c17b..058248c4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -282,5 +282,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <update id="updateMacodeByType">
         update purchase_macode_info set status = #{status} where task_id = #{taskId} and type_id = #{typeId}
+        and ma_code = #{maCode}
     </update>
 </mapper>
\ No newline at end of file

From 86acb6308be10fd3340b22de4304d945676af620 Mon Sep 17 00:00:00 2001
From: syruan <1555146157@163.com>
Date: Fri, 22 Dec 2023 21:23:00 +0800
Subject: [PATCH 15/19] =?UTF-8?q?mapper=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
index a080d55a..9dcb6e28 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
@@ -496,7 +496,7 @@
       <if test="record.keyWord != null and record.keyWord != ''">
           AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
       </if>
-      ORDER BY tt.update_time DESC
+      GROUP BY tt.task_id
   </select>
 
   <select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.base.api.domain.LeaseApplyInfo">

From b721caef07ae042d78ee610036ce3e9f24a912b4 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Sat, 23 Dec 2023 10:16:59 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/sgzb/base/api/domain/MaType.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
index ceebe3ac..51a1f848 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -44,7 +45,7 @@ public class MaType extends BaseEntity {
 
     /** 实时库存 */
     @ApiModelProperty(value = "实时库存")
-    private String num;
+    private BigDecimal num;
 
     /** 计量单位id */
     @ApiModelProperty(value = "计量单位id")
@@ -215,11 +216,11 @@ public class MaType extends BaseEntity {
         this.status = status;
     }
 
-    public String getNum() {
+    public BigDecimal getNum() {
         return num;
     }
 
-    public void setNum(String num) {
+    public void setNum(BigDecimal num) {
         this.num = num;
     }
 

From 2380d978484853a0448c5551eee2d018c536daaa Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Sat, 23 Dec 2023 10:24:00 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/app/domain/BackApplyInfo.java  |  4 +
 sgzb-modules/sgzb-material/pom.xml            |  6 ++
 .../controller/BackApplyController.java       | 74 +++++++++++++------
 .../sgzb/material/domain/BackApplyInfo.java   | 21 ++++++
 .../sgzb/material/mapper/BackApplyMapper.java |  1 +
 .../mapper/material/BackApplyMapper.xml       |  2 +-
 6 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
index 6c6e55c3..57bcff3d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java
@@ -86,4 +86,8 @@ public class BackApplyInfo {
     private String lotId;
     private String unitId;
     private String backTime;
+    /**
+     * 机具管理方式
+     */
+    private String manageType;
 }
diff --git a/sgzb-modules/sgzb-material/pom.xml b/sgzb-modules/sgzb-material/pom.xml
index 58250b58..5e87c9f4 100644
--- a/sgzb-modules/sgzb-material/pom.xml
+++ b/sgzb-modules/sgzb-material/pom.xml
@@ -101,6 +101,12 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.16</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <properties>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index bcece98c..5c7b1d4e 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -1,5 +1,8 @@
 package com.bonus.sgzb.material.controller;
 
+import cn.hutool.core.collection.CollUtil;
+import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
+import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
 import com.bonus.sgzb.common.core.utils.StringUtils;
 import com.bonus.sgzb.common.core.web.controller.BaseController;
 import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@@ -107,42 +110,67 @@ public class BackApplyController extends BaseController {
             bean.setTaskStatus("37");
             // 创建任务
             boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
+
             if (addTaskResult && bean.getTaskId() != null) {
                 //任务协议表(tm_task_agreement)
-                Boolean addTaskAgreementRes = backApplyService.insertTaskAgreement(bean)>0;
-                if (addTaskAgreementRes){
-                    //退料任务表(back_apply_info)
-                    Boolean addBackApply=backApplyService.insertBackApply(bean)>0;
-                    if (addBackApply && bean.getId()!=null){
-                        if (!StringUtils.isEmpty(bean.getTypeId()) && !StringUtils.isEmpty(bean.getNum())){
-                            String[] typeId = bean.getTypeId().split(",");
-                            String[] num = bean.getNum().split(",");
-                            for (int i=0;i< typeId.length;i++){
-                                String typeIdStr=typeId[i];
-                                String numStr=num[i];
-                                bean.setTypeId(typeIdStr);
-                                bean.setNum(numStr);
-                                int re =backApplyService.upload(bean);
-                                if (re<1){
-                                    return AjaxResult.error("退料申请详情创建失败");
+                Boolean addTaskAgreementRes = backApplyService.insertTaskAgreement(bean) > 0;
+                if (addTaskAgreementRes && bean.getBackApplyInfo() != null) {
+                    if (CollUtil.isEmpty(bean.getBackApplyDetails())) {
+                        return AjaxResult.error("退料设备明细为空，请重新选择后上传!");
+                    }
+                    if (StringUtils.isNull(bean.getBackApplyInfo())) {
+                        return AjaxResult.error("退料任务信息为空，请重新选择后上传!");
+                    }
+
+                    Integer taskId = bean.getTaskId();
+                    // 根据设备所属分公司拆分集合
+                    List<List<BackApplyInfo>> backApplyInfoList = CollUtil.groupByField(bean.getBackApplyDetails(), "companyId");
+                    // 对拆分后的集合进行each遍历
+                    for (List<BackApplyInfo> leaseApplyDetailsList : backApplyInfoList) {
+                        // 判断拆分后的集合内是否有数据
+                        if (CollUtil.isNotEmpty(leaseApplyDetailsList)) {
+                            // 对领料任务表的对象做数据处理
+                            BackApplyInfo backApplyInfo = bean.getBackApplyInfo();
+                            backApplyInfo.setCode(code); // 创建领料单号
+                            backApplyInfo.setTaskId(taskId); // 设置任务ID
+                            backApplyInfo.setCompanyId(leaseApplyDetailsList.get(0).getCompanyId()); // 设置设备所属分公司,用于交给哪家审核
+
+                            // 创建领料任务，返回领料任务编号
+                            boolean addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0;
+                            // 领料任务创建完成，进行领料任务明细插入
+                            if (addLeaseTaskResult) {
+                                // 领料任务编号
+                                Long backApplyInfoId = backApplyInfo.getId();
+                                if (StringUtils.isNotNull(backApplyInfoId)) {
+                                    for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
+                                        leaseApplyDetails.setId(backApplyInfoId); // 设置领料任务ID
+                                        // 插入领料任务明细
+                                        boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
+                                        if (!addLeaseTaskDetailsResult) {
+                                            return AjaxResult.error("退料任务创建成功，但退料任务明细插入失败");
+                                        }
+                                    }
+                                    return AjaxResult.success("退料申请成功,已完成");
+                                } else {
+                                    return AjaxResult.error("退料任务编号为空");
                                 }
+                            } else {
+                                return AjaxResult.error("创建退料任务失败,或退料明细为空");
                             }
                         }else {
-                            return AjaxResult.error("未获取到物料类型或数量");
+                            return AjaxResult.error("创建任务失败，缺少数据");
                         }
-                    }else {
-                        return AjaxResult.error("创建退料申请失败");
                     }
-                }else {
-                    return AjaxResult.error("创建任务协议失败");
+                } else {
+                    return AjaxResult.error("创建任务失败");
                 }
-            } else {
+            }else {
                 return AjaxResult.error("创建任务失败");
             }
-            return AjaxResult.success("退料申请创建成功,已完成");
         } catch (Exception e) {
             return AjaxResult.error("创建任务失败," + e.getCause().toString() + "," + e.getMessage());
         }
+        return AjaxResult.error("任务创建失败");
     }
 
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
index 8899b53b..ede86674 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.material.domain;
 
+import com.bonus.sgzb.base.api.domain.LeaseApplyInfo;
 import com.bonus.sgzb.common.core.annotation.Excel;
 import com.bonus.sgzb.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
 * @description 退料
@@ -164,4 +166,23 @@ public class BackApplyInfo extends BaseEntity {
     @ApiModelProperty(value = "等级")
     private String level;
 
+
+    /**
+     * 退料任务实体
+     */
+    @ApiModelProperty(value="退料任务实体")
+    private BackApplyInfo backApplyInfo;
+
+    /**
+     * 退料任务实体集合
+     */
+    @ApiModelProperty(value="退料任务实体集合")
+    private List<BackApplyInfo> backApplyInfoList;
+
+    /**
+     * 退料任务实体集合
+     */
+    @ApiModelProperty(value="退料任务实体集合")
+    private List<BackApplyInfo> backApplyDetails;
+
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
index 8fd11290..32d9264f 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
@@ -1,5 +1,6 @@
 package com.bonus.sgzb.material.mapper;
 
+import com.bonus.sgzb.base.api.domain.LeaseApplyDetails;
 import com.bonus.sgzb.material.domain.AgreementInfo;
 import com.bonus.sgzb.material.domain.BackApplyInfo;
 import com.bonus.sgzb.material.domain.TypeTreeNode;
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index b8a90977..4640cc23 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         )
     </insert>
 
-    <insert id="upload">
+    <insert id="upload" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
         insert into back_apply_details
         (
         <if test="id != null">

From 2265d0cebca47a5a77611c07a19a1e33895943cc Mon Sep 17 00:00:00 2001
From: bns_han <1604366271@qq.com>
Date: Sat, 23 Dec 2023 10:58:55 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E9=80=80=E6=96=99?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/material/controller/BackApplyController.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
index 5c7b1d4e..1177bc8b 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java
@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
-* @description 退料申请
+* @description 退料申请--后台
 * @author hay
 * @date   2023/12/20 11:46
 */
@@ -34,11 +34,11 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "获取退料审核列表")
     @GetMapping("/getBackApplyList")
-    public TableDataInfo getBackApplyList(@RequestBody BackApplyInfo bean)
+    public AjaxResult getBackApplyList(BackApplyInfo bean)
     {
         startPage();
         List<BackApplyInfo> list = backApplyService.getBackApplyList(bean);
-        return getDataTable(list);
+        return AjaxResult.success(getDataTable(list));
     }
 
     @ApiOperation(value = "在用设备类型树")

From 52a96de54561eaf3386c8e3029669031d47e5c31 Mon Sep 17 00:00:00 2001
From: dingjie <lucky971003@163.com>
Date: Sat, 23 Dec 2023 11:45:38 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/MaMachineMapper.xml       | 2 +-
 .../material/service/impl/PurchaseMacodeInfoServiceImpl.java | 5 +++--
 .../resources/mapper/material/PurchaseCheckDetailsMapper.xml | 2 +-
 .../resources/mapper/material/PurchaseCheckInfoMapper.xml    | 3 ++-
 .../resources/mapper/material/PurchaseMacodeInfoMapper.xml   | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 19490687..7a4bacd0 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND type_id = #{typeId}
             </if>
         </where>
-        order by m.id desc
+        order by m.ma_id desc
     </select>
 
 
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index 6122bf84..3d04a4d9 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -304,14 +304,15 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 // 修改编码管理的入库状态
                 MaType maType = purchaseMacodeInfoMapper.selectTypeByTypeId(typeId);
                 // 库存添加
-                maType.setNum(maInputRecord.getInputNum().add(maType.getNum() == null ? new BigDecimal(0):maType.getNum()));
+                maType.setNum((maInputRecord.getInputNum() == null ? new BigDecimal(0):maInputRecord.getInputNum())
+                        .add(maType.getNum() == null ? new BigDecimal(0):maType.getNum()));
                 purchaseMacodeInfoMapper.updateTypeByTypeId(maType);
 
                 BigDecimal inputNum = checkDetailsMapper.selectInputNUmByTypeId(taskId, typeId);
                 PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
                 purchaseCheckDetails.setTaskId(taskId);
                 purchaseCheckDetails.setTypeId(typeId);
-                purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum()));
+                purchaseCheckDetails.setInputNum(inputNum.add(maInputRecord.getInputNum() == null ? new BigDecimal(0):maInputRecord.getInputNum()));
                 purchaseCheckDetails.setStatus(4);
                 checkDetailsMapper.updateByTaskIdTypeId(purchaseCheckDetails);
             }
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
index 320db0b6..59d52a8f 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml
@@ -209,7 +209,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <update id="updateByTaskIdTypeId">
-        update purchase_check_details set check_num = #{checkNum} where task_id = #{taskId} and type_id = #{typeId}
+        update purchase_check_details set check_num = #{checkNum},status = #{status} where task_id = #{taskId} and type_id = #{typeId}
     </update>
     <update id="updateCheckDetails">
         update purchase_check_details set status = '0' where task_id = #{taskId}
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
index dd57cac0..ba6a973d 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
@@ -144,10 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
         left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id
+        left join sys_user su on pci.purchaser = su.user_id
         where task_type = 23 and tk.task_status in (26,28)
         <if test="purchaseTime != null  and purchaseTime != ''"> and tk.code = #{code}</if>
         <if test="purchaseTime != null  and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
index 058248c4..3c1061a4 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
@@ -260,7 +260,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPutinDetails" resultType="com.bonus.sgzb.material.domain.PurchaseMacodeInfo">
         select pcd.production_time productionTime,mt.type_name specificationType, mt1.type_name typeName, pmi.ma_code maCode,
                mm.assets_code assetsCode ,pmi.fix_code fixCode,pcd.type_id typeId,pcd.task_id taskId, mt.code specsCode,mt1.code typeCode,
-               if(pmi.ma_code is null, if(pcd.status != 4, 0 , pcd.status), pmi.status) status,
+               if(pmi.ma_code is null, if(pcd.status != 4, 0 , 1), pmi.status) status,
                if(pmi.ma_code is not null,1,pcd.check_num)  checkNum
         from purchase_check_details pcd
                      left join purchase_macode_info pmi on pmi.task_id = pcd.task_id and pmi.type_id = pcd.type_id