1

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/SalesOrderController.java

@@ -106,7 +106,7 @@ public class SalesOrderController {
             return msg;
         }
         if(countName>0){
-            msg.setError("订单名称为["+order.getOrderCode()+"]的订单已存在");
+            msg.setError("订单名称为["+order.getOrderName()+"]的订单已存在");
             return msg;
         }
         //todo：生成操作记录

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/vo/ReportVO.java

@@ -25,5 +25,6 @@ public class ReportVO extends Report {
     private String planType; //生产计划类型， 0-普通计划，1-插单计划
     private LocalDate startDate;
     private LocalDate  endDate;
+    private Integer  seq;
 
 }

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

@@ -101,6 +101,7 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
             procedureMap.put("checker_id", map.get("checker_id"));
             procedureMap.put("check_type", map.get("check_type"));
             procedureMap.put("plan_check_type", map.get("plan_check_type"));
+            procedureMap.put("seq", map.get("seq"));
             procedureList.add(procedureMap);
         }
 

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ProdProcedureTeamMapper.xml

@@ -27,7 +27,7 @@
 
     <select id="getReportForWorkList" resultType="java.util.HashMap" >
         SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id,plan_procedure_total.total_working_hours,plan_procedure_total.total_wages, date_format(plan.`start_date`,'%Y-%m-%d') as start_date, date_format(plan.`end_date`,'%Y-%m-%d') as end_date, plan.`plan_type`,
-        plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,
+        plan.`product_scheduling_num`,plan.task_type_name,plan.task_name,plan.task_change_notice_num,prod_procedure.seq,
         product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type, plan.check_type as plan_check_type,plan.vehicle_num_start,plan.vehicle_num_end,plan.num,
         (case when (select count(1) from report where user_procedure_team_id=a.id and creator_id=#{userId} and create_date=DATE_FORMAT(DATE(NOW()),'%Y-%m-%d'))>0 then 1 else 0 end ) isReported
         FROM prod_procedure_team a

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ReportMapper.xml

@@ -115,7 +115,7 @@
 
     <!-- 批量获取员工某天的报告 -->
     <select id="getUserReportByDate" resultMap="FullMap">
-        select a.*,b.name as productName,prod_procedure.name as procedureName,checker.name as checkerName,u.name as creatorName,
+        select a.*,b.name as productName,prod_procedure.name as procedureName,prod_procedure.seq,checker.name as checkerName,u.name as creatorName,
         plan.task_type_name,plan.task_name,plan.task_change_notice_num,plan.product_scheduling_num,plan.plan_type,plan.start_date,plan.end_date
         FROM report AS a
         left JOIN product AS b ON a.product_id=b.id
@@ -391,7 +391,7 @@
         from plan b
         left join plan_procedure_total a on a.plan_id=b.id
         left join user u on u.id=b.station_id
-        where b.company_id=#{companyId}
+        where b.company_id=#{companyId} and b.plan_type=0
         <if test="userId!=null and userId!=''">
             and b.foreman_id=#{userId}
         </if>
@@ -540,7 +540,8 @@
         LEFT JOIN department dd ON d.superior_id=dd.department_id
         <where>
             p.status!=2 and
-            p.company_id=#{companyId}
+            p.company_id=#{companyId} and
+            p.plan_type=0
             <if test="startDate!=null and startDate!='' and endDate!=null and endDate!=''">
                 and p.start_date between #{startDate} and #{endDate}
             </if>

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/component/planComponent.vue

@@ -20,6 +20,9 @@
                 <div class="PlanItem">
                   <div>项目代码：</div><span>{{ item.product.code }}</span>
                 </div>
+                <div class="PlanItem">
+                  <div>项目名称：</div><span>{{ item.product.projectName }}</span>
+                </div>
                 <div class="PlanItem">
                   <div>计划总工价：</div><span class="textBeyondHiding">{{item.totalMoney}}</span>
                 </div>
@@ -287,26 +290,27 @@ export default {
         flex-wrap: wrap;
 
         .PlanItem {
-          width: 50%;
+          // width: 50%;
           display: flex;
           padding-top: 8px;
 
-          &:first-child {
-            width: 100%;
+          // &:first-child {
+          //   width: 100%;
 
-            span {
-              width: 200px;
-              word-break: break-all;
-            }
-          }
+          //   span {
+          //     width: 200px;
+          //     word-break: break-all;
+          //   }
+          // }
 
           div {
-            width: 100px;
+            width: 110px;
             text-align: right;
             color: #666;
           }
 
           span {
+            flex: 1;
             display: inline-block;
             color: #333;
           }

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/planView/todayPlan/distribution.vue

@@ -17,7 +17,7 @@
           <van-checkbox v-if="todayAndTomorrow" :disabled="item.checkboxDisabled  || item.teamNames.indexOf(user.name) == -1"  v-model="item.prodProcedure.isSelected"  @click="itemChecked" shape="square">
           </van-checkbox>
           <div class="PlanItem">
-            <span>{{ item.prodProcedure.name }}</span>
+            <span>{{item.prodProcedure.seq}}. {{ item.prodProcedure.name }}</span>
           </div>
           <div class="PlanItem">
             <div>单件工价：</div><span class="textBeyondHiding">{{ item.prodProcedure.unitPrice }}</span>

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

@@ -47,7 +47,7 @@
             <div v-if="reportBoolean" class="marginBtnPro">{{ item.productSchedulingNum }}</div>
             <div>
               <van-row>
-                <van-col span="19">{{ prod.plan_type == 0 ? item.procedure_name : prod.task_change_notice_num }}</van-col>
+                <van-col span="19">{{item.seq}}. {{ prod.plan_type == 0 ? item.procedure_name : prod.task_change_notice_num }}</van-col>
                 <van-col span="5" style="text-align:right;"><span style="color:goldenrod;font-size:16px;">{{ item.work_time
                 }}</span> <span style="font-size:12px;">分钟</span></van-col>
               </van-row>
@@ -257,6 +257,7 @@ export default {
             job_of_money: item.jobOfMoney,
             plan_check_type: item.planCheckType,
             procedure_name: item.procedureName,
+            seq: item.seq,
             progress: item.progress,
             work_time: item.workingTime,
             finishNum: item.finishNum,

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

@@ -29,10 +29,11 @@
           :height="tableHight"
           v-if="TabIndex == 0" v-loading="tableDataLoading"
         >
-        <el-table-column
-          type="index"
-          width="50">
-        </el-table-column>
+        <el-table-column label="序号" width="60">
+            <template slot-scope="scope">{{
+              scope.row.prodProcedure.seq
+            }}</template>
+          </el-table-column>
           <el-table-column label="工序名称" width="400">
             <template slot-scope="scope">
                 <div class="disFlexscope">

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -70,10 +70,7 @@
                             </el-form-item>
                             <el-form-item>
                                 <el-table :data="props.row.tableProdProcedure.procedureList" border style="width: 100%">
-                                    <el-table-column
-                                        type="index"
-                                        width="50">
-                                    </el-table-column>
+                                    <el-table-column prop="seq" label="序号" width="60"></el-table-column>
                                     <el-table-column prop="name" label="工序名称" width="180">
                                     </el-table-column>
                                     <el-table-column prop="workingTime" label="单件工时" width="180">