1

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

@@ -86,6 +86,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
     private TaskTypeService taskTypeService;
     @Resource
     private ReportMapper reportMapper;
+    @Resource
+    private SysFunctionService sysFunctionService;
 
     @Value(value = "${upload.path}")
     private String path;
@@ -113,21 +115,33 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
             LocalDate now = LocalDate.now();
             queryWrapper.eq("start_date",(planType==0||planType==2)?now:now.plusDays(1));
         }
-        /*作为工长看到的数据*/
-        if(count(new QueryWrapper<Plan>().eq("foreman_id",user.getId()))>0){
-            queryWrapper.and(wrapper->wrapper.and(wr->wr.eq("foreman_id",user.getId()).eq("status",1)).or().eq("create_id",user.getId()));
-        }else {
-            /*作为组员可以查看的数据*/
-            List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("company_id", companyId).eq("user_id", user.getId()));
-            List<Integer> collect=new ArrayList<>();
-            if(prodProcedureTeams!=null&&prodProcedureTeams.size()>0){
-                List<Integer> ids = prodProcedureTeams.stream().map(ProdProcedureTeam::getPlanProcedureId).collect(Collectors.toList());
-                List<PlanProcedureTotal> list = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().in("id", ids));
-                collect = list.stream().map(PlanProcedureTotal::getPlanId).distinct().collect(Collectors.toList());
+        //判断是否有查看全部数据的权限
+        boolean canViewAll=false;
+        switch (planType){
+            case 0: canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部今日计划");
+                break;
+            case 1: canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部明日计划");
+                break;
+            case 2: canViewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部插单计划");
+                break;
+        }
+        if(!canViewAll){
+            /*作为工长看到的数据*/
+            if(count(new QueryWrapper<Plan>().eq("foreman_id",user.getId()))>0){
+                queryWrapper.and(wrapper->wrapper.and(wr->wr.eq("foreman_id",user.getId()).eq("status",1)).or().eq("create_id",user.getId()));
+            }else {
+                /*作为组员可以查看的数据*/
+                List<ProdProcedureTeam> prodProcedureTeams = prodProcedureTeamService.list(new QueryWrapper<ProdProcedureTeam>().eq("company_id", companyId).eq("user_id", user.getId()));
+                List<Integer> collect=new ArrayList<>();
+                if(prodProcedureTeams!=null&&prodProcedureTeams.size()>0){
+                    List<Integer> ids = prodProcedureTeams.stream().map(ProdProcedureTeam::getPlanProcedureId).collect(Collectors.toList());
+                    List<PlanProcedureTotal> list = planProcedureTotalService.list(new QueryWrapper<PlanProcedureTotal>().in("id", ids));
+                    collect = list.stream().map(PlanProcedureTotal::getPlanId).distinct().collect(Collectors.toList());
+                }
+                collect.add(-1);
+                List<Integer> finalCollect = collect;
+                queryWrapper.and(wrapper->wrapper.in("id", finalCollect).or().eq("create_id",user.getId()));
             }
-            collect.add(-1);
-            List<Integer> finalCollect = collect;
-            queryWrapper.and(wrapper->wrapper.in("id", finalCollect).or().eq("create_id",user.getId()));
         }
         if(!StringUtils.isEmpty(steelStampNumber)){
             queryWrapper.apply("'"+steelStampNumber+"'"+" between steel_stamp_number_start AND steel_stamp_number_end");
@@ -764,12 +778,12 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     stringBuilder.append("工序名称:"+prodProcedure.getName()+"\n"
                             +"         产品名称:"+product.getName()+"\n"
                             +"         排产工单号:"+plan.getProductSchedulingNum());
-                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,userIds,stringBuilder.toString(),planType==0?"todayPlan":"tomorrowPlan",null);
+                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,userIds,stringBuilder.toString(),planType==0?"plan/today":"plan/tomorrow",null);
                 }else {
                     stringBuilder.append("插单计划  ");
                     stringBuilder.append("任务名称:"+plan.getTaskName()+"\n"
                             +"               任务变更通知号:"+plan.getTaskChangeNoticeNum());
-                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,userIds,stringBuilder.toString(),"InsertionPlan",null);
+                    wxCorpInfoService.sendWXCorpMsg(wxCorpInfo,userIds,stringBuilder.toString(),"plan/orderInsert",null);
                 }
 
             }

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

@@ -276,10 +276,10 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
                 //费用报销
                 title = "收到新的插单计划";
             }
-            else if("todayPlan".equals(pageRouter)||"tomorrowPlan".equals(pageRouter)){
+            else if(("plan/today".equals(pageRouter)||"plan/tomorrow".equals(pageRouter))&&corpUserid.split("|").length>1){
                 title="收到新的工作安排";
             }
-            else if("InsertionPlan".equals(pageRouter)){
+            else if("plan/orderInsert".equals(pageRouter)){
                 title="收到新的插单计划";
             }
             cardJson.put("title", title);

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/orderInsert.vue

@@ -240,6 +240,7 @@ export default {
         endDate: "",
         describtion: "",
         versionNumber: "",
+        checkType:0,
       },
        taskTypeForm: {
         id: null,
@@ -507,6 +508,8 @@ export default {
             this.todayPlanForm.stationId[
             this.todayPlanForm.stationId.length - 1
             ];  
+          this.$delete(this.todayPlanForm, 'product')
+          this.$delete(this.todayPlanForm, 'planProcedureTotals')
           this.http.post(
             "/plan/addOrUpdatePlan",
             {

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/plan/planComponent.vue

@@ -105,7 +105,10 @@
             {{ "-" }}
             <el-input class="w45" v-model="todayPlanForm.steelStampNumberEnd" maxlength="20"></el-input>
           </el-form-item>
-          <el-form-item label="进度" style="width: 100%" prop="progress">
+          <el-form-item label="计划总工价" v-if="this.titleName==='编辑今日计划'"  prop="planTotalWages">
+            <el-input v-model="todayPlanForm.planTotalWages" ></el-input>
+          </el-form-item>
+          <el-form-item label="进度"  :style="this.titleName==='编辑今日计划'?'':'width: 100%'" prop="progress">
             <el-input v-model="todayPlanForm.progress" maxlength="20"></el-input>
           </el-form-item>
           <el-form-item label="数量" prop="num">
@@ -232,6 +235,7 @@ export default {
         endDate: "",
         describtion: "",
         versionNumber: "",
+        planTotalWages:0
       },
       todayTabIndex: 0,
       tableDataLoading: false,