Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

bonus-modules/bonus-material/src/main/java/com/bonus/material/input/domain/InputApplyDetails.java

@@ -61,4 +61,9 @@ public class InputApplyDetails extends BaseEntity {
 
     @ApiModelProperty(value = "二维码")
     private String qrCode;
+
+    /**
+     * 修饰入库任务编号
+     */
+    private String inputCode;
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -746,6 +746,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                         details.setCheckUser(SecurityUtils.getLoginUser().getUserid());
                         updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
                     }
+
                 }
                 if (!CollectionUtils.isEmpty(numList)) {
                     for (PurchaseCheckDetails details : numList) {

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairInputInfo.java

@@ -75,4 +75,9 @@ public class RepairInputInfo extends BaseEntity {
      * 修饰入库人
      */
     private String auditBy;
+
+    /**
+     * 修饰入库单号
+     */
+    private String inputCode;
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/codeCollection/WsMaInfoMapper.xml

@@ -133,7 +133,7 @@
         phone,
         result
         FROM ws_ma_info wmi
-        WHERE is_active = '1'
+        WHERE 1=1
         <if test="keyWord != null and keyWord != ''">
             and ( ma_name like concat('%', #{keyWord}, '%') or
             ma_model like concat('%', #{keyWord}, '%') or
@@ -185,7 +185,6 @@
         WHERE ma_code = #{maCode}
           and ma_name = #{maName}
           and ma_model = #{maModel}
-          and is_active = '1'
     </select>
     <select id="getInfoByTypeAndModelAndCode" resultType="com.bonus.material.codeCollection.domain.WsMaInfo">
         SELECT id,
@@ -213,10 +212,10 @@
     </insert>
     <insert id="addWsMaInfoData">
         INSERT INTO ws_ma_info (ma_name, ma_model, ma_code, this_check_time, next_check_time,
-                                repair_man, check_man, phone, result, model_id, is_active, opt_user, opt_time)
+                                repair_man, check_man, phone, result, model_id, opt_user, opt_time)
         VALUES (#{maName}, #{maModel}, #{maCode}, #{thisCheckTime},
                 #{nextCheckTime},
-                #{repairMan}, #{checkMan}, #{phone}, #{result}, #{modelId}, '1', #{optUser}, now())
+                #{repairMan}, #{checkMan}, #{phone}, #{result}, #{modelId}, #{optUser}, now())
     </insert>
 
     <update id="update" parameterType="com.bonus.material.codeCollection.domain.WsMaInfo">

bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml

@@ -501,7 +501,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             '1' as devType
         FROM
             ws_ma_info mi
-        WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%') and mi.is_active = 1
+        WHERE mi.ma_code LIKE CONCAT('%',#{maCode},'%')
         UNION
         SELECT
             mm.ma_id AS id,

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairInputDetailsMapper.xml

@@ -150,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             rid.id as id,
             rid.task_id as taskId,
+            tt.`code` as inputCode,
             rid.ma_id as maId,
             rid.type_id as typeId,
             SUM(IFNULL(rid.repair_num, 0)) as repairNum,
@@ -171,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             rid.reject_reason as rejectReason,
             mt4.type_id as firstId
         from repair_input_details rid
+        LEFT JOIN tm_task tt on tt.task_id=rid.task_id
         LEFT JOIN ma_type mt on rid.type_id = mt.type_id and mt.del_flag = '0'
         LEFT JOIN ma_type mt1 on mt.parent_id = mt1.type_id and mt1.del_flag = '0'
         LEFT JOIN tm_task_agreement tta ON rid.task_id = tta.task_id
@@ -499,9 +501,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectInputInfoByMaId" resultMap="RepairInputDetailsResult">
-        select id, task_id, ma_id, type_id,  input_num,  create_by, create_time, update_by, update_time, remark, company_id from repair_input_details
-        where status = '0' and ma_id = #{maId}
-            limit 1
+        SELECT
+            rid.id,
+            rid.task_id,
+            tt.`code` as inputCode,
+            rid.ma_id,
+            rid.type_id,
+            rid.input_num,
+            rid.create_by,
+            rid.create_time,
+            rid.update_by,
+            rid.update_time,
+            rid.remark,
+            rid.company_id
+        FROM
+            repair_input_details  rid
+                LEFT JOIN tm_task tt on tt.task_id=rid.task_id
+        WHERE
+            rid.STATUS = '0'
+          AND rid.ma_id = #{maId}
+
+            LIMIT 1
     </select>
 
     <update id="updateInputNum">