生产日报表代码修改

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

@@ -10,6 +10,7 @@ import com.op.mes.domain.dto.QuantityDto;
 import com.op.mes.domain.dto.SysFactoryDto;
 import com.op.mes.domain.vo.DynamicColumnVo;
 import com.op.mes.domain.vo.MesDailyReportVo;
+import com.op.mes.domain.vo.MesDailyReportVos;
 import com.op.mes.domain.vo.MesMonthReportVo;
 import com.op.system.api.domain.SysNoticeGroup;
 import com.op.system.api.domain.SysUser;
@@ -202,7 +203,7 @@ public interface MesReportWorkMapper {
     //当月产线品类汇总
     List<Map> getmonthProductionSutCategory(MesMonthReportVo mesMonthReportVo);
 
-    Map getProductReason(QuantityDto quantityDto);
+    MesDailyReportVos getProductReason(QuantityDto quantityDto);
 
     String getTypeName(String productCode);
 

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

@@ -28,6 +28,7 @@ import com.op.mes.domain.dto.QuantityDto;
 import com.op.mes.domain.dto.SysFactoryDto;
 import com.op.mes.domain.vo.DynamicColumnVo;
 import com.op.mes.domain.vo.MesDailyReportVo;
+import com.op.mes.domain.vo.MesDailyReportVos;
 import com.op.mes.domain.vo.MesMonthReportVo;
 import com.op.mes.service.IWCSInterfaceService;
 import com.op.system.api.RemoteSapService;
@@ -452,14 +453,15 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 			quantityDto.setWorkorderCode(workorderCode);
 			quantityDto.setMachineCode(machineCode);
 			//影响效率原因/用人说明
-			Map reasons = mesReportWorkMapper.getProductReason(quantityDto);
-			if((reasons != null && !reasons.isEmpty()) &&
-					StringUtils.isNotBlank(reasons.get("Reasons").toString()) &&
-					StringUtils.isNotBlank(reasons.get("useManRemark").toString())){
-				dto.setReason(reasons.get("Reasons").toString().replaceAll(";+", " "));
-				dto.setUseManRemark(reasons.get("useManRemark").toString().replaceAll(";+", " "));
+			MesDailyReportVos mesDailyReportVos = mesReportWorkMapper.getProductReason(quantityDto);
+			if (mesDailyReportVos!=null){
+				if (StringUtils.isNotBlank(mesDailyReportVos.getReason())){
+					dto.setReason(mesDailyReportVos.getReason().replaceAll(";+", " "));
+				}
+				if (StringUtils.isNotBlank(mesDailyReportVos.getUseManRemark())){
+					dto.setUseManRemark(mesDailyReportVos.getUseManRemark().replaceAll(";+", " "));
+				}
 			}
-
 			QuantityDto parentMesReport = mesReportWorkMapper.getRealQuantity(quantityDto);
 			QuantityDto sonMesReport = mesReportWorkMapper.getSumQuantity(quantityDto);
 			if(sonMesReport == null){//单层工单的情况

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

@@ -1112,19 +1112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getmonthProductionSutCategory" statementType="CALLABLE" resultType="java.util.Map" parameterType="MesMonthReportVo">
 		{CALL GeneratePivotReportCategory(#{params.beginTime, jdbcType=DATE}, #{params.endTime, jdbcType=DATE})}
 	</select>
-	<select id="getProductReason" resultType="java.util.Map">
-		SELECT
-			remark AS Reasons,
-			use_man_remark AS useManRemark
-		FROM
-			mes_report_work  where workorder_code = #{workorderCode} and del_flag = '0'
-			                   and Reason is not null
-		                       and reason !=''
-		                       and reason !='无'
-		GROUP BY
-		    use_man_remark,
-			remark;
-	</select>
+
 	<select id="getTypeName" resultType="java.lang.String">
 		select top 1 category from base_product_attached where product_code = #{productCode}
 	</select>
@@ -1786,4 +1774,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			product_order = #{workorderCodeSap}
 		  AND product_code = #{productCode}
 	</select>
+	<select id="getProductReason" resultType="com.op.mes.domain.vo.MesDailyReportVos">
+				SELECT
+			remark AS reason,
+			use_man_remark AS useManRemark
+		FROM
+			mes_report_work  where workorder_code = #{workorderCode} and del_flag = '0'
+			                   and Reason is not null
+		                       and reason !=''
+		                       and reason !='无'
+		GROUP BY
+		    use_man_remark,
+			remark;
+	</select>
 </mapper>