From e645a8c95452c852256656312050823eb4481ecf Mon Sep 17 00:00:00 2001
From: erdanergou <p17686264821@163.com>
Date: Wed, 29 Mar 2023 14:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../depository_manage/entity/ExcelInfo.java   |   8 ++-
 .../mapper/MaterialTypeMapper.java            |   7 ++
 .../mapper/MaterialTypeMapper.xml             |  61 ++++++++++--------
 .../service/MaterialTypeService.java          |   7 ++
 .../impl/DepositoryRecordServiceImpl.java     |  16 +++--
 .../service/impl/ExcelServiceImpl.java        |  13 +++-
 .../service/impl/MaterialTypeServiceImpl.java |  10 +++
 .../static/upload/materialImport.xlsx         | Bin 9429 -> 9506 bytes
 .../form-step-look_minRecordOut.html          |   1 +
 .../pages/scanQrCode/ScanBarOrQrCodeOut.html  |  45 +++++++------
 .../depository_manage/TestForOther.java       |  11 ++--
 .../mapper/MaterialTypeMapper.xml             |  61 ++++++++++--------
 .../classes/static/upload/materialImport.xlsx | Bin 9429 -> 9506 bytes
 .../form-step-look_minRecordOut.html          |   1 +
 .../pages/scanQrCode/ScanBarOrQrCodeOut.html  |  45 +++++++------
 15 files changed, 174 insertions(+), 112 deletions(-)

diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
index 35285590..5d01bb07 100644
--- a/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
+++ b/src/main/java/com/dreamchaser/depository_manage/entity/ExcelInfo.java
@@ -28,9 +28,15 @@ public class ExcelInfo {
     private String mname;
 
     /** 物料种类id */
-    @ExcelProperty(value = "物料种类编码")
+    @ExcelProperty(value = "物料类型编码")
     private Long typeId;
 
+    /**
+     * 物料种类名称
+     */
+    @ExcelProperty(value = "物料类型名称")
+    private String typeName;
+
     /** 物料状态   */
     @ExcelProperty(value = "状态",converter = ExcelStateInfoConverter.class)
     private Integer state;
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java
index 1d5454ed..6f62df26 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.java
@@ -35,6 +35,13 @@ public interface MaterialTypeMapper {
      */
     MaterialType findMaterialTypeById(Integer id);
 
+    /**
+     * 根据类型名称查询物料类型
+     * @param name
+     * @return
+     */
+    MaterialType findMaterialTypeByName(String name);
+
     /**
      * 根据id查询物料类型
      * @param oldId 物料类型id
diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
index beef38b0..0381fcb1 100644
--- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
+++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
@@ -6,9 +6,9 @@
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="materialTypeMap" type="com.dreamchaser.depository_manage.entity.MaterialType">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="tname" property="tname" jdbcType="VARCHAR" />
-        <result column="introduce" property="introduce" jdbcType="VARCHAR" />
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="tname" property="tname" jdbcType="VARCHAR"/>
+        <result column="introduce" property="introduce" jdbcType="VARCHAR"/>
         <result column="state" property="state" jdbcType="INTEGER"/>
         <result column="parentId" property="parentId" jdbcType="INTEGER"/>
         <result column="oldId" property="oldId" jdbcType="INTEGER"/>
@@ -18,20 +18,20 @@
         mt.id, mt.tname, mt.introduce, mt.state,mt.parentId,mt.oldId
     </sql>
     <!-- This code was generated by TableGo tools, mark 2 end. -->
-    
+
     <!-- 查询所有数据 -->
-        <select id="findMaterialTypeAll" resultMap="materialTypeMap">
+    <select id="findMaterialTypeAll" resultMap="materialTypeMap">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
         where mt.state != 3 and mt.state != 4
     </select>
     <!-- 查询所有顶级父类 -->
     <select id="findMaterialTypeNoParent" resultMap="materialTypeMap">
         select
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
-        where  mt.state = 1 and mt.parentId = 0
+        where mt.state = 1 and mt.parentId = 0
     </select>
 
     <select id="findMaterialTypeCountByCondition" resultType="int" parameterType="map">
@@ -43,7 +43,7 @@
         <if test="introduce != null and introduce != ''">
             AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
         </if>
-        <if test="state != null and state != ''" >
+        <if test="state != null and state != ''">
             and mt.state = #{state}
         </if>
         <if test="parentId != null">
@@ -57,7 +57,7 @@
     <!-- 根据条件参数查询数据列表 -->
     <select id="findMaterialTypeByCondition" resultMap="materialTypeMap" parameterType="map">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE 1 = 1
         <if test="tname != null and tname != ''">
             AND mt.tname LIKE CONCAT('%', #{tname}, '%')
@@ -65,7 +65,7 @@
         <if test="introduce != null and introduce != ''">
             AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
         </if>
-        <if test="state != null and state != ''" >
+        <if test="state != null and state != ''">
             and mt.state = #{state}
         </if>
         <if test="parentId != null">
@@ -80,7 +80,7 @@
             LIMIT #{begin},#{size}
         </if>
     </select>
-    
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeNameById" resultType="string" parameterType="integer">
         SELECT
@@ -98,15 +98,15 @@
     <!-- 根据父类查询数据 -->
     <select id="findMaterialTypeByParent" resultMap="materialTypeMap" parameterType="long">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
-         WHERE mt.parentId = #{parentId}
+        WHERE mt.parentId = #{parentId}
     </select>
 
     <!-- 根据主键批量获取数据 -->
     <select id="findMaterialTypeByOldIds" resultMap="materialTypeMap" parameterType="list">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
         WHERE mt.oldId in
         <foreach collection="list" index="index" item="item" open="("
@@ -119,14 +119,19 @@
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE mt.oldId = #{id} and mt.state != 3 and mt.state != 4
     </select>
+    <select id="findMaterialTypeByName" resultMap="materialTypeMap" parameterType="string">
+        SELECT
+        <include refid="allColumns"/>
+        FROM material_type mt WHERE mt.tname = #{name} and mt.state != 3 and mt.state != 4 group by tname
+    </select>
 
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeByOldId" resultMap="materialTypeMap" parameterType="long">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE mt.oldId = #{oldId} and mt.state != 3 and mt.state != 4
     </select>
     <!-- 根据主键查询数据
@@ -152,7 +157,7 @@
             #{oldId}
         )
     </insert>
-    
+
     <!-- 批量插入数据
          <insert id="insertMaterialTypes" parameterType="list">
         INSERT INTO material_type (
@@ -167,7 +172,7 @@
         </foreach>
     </insert>-->
 
-    
+
     <!-- 修改数据 -->
     <update id="updateMaterialType" parameterType="map">
         UPDATE material_type
@@ -187,9 +192,9 @@
         </set>
         WHERE oldId = #{id}
     </update>
-    
+
     <!-- 批量修改数据 -->
-        <update id="updateMaterialTypes" parameterType="list">
+    <update id="updateMaterialTypes" parameterType="list">
         <foreach collection="list" index="index" item="item" separator=";">
             UPDATE material_type
             <set>
@@ -210,21 +215,21 @@
         </foreach>
     </update>
 
-    
+
     <!-- 根据主键删除数据 -->
     <delete id="deleteMaterialTypeById" parameterType="int">
         DELETE FROM material_type WHERE oldId = #{id}
     </delete>
-    
-<!--     根据主键批量删除数据-->
-      <delete id="deleteMaterialTypeByIds" parameterType="list">
+
+    <!--     根据主键批量删除数据-->
+    <delete id="deleteMaterialTypeByIds" parameterType="list">
         DELETE FROM material_type WHERE oldId IN
         <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        </delete>
+    </delete>
 
-<!-- 根据主键将状态改为删除-->
+    <!-- 根据主键将状态改为删除-->
     <update id="changeStateToDeletedById" parameterType="int">
         update material_type
         <set>
@@ -234,7 +239,7 @@
     </update>
 
 
-<!-- 根据主键批量将状态改为删除-->
+    <!-- 根据主键批量将状态改为删除-->
     <update id="changeStateToDeletedByIds" parameterType="list">
         update material_type
         <set>
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java b/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java
index a0d5f0a1..0c83e0f2 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/MaterialTypeService.java
@@ -69,6 +69,13 @@ public interface MaterialTypeService {
      * @return 对应记录
      */
     MaterialType findMaterialTypeById(Integer id);
+
+    /**
+     * 根据类型名称查询物料类型
+     * @param name
+     * @return
+     */
+    MaterialType findMaterialTypeByName(String name);
     /**
      * 根据OldId查询对应物料类型
      * @param OldId
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
index 60585175..adb43171 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java
@@ -1040,7 +1040,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     restResponse.setStatusInfo(new StatusInfo("出库失败", "当前位置未发现该物料"));
                     return restResponse;
                 }
-            } else { // 如果是默认库位
+            }
+            else { // 如果是默认库位
                 Map<String, Object> params = new HashMap<>();
                 params.put("mid", inventory.getId());
                 params.put("pid", 0);
@@ -1125,7 +1126,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 restResponse.setData("");
                 restResponse.setStatusInfo(new StatusInfo("出库失败", "出库失败，库存不足"));
             }
-        } else {
+        }
+        else {
             // 如果是拆单后的出库
 
             // 用于获取对应的拆单记录
@@ -1795,8 +1797,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
 
                 // 用于获取映射关系
                 Map<String, Object> paramForPlaceAndMaterial = new HashMap<>();
-                paramForPlaceAndMaterial.put("mid", placeById.getId());
-                paramForPlaceAndMaterial.put("iid", inventoryById.getId());
+                paramForPlaceAndMaterial.put("iid", placeById.getId());
+                paramForPlaceAndMaterial.put("mid", inventoryById.getId());
                 // 获取库存与库存之间的映射
                 MaterialAndPlace placeAndMaterialByMidAndPid = placeMapper.findPlaceAndMaterialByMidAndPid(paramForPlaceAndMaterial);
 
@@ -1815,7 +1817,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     materialMapper.updateInventory(inventoryById);
                     placeMapper.updateMaterialAndPlace(placeAndMaterialByMidAndPid);
                     placeMapper.UpdatePlace(placeById);
-                } else {
+                }
+                else {
                     // 如果是拆单
 
                     Map<String, Object> paramForSplitInfo = new HashMap<>();
@@ -1836,7 +1839,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                     paramForUpdateSplitInventory.put("quantity", returnQuantity);
                     paramForUpdateSplitInventory.put("mid", inventoryById.getMid());
                     paramForUpdateSplitInventory.put("unit", unit);
-                    result = splitUnitService.realInInventoryToDepository(returnQuantity, splitInventory, paramForUpdateSplitInventory, splitInfo, placeAndMaterialByMidAndPid, false);
+                    result = splitUnitService.realInInventoryToDepository(returnQuantity, splitInventory, paramForUpdateSplitInventory, splitInfo, placeAndMaterialByMidAndPid, true);
                     if (paramForUpdateSplitInventory.containsKey("applicationInId")) {
                         depositoryRecordMapper.deleteApplicationInRecordById(ObjectFormatUtil.toInteger(paramForUpdateSplitInventory.get("applicationInId")));
                     }
@@ -1931,6 +1934,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         // 修改当前已经出库的数量
         applicationOutMinById.setTrueOut((int) ((trueOut * 100) + applicationOutMinById.getTrueOut()));
         if (applicationOutMinById.getQuantity() - applicationOutMinById.getTrueOut() > 0) {
+            applicationOutMinById.setPlaceId(placeId);
             // 如果当前子订单中的物料并未完全出库
             depositoryRecordMapper.updateApplicationOutRecordMin(applicationOutMinById);
         } else {
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
index edb4236e..1f802f4d 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java
@@ -112,7 +112,14 @@ public class ExcelServiceImpl implements ExcelService {
                 param.put("unit", excelVo.getUnit());
                 param.put("version", excelVo.getVersion());
                 param.put("texture", excelVo.getTexture());
-                param.put("materialTypeId", excelVo.getTypeId());
+                Long typeId = excelVo.getTypeId();
+                if (typeId != null) {
+                    param.put("materialTypeId", typeId);
+                }else{
+                    String typeName = excelVo.getTypeName();
+                    MaterialType materialTypeByName = materialTypeService.findMaterialTypeByName(typeName);
+                    param.put("materialTypeId", materialTypeByName.getOldId());
+                }
                 param.put("id", excelVo.getId());
                 param.put("brand", excelVo.getBrand());
                 param.put("price", excelVo.getPrice() == null ? "0" : excelVo.getPrice());
@@ -517,8 +524,8 @@ public class ExcelServiceImpl implements ExcelService {
         // 定义部门id
         Integer adminorgId = record.getAdminorgId();
 
-        if (adminorgId != null ) {
-            Administration  company = LinkInterfaceUtil.getCompany(adminorgId, userToken);
+        if (adminorgId != null) {
+            Administration company = LinkInterfaceUtil.getCompany(adminorgId, userToken);
             // 设置部门名称
             excelInfoByWrite.setAdminorgName(company.getName());
         } else {
diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java
index 18882007..84db8b33 100644
--- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java
+++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialTypeServiceImpl.java
@@ -159,6 +159,16 @@ public class MaterialTypeServiceImpl implements MaterialTypeService {
         return materialTypeMapper.findMaterialTypeById(id);
     }
 
+    /**
+     * 根据类型名称查询物料类型
+     * @param name
+     * @return
+     */
+    @Override
+    public MaterialType findMaterialTypeByName(String name) {
+        return null;
+    }
+
     @Override
     public MaterialType findMaterialTypeByOldId(Long OldId) {
         return materialTypeMapper.findMaterialTypeByOldId(OldId);
diff --git a/src/main/resources/static/upload/materialImport.xlsx b/src/main/resources/static/upload/materialImport.xlsx
index 55db48171bfd89e5297ad2bb9df49dcae2656ff8..0f24780cfc77bac6b50b38ab99e71766206afc8e 100644
GIT binary patch
delta 3146
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
b0O0yRY0^j@lG;E%QPM|AanKz6AKQNc$cWX9

delta 3037
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
Ti)v7j1h5C9!nDs}e`5aynNySp

diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
index df70e1a0..2950572c 100644
--- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
+++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html
@@ -196,6 +196,7 @@
             $("#editInfo").show();
             $("#quantity").attr("readonly", "readonly");
             $("#quantity").val(quantity);
+            flagForForm = false;
             // $("#unit").empty();
             // $("#unit").append(new Option(unit, "-1"))
         };
diff --git a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
index f0ef0977..8745969c 100644
--- a/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
+++ b/src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
@@ -63,26 +63,31 @@
         } else {
             wxScan = wxScan.parent.wx;
         }
-        wxScan.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-            scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-            success: function (res) {
-                // 回调
-                var result = res.resultStr;//当needResult为1时返回处理结果
-                var req = {};
-                req.qrCode = result;
-                outboundLogic(req);
-
-            },
-            error: function (res) {
-                if (res.errMsg.indexOf('function_not_exist') > 0) {
-                    alert('版本过低请升级')
-                }
-
-            }
-
-        });
+        // wxScan.scanQRCode({
+        //     desc: 'scanQRCode desc',
+        //     needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
+        //     scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+        //     success: function (res) {
+        //         // 回调
+        //         var result = res.resultStr;//当needResult为1时返回处理结果
+        //         var req = {};
+        //         req.qrCode = result;
+        //         outboundLogic(req);
+        //
+        //     },
+        //     error: function (res) {
+        //         if (res.errMsg.indexOf('function_not_exist') > 0) {
+        //             alert('版本过低请升级')
+        //         }
+        //
+        //     }
+        //
+        // });
+
+        var result = "1638361349087338496";//当needResult为1时返回处理结果
+        var req = {};
+        req.qrCode = result;
+        outboundLogic(req);
 
     });
 
diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
index f6e00811..616a0d96 100644
--- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
+++ b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java
@@ -69,12 +69,11 @@ public class TestForOther {
 
     @Test
     public void run() {
-//        ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details();
-//        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
-//        approver.setUserId("PangFuZhen");
-//        approvalInfo.setApprover(approver);
-        ApplicationOutRecordP applicationOutRecordPById = depositoryRecordService.findApplicationOutRecordPById(8);
-        //        depositoryRecordService.reviewByQyWxApprovalOut("5",approvalInfo,"7a0ab47a150869808b24d2f4dbe1bb74","2","202303280016", false,2);
+        ApprovalInfo_Details approvalInfo = new ApprovalInfo_Details();
+        ApprovalInfo_Details_Approver approver = new ApprovalInfo_Details_Approver();
+        approver.setUserId("PangFuZhen");
+        approvalInfo.setApprover(approver);
+                depositoryRecordService.reviewByQyWxApprovalOut("1",approvalInfo,"0f2162ca5229a3e68468c6e9ab957542","2","202303290021", false,2);
 //        depositoryRecordService.reviewByQyWxApprovalIn("[1]",approvalInfo,"460f46eaefb46bb0c171029f62e2cea6","2","202303220009");
 //        UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null);
 //        List<String> s = excelService.writeExcelForPrint(2, 4,userByPort);
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
index beef38b0..0381fcb1 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/MaterialTypeMapper.xml
@@ -6,9 +6,9 @@
     <!-- This code was generated by TableGo tools, mark 1 begin. -->
     <!-- 字段映射 -->
     <resultMap id="materialTypeMap" type="com.dreamchaser.depository_manage.entity.MaterialType">
-        <id column="id" property="id" jdbcType="INTEGER" />
-        <result column="tname" property="tname" jdbcType="VARCHAR" />
-        <result column="introduce" property="introduce" jdbcType="VARCHAR" />
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="tname" property="tname" jdbcType="VARCHAR"/>
+        <result column="introduce" property="introduce" jdbcType="VARCHAR"/>
         <result column="state" property="state" jdbcType="INTEGER"/>
         <result column="parentId" property="parentId" jdbcType="INTEGER"/>
         <result column="oldId" property="oldId" jdbcType="INTEGER"/>
@@ -18,20 +18,20 @@
         mt.id, mt.tname, mt.introduce, mt.state,mt.parentId,mt.oldId
     </sql>
     <!-- This code was generated by TableGo tools, mark 2 end. -->
-    
+
     <!-- 查询所有数据 -->
-        <select id="findMaterialTypeAll" resultMap="materialTypeMap">
+    <select id="findMaterialTypeAll" resultMap="materialTypeMap">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
         where mt.state != 3 and mt.state != 4
     </select>
     <!-- 查询所有顶级父类 -->
     <select id="findMaterialTypeNoParent" resultMap="materialTypeMap">
         select
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
-        where  mt.state = 1 and mt.parentId = 0
+        where mt.state = 1 and mt.parentId = 0
     </select>
 
     <select id="findMaterialTypeCountByCondition" resultType="int" parameterType="map">
@@ -43,7 +43,7 @@
         <if test="introduce != null and introduce != ''">
             AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
         </if>
-        <if test="state != null and state != ''" >
+        <if test="state != null and state != ''">
             and mt.state = #{state}
         </if>
         <if test="parentId != null">
@@ -57,7 +57,7 @@
     <!-- 根据条件参数查询数据列表 -->
     <select id="findMaterialTypeByCondition" resultMap="materialTypeMap" parameterType="map">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE 1 = 1
         <if test="tname != null and tname != ''">
             AND mt.tname LIKE CONCAT('%', #{tname}, '%')
@@ -65,7 +65,7 @@
         <if test="introduce != null and introduce != ''">
             AND mt.introduce LIKE CONCAT('%', #{introduce}, '%')
         </if>
-        <if test="state != null and state != ''" >
+        <if test="state != null and state != ''">
             and mt.state = #{state}
         </if>
         <if test="parentId != null">
@@ -80,7 +80,7 @@
             LIMIT #{begin},#{size}
         </if>
     </select>
-    
+
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeNameById" resultType="string" parameterType="integer">
         SELECT
@@ -98,15 +98,15 @@
     <!-- 根据父类查询数据 -->
     <select id="findMaterialTypeByParent" resultMap="materialTypeMap" parameterType="long">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
-         WHERE mt.parentId = #{parentId}
+        WHERE mt.parentId = #{parentId}
     </select>
 
     <!-- 根据主键批量获取数据 -->
     <select id="findMaterialTypeByOldIds" resultMap="materialTypeMap" parameterType="list">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt
         WHERE mt.oldId in
         <foreach collection="list" index="index" item="item" open="("
@@ -119,14 +119,19 @@
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeById" resultMap="materialTypeMap" parameterType="integer">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE mt.oldId = #{id} and mt.state != 3 and mt.state != 4
     </select>
+    <select id="findMaterialTypeByName" resultMap="materialTypeMap" parameterType="string">
+        SELECT
+        <include refid="allColumns"/>
+        FROM material_type mt WHERE mt.tname = #{name} and mt.state != 3 and mt.state != 4 group by tname
+    </select>
 
     <!-- 根据主键查询数据 -->
     <select id="findMaterialTypeByOldId" resultMap="materialTypeMap" parameterType="long">
         SELECT
-        <include refid="allColumns" />
+        <include refid="allColumns"/>
         FROM material_type mt WHERE mt.oldId = #{oldId} and mt.state != 3 and mt.state != 4
     </select>
     <!-- 根据主键查询数据
@@ -152,7 +157,7 @@
             #{oldId}
         )
     </insert>
-    
+
     <!-- 批量插入数据
          <insert id="insertMaterialTypes" parameterType="list">
         INSERT INTO material_type (
@@ -167,7 +172,7 @@
         </foreach>
     </insert>-->
 
-    
+
     <!-- 修改数据 -->
     <update id="updateMaterialType" parameterType="map">
         UPDATE material_type
@@ -187,9 +192,9 @@
         </set>
         WHERE oldId = #{id}
     </update>
-    
+
     <!-- 批量修改数据 -->
-        <update id="updateMaterialTypes" parameterType="list">
+    <update id="updateMaterialTypes" parameterType="list">
         <foreach collection="list" index="index" item="item" separator=";">
             UPDATE material_type
             <set>
@@ -210,21 +215,21 @@
         </foreach>
     </update>
 
-    
+
     <!-- 根据主键删除数据 -->
     <delete id="deleteMaterialTypeById" parameterType="int">
         DELETE FROM material_type WHERE oldId = #{id}
     </delete>
-    
-<!--     根据主键批量删除数据-->
-      <delete id="deleteMaterialTypeByIds" parameterType="list">
+
+    <!--     根据主键批量删除数据-->
+    <delete id="deleteMaterialTypeByIds" parameterType="list">
         DELETE FROM material_type WHERE oldId IN
         <foreach collection="list" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        </delete>
+    </delete>
 
-<!-- 根据主键将状态改为删除-->
+    <!-- 根据主键将状态改为删除-->
     <update id="changeStateToDeletedById" parameterType="int">
         update material_type
         <set>
@@ -234,7 +239,7 @@
     </update>
 
 
-<!-- 根据主键批量将状态改为删除-->
+    <!-- 根据主键批量将状态改为删除-->
     <update id="changeStateToDeletedByIds" parameterType="list">
         update material_type
         <set>
diff --git a/target/classes/static/upload/materialImport.xlsx b/target/classes/static/upload/materialImport.xlsx
index 55db48171bfd89e5297ad2bb9df49dcae2656ff8..0f24780cfc77bac6b50b38ab99e71766206afc8e 100644
GIT binary patch
delta 3146
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
b0O0yRY0^j@lG;E%QPM|AanKz6AKQNc$cWX9

delta 3037
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
Ti)v7j1h5C9!nDs}e`5aynNySp

diff --git a/target/classes/templates/pages/application/form-step-look_minRecordOut.html b/target/classes/templates/pages/application/form-step-look_minRecordOut.html
index df70e1a0..2950572c 100644
--- a/target/classes/templates/pages/application/form-step-look_minRecordOut.html
+++ b/target/classes/templates/pages/application/form-step-look_minRecordOut.html
@@ -196,6 +196,7 @@
             $("#editInfo").show();
             $("#quantity").attr("readonly", "readonly");
             $("#quantity").val(quantity);
+            flagForForm = false;
             // $("#unit").empty();
             // $("#unit").append(new Option(unit, "-1"))
         };
diff --git a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
index f0ef0977..8745969c 100644
--- a/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
+++ b/target/classes/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
@@ -63,26 +63,31 @@
         } else {
             wxScan = wxScan.parent.wx;
         }
-        wxScan.scanQRCode({
-            desc: 'scanQRCode desc',
-            needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
-            scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
-            success: function (res) {
-                // 回调
-                var result = res.resultStr;//当needResult为1时返回处理结果
-                var req = {};
-                req.qrCode = result;
-                outboundLogic(req);
-
-            },
-            error: function (res) {
-                if (res.errMsg.indexOf('function_not_exist') > 0) {
-                    alert('版本过低请升级')
-                }
-
-            }
-
-        });
+        // wxScan.scanQRCode({
+        //     desc: 'scanQRCode desc',
+        //     needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，
+        //     scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有
+        //     success: function (res) {
+        //         // 回调
+        //         var result = res.resultStr;//当needResult为1时返回处理结果
+        //         var req = {};
+        //         req.qrCode = result;
+        //         outboundLogic(req);
+        //
+        //     },
+        //     error: function (res) {
+        //         if (res.errMsg.indexOf('function_not_exist') > 0) {
+        //             alert('版本过低请升级')
+        //         }
+        //
+        //     }
+        //
+        // });
+
+        var result = "1638361349087338496";//当needResult为1时返回处理结果
+        var req = {};
+        req.qrCode = result;
+        outboundLogic(req);
 
     });