报工更新remark

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

@@ -179,10 +179,10 @@ public class MesReportWork extends BaseEntity {
 	private String routeCode;
 	private String sac1;
 	private String sac2;
-	private String  sac3;
-	private String  sac4;
-	private String  sac5;
-	private String  sac6;
+	private String sac3;
+	private String sac4;
+	private String sac5;
+	private String sac6;
 	private String prodType;
 	private String createTimeStart;
 	private String createTimeEnd;

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java

@@ -144,4 +144,6 @@ public interface MesReportWorkMapper {
     List<MesReportWorkConsume> getUpdateAttr1Boms(MesReportWork workorderCode);
 
     int updateAttr2(MesReportWork workorder);
+
+    void updateReportRemark(@Param("list") List<MesReportWork> mesReportWork);
 }

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

@@ -8,7 +8,6 @@ import java.util.*;
 
 import com.alibaba.fastjson2.JSONArray;
 import com.baomidou.dynamic.datasource.annotation.DS;
-import com.op.common.core.constant.SecurityConstants;
 import com.op.common.core.domain.R;
 import com.op.common.core.utils.DateUtils;
 import com.op.common.core.utils.ServletUtils;
@@ -260,6 +259,9 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			mesReportWork.setUpdateTime(nowTime);
 			mesReportWork.setUpdateBy(updateBy);
 		}
+		//会更新好几次//着急发布后面再说
+		mesReportWorkMapper.updateReportRemark(mesReportWorks);
+
 		return mesReportWorkMapper.submitReportPS(mesReportWorks);
 	}
 

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

@@ -868,8 +868,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			    work_time = #{item.workTime},
 				use_man = #{item.useMan},
 				update_by = #{item.updateBy},
-				update_time = #{item.updateTime},
-				remark = #{item.remark}
+				update_time = #{item.updateTime}
 			where
 			id = #{item.id}
 		</foreach>
@@ -886,6 +885,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            set attr2 = '1'
 		where parent_order = #{workorderCode} and attr1= '1'
 	</update>
+	<update id="updateReportRemark">
+		<foreach collection="list" item="item" separator=";">
+			update mes_report_work set remark = #{item.remark}
+			where workorder_code = #{item.workorderCode}
+		</foreach>
+	</update>
 
 	<delete id="deleteMesReportWorkById" parameterType="String">
 		update mes_report_work set del_flag = '1' where id = #{id}