备品备件查询报表修改

op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java

@@ -50,9 +50,21 @@ public class EquSparepartsInOut extends BaseEntity {
     @Excel(name = "工厂号")
     private String factoryCode;
 
+    private String nickName;
+
+
+
     ///////////////////////////
     private String storageId;
 
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     public void setId(String id) {
         this.id = id;
     }

op-modules/op-device/src/main/resources/mapper/device/EquSparepartsInOutMapper.xml

@@ -15,12 +15,13 @@
         <result property="attr2" column="attr2"/>
         <result property="attr3" column="attr3"/>
         <result property="createBy" column="create_by"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="factoryCode" column="factory_code"/>
-        <result property="storageId"	column="storage_id"	/>
+        <result property="nickName"	column="nick_name"	/>
     </resultMap>
 
     <sql id="selectEquSparepartsInOutVo">
@@ -28,7 +29,27 @@
 	</sql>
 
     <select id="selectEquSparepartsInOutList" parameterType="EquSparepartsInOut"  resultMap="EquSparepartsInOutResult">
-        <include refid="selectEquSparepartsInOutVo"/>
+        SELECT
+        id,
+        in_out_type,
+        order_no,
+        spare_code,
+        spare_name,
+        amount,
+        attr1,
+        attr2,
+        attr3,
+        esio.create_by,
+        esio.create_time,
+        esio.update_by,
+        esio.update_time,
+        esio.del_flag,
+        factory_code,
+        storage_id,
+        su.nick_name
+        FROM
+        equ_spareparts_in_out esio
+        LEFT JOIN lanju_op_cloud.dbo.sys_user su ON esio.create_by = su.user_name
         <where>
             <if test="inOutType != null  and inOutType != ''">and in_out_type = #{inOutType}</if>
             <if test="orderNo != null  and orderNo != ''">and order_no = #{orderNo}</if>
@@ -38,13 +59,13 @@
             <if test="attr1 != null  and attr1 != ''">and attr1 = #{attr1}</if>
             <if test="attr2 != null  and attr2 != ''">and attr2 = #{attr2}</if>
             <if test="attr3 != null  and attr3 != ''">and attr3 = #{attr3}</if>
-            <if test="createTime != null ">and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
-            <if test="updateTime != null ">and update_time = #{updateTime}</if>
-            and del_flag = '0'
+            <if test="createTime != null ">and esio.create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and esio.update_by = #{updateBy}</if>
+            <if test="updateTime != null ">and esio.update_time = #{updateTime}</if>
+            and esio.del_flag = '0'
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
         </where>
-        order by create_time desc
+        order by esio.create_time desc
     </select>
 
     <select id="selectEquSparepartsInOutById" parameterType="String" resultMap="EquSparepartsInOutResult">

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWork.java

@@ -216,6 +216,15 @@ public class MesReportWork extends BaseEntity {
 	private String sapCode;
 	private String remark;
 	private String checkResult;
+	private String useManRemark;
+
+	public String getUseManRemark() {
+		return useManRemark;
+	}
+
+	public void setUseManRemark(String useManRemark) {
+		this.useManRemark = useManRemark;
+	}
 
 	public String getCheckResult() {
 		return checkResult;

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkTabs.java

@@ -20,8 +20,17 @@ public class MesReportWorkTabs extends BaseEntity {
 	private static final long serialVersionUID = 1L;
     private String libId;
 	private String title;
+	private String useManRemark;
 	private List<MesReportWork> libList;
 
+	public String getUseManRemark() {
+		return useManRemark;
+	}
+
+	public void setUseManRemark(String useManRemark) {
+		this.useManRemark = useManRemark;
+	}
+
 	public String getLibId() {
 		return libId;
 	}

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -191,6 +191,7 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 
 		pTabs.setLibList(liblist0);
 		pTabs.setRemark(liblist0.get(0).getRemark());
+		pTabs.setUseManRemark(liblist0.get(0).getUseManRemark());
 		tabs.add(pTabs);
 
 		ProOrderWorkorder sonWorkOrder = mesReportWorkMapper.getSonWorkOrder(mesReportWork.getWorkorderCode());
@@ -277,13 +278,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateTime(nowTime);
 			mesReportWork.setUpdateBy(updateBy);
 		}
-        //统一备注
+        //统一备注、用人情况说明
 //        List<String> remarks = mesReportWorkMapper.getUnionRemark(mesReportWorks.get(0).getWorkorderCode());
 //		if(!CollectionUtils.isEmpty(remarks)){
 			for(MesReportWork mesReportWork:mesReportWorks){
 				mesReportWork.setRemark(mesReportWorks.get(0).getRemark());
+				mesReportWork.setUseManRemark(mesReportWorks.get(0).getUseManRemark());
 			}
-//		}
+
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -669,7 +669,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			pow.workorder_code_sap workorderCodeSap,
 		    mrw.remark,mrw.report_code reportCode,
 		    mrw.machine_code machineCode,
-		    mrw.attr1,mrw.upload_status uploadStatus
+		    mrw.attr1,mrw.upload_status uploadStatus,
+		    mrw.use_man_remark useManRemark
 		from mes_report_work mrw
 		left join pro_order_workorder pow on mrw.workorder_code = pow.workorder_code
 		where mrw.del_flag='0' and pow.del_flag = '0'
@@ -1694,7 +1695,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				<if test="item.batch != null">batch = #{item.batch},</if>
 				update_by = #{item.updateBy},
 				update_time = #{item.updateTime},
-			    remark = #{item.remark}
+			    remark = #{item.remark},
+			    use_man_remark = #{item.useManRemark}
 			where
 			id = #{item.id}
 		</foreach>