aps-报工时更新主表中加工参数/检测参数bug修复

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsReportCheckoutDao.java

@@ -19,6 +19,6 @@ public interface ApsReportCheckoutDao extends BaseMapper<ApsReportCheckoutDo> {
      * @param reportId
      * @return
      */
-    @Select("SELECT GROUP_CONCAT( CONCAT( CHECKITEM, '=', CHECKPARAMETER ) ) AS 'JCCS' FROM aps_report_checkout WHERE DELETED = '0' AND MAINID = #{mainid} GROUP BY MAINID")
+    @Select("SELECT GROUP_CONCAT( CONCAT( CHECKITEM, '=', CHECKPARAMETER ) ) AS 'JCCS' FROM aps_report_checkout WHERE DELETED = '0' AND MAINID = #{reportId} GROUP BY MAINID")
     String selectJccsByReportId(String reportId);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsReportRecordsServiceImpl.java

@@ -1184,7 +1184,7 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
             String jgcs = apsReportMachiningService.selectJgcsByReportId(apsReportRecordsDo.getId());
             String jccs = apsReportCheckoutService.selectJccsByReportId(apsReportRecordsDo.getId());
             apsReportRecordsDo.setReportjgcs(jgcs);
-            apsReportRecordsDo.setReportjgcs(jccs);
+            apsReportRecordsDo.setReportjccs(jccs);
             this.updateById(apsReportRecordsDo);
 
 //        //物理删除原来的报工记录输出物料