领料接口优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/TmTask.java

@@ -37,8 +37,8 @@ public class TmTask extends BaseEntity {
     private Integer taskStatus;
 
     /** 编号 */
-    @Excel(name = "编号")
-    @ApiModelProperty(value = "编号")
+    @Excel(name = "任务编号")
+    @ApiModelProperty(value = "任务编号，如新购单号，领料单号，退料单号等")
     private String code;
 
     /** 数据所属组织 */

bonus-modules/bonus-material/src/main/java/com/bonus/material/task/domain/vo/TmTaskRequestVo.java

@@ -24,8 +24,8 @@ public class TmTaskRequestVo extends BaseEntity {
     @ApiModelProperty(value = "任务状态(定义数据字典)")
     private Integer taskStatus;
 
-    /** 编号 */
-    @Excel(name = "编号")
+    /** 任务编号，如新购单号，领料单号，退料单号等 */
+    @Excel(name = "任务编号")
     @ApiModelProperty(value = "编号")
     private String code;
 

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseOutDetailsMapper.xml

@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 WHEN 0 THEN
                     IFNULL(subquery0.num, 0)
                 ELSE
-                    IFNULL(mt.num, 0)
+                    IFNULL(mt.storage_num, 0)
                 END as num
         FROM ma_type mt
                  left join (SELECT mt.type_id,

bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml

@@ -131,20 +131,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getAuditListByLeaseTmTask" resultType="com.bonus.material.task.domain.vo.TmTaskRequestVo">
         SELECT DISTINCT
-        tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
+        tt.task_id as taskId, tt.task_type as taskType, tt.task_status as taskStatus, tt.status, tt.code,
+        su.phonenumber AS phoneNumber, sd.dept_name as deptName,
         bpl.pro_id as proId,bpl.pro_name as projectName,
         bui.unit_id as unitId,bui.unit_name as unitName,
         lai.lease_person as leasePerson, lai.phone as leasePhone, tt.create_by as applyFor,
---         d.`name` as taskName,
         lai.lease_type as leaseType,lai.estimate_lease_time as estimateLeaseTime,
---         case when d.id = '31' then lai.company_audit_remark
---         when d.id = '32' then lai.dept_audit_remark
---         when d.id = '33' then lai.direct_audit_remark
---         when d.id = '98' then lai.company_audit_remark
---         when d.id = '99' then lai.dept_audit_remark
---         when d.id = '100' then lai.direct_audit_remark
---         end examineStatus,
---         d.id as examineStatusId,
         bai.agreement_code as agreementCode,
         tt.create_time as createTimes, tt.update_time as updateTimes
         FROM
@@ -156,7 +148,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN bm_project bpl ON bpl.pro_id = bai.project_id
         LEFT JOIN bm_unit bui ON bui.unit_id = bai.unit_id
         LEFT JOIN lease_apply_info lai ON lai.task_id = tt.task_id
-        -- LEFT JOIN sys_dic d ON d.id = tt.task_status
         WHERE
         tt.task_type = 2 and tt.status = '1'
         <if test="record.taskId != null and record.taskId != '' ">
@@ -250,7 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             lad.*, mt.type_name AS typeModelName, mt1.type_name AS typeName,mt.unit_name as unitName, mt.manage_type as manageType,
             case WHEN mt.manage_type = '0' then '编号' else '计数' end manageTypeName,
-            mt.num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
+            mt.storage_num, (lad.pre_num - IF(lad.al_num IS NULL,'0',lad.al_num)) AS outNum,mm.ma_code as maCode
         FROM
             lease_apply_details lad
                 LEFT JOIN ma_type mt ON lad.type_id = mt.type_id