共享工序时，员工填报钢印号不能重复

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -214,7 +214,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         //检查钢印号是否已经被同工序里面的其他人报过了
         if (!StringUtils.isEmpty(report.getSteelNumArray())) {
             JSONArray steelArray = JSONArray.parseArray(report.getSteelNumArray());
-            List<Report> reports = reportMapper.selectList(new QueryWrapper<Report>().eq("plan_id", plan.getId()).eq("prod_procedure_id", prodProcedureTeam.getPlanProcedureId()).ne("creator_id", token));
+            List<Report> reports = reportMapper.selectList(new QueryWrapper<Report>().eq("plan_id", plan.getId()).eq("prod_procedure_id", report.getProdProcedureId()).ne("creator_id", token));
             if (reports.size() > 0) {
                 //循环steelArray;
                 String s = "";

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -230,7 +230,7 @@ export default {
           if (res.code == "ok") {
             this.$toast.success('提交成功')
           } else {
-            this.$toast.fail(res.msg);
+            this.$toast.fail({ message: res.msg, duration: 5000});
           }
         }).catch(err => { this.$toast.clear(); });
     },