原材料接收页面展示问题修改

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialReceiveLogMapper.xml

@@ -21,7 +21,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,meterialCode,tradeMark,used_num,lastNum,
-        meterial_id, furnace_batch_no, bom_batch_no, batch_stand, factory, meterial_batch_no, factory_date
+        meterial_id, furnace_batch_no, bom_batch_no, batch_stand, factory, meterial_batch_no, factory_date,operationName
     </sql>
 
 
@@ -30,7 +30,8 @@
         select
         <include refid="Base_Column_List"/>
         from (SELECT
-        l.*,m.meterial_code meterialCode,m.trade_mark tradeMark,(ifnull(l.batch_stand, 0) - ifnull(l.used_num, 0))lastNum
+        l.*,m.meterial_code meterialCode,m.trade_mark tradeMark,(ifnull(l.batch_stand, 0) - ifnull(l.used_num, 0)) AS lastNum,
+        (select cau.name from c_auth_user cau where cau.id = l.create_user) AS operationName
         from imcs_m_meterial_receive_log l
         left join imcs_m_meterial m on l.meterial_id = m.id
         ) s ${ew.customSqlSegment}

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterialReceiveLog.java

@@ -139,6 +139,11 @@ public class MMeterialReceiveLog extends Entity<Long> {
     @Excel(name = "剩余数量")
     private Integer lastNum;
 
+    @ApiModelProperty(value = "操作人")
+    @TableField(exist = false)
+    @Excel(name = "操作人")
+    private String operationName;
+
 
     @Builder
     public MMeterialReceiveLog(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,