1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/PlanProcedureTotalController.java

@@ -26,8 +26,8 @@ public class PlanProcedureTotalController {
     private PlanProcedureTotalService planProcedureTotalService;
 
     @RequestMapping("/getReportForWorkList")
-    public HttpRespMsg getReportForWorkList(String chicleNum){
-        return planProcedureTotalService.getReportForWorkList(chicleNum);
+    public HttpRespMsg getReportForWorkList(String vehicleNum){
+        return planProcedureTotalService.getReportForWorkList(vehicleNum);
     }
 
     @RequestMapping("/getFillProcedureDetail")

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

@@ -22,7 +22,7 @@ import org.springframework.format.annotation.DateTimeFormat;
  * </p>
  *
  * @author Seyason
- * @since 2023-08-28
+ * @since 2023-08-31
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -226,20 +226,20 @@ public class Plan extends Model<Plan> {
     /**
      * 车辆序号
      */
-    @TableField("chicle_num_start")
-    private Integer chicleNumStart;
+    @TableField("vehicle_num_start")
+    private Integer vehicleNumStart;
 
     /**
      * 车辆序号
      */
-    @TableField("chicle_num_end")
-    private Integer chicleNumEnd;
+    @TableField("vehicle_num_end")
+    private Integer vehicleNumEnd;
 
     @TableField(exist = false)
     private String  steelStampNumber;
 
     @TableField(exist = false)
-    private List<PlanSteelStampNumber>  steelStampNumberList;
+    private List<PlanSteelStampNumber> steelStampNumberList;
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/mapper/ProdProcedureTeamMapper.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ProdProcedureTeamMapper extends BaseMapper<ProdProcedureTeam> {
 
-    public List<HashMap> getReportForWorkList(String userId,String chicleNum);
+    public List<HashMap> getReportForWorkList(String userId,String vehicleNum);
 
     public HashMap getFillProcedureDetail(Integer id);
 }

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

@@ -14,7 +14,7 @@ import com.management.platform.util.HttpRespMsg;
  */
 public interface PlanProcedureTotalService extends IService<PlanProcedureTotal> {
 
-    HttpRespMsg getReportForWorkList(String chicleNum);
+    HttpRespMsg getReportForWorkList(String vehicleNum);
 
     HttpRespMsg getFillProcedureDetail(Integer id);
 }

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

@@ -43,11 +43,11 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
     private PlanSteelStampNumberMapper planSteelStampNumberMapper;
 
     @Override
-    public HttpRespMsg getReportForWorkList(String chicleNum) {
+    public HttpRespMsg getReportForWorkList(String vehicleNum) {
         HttpRespMsg msg=new HttpRespMsg();
         User user = userMapper.selectById(request.getHeader("token"));
         /*获取作为组员参与的数据*/
-        List<HashMap> dataList = prodProcedureTeamMapper.getReportForWorkList(user.getId(),chicleNum);
+        List<HashMap> dataList = prodProcedureTeamMapper.getReportForWorkList(user.getId(),vehicleNum);
         //抽取出所有的planId
         List<Integer> planIdList = dataList.stream().map(item -> (Integer) item.get("planId")).collect(Collectors.toList());
         //重新封装成两层结构，第一层为planId，第二层为planId下的数据
@@ -62,6 +62,8 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
                 HashMap planMap = new HashMap();
                 planMap.put("plan_id", curPlanId);
                 planMap.put("plan_name", map.get("plan_name"));
+                planMap.put("vehicle_num_start", map.get("vehicle_num_start"));
+                planMap.put("vehicle_num_end", map.get("vehicle_num_end"));
                 planMap.put("start_date", map.get("start_date"));
                 planMap.put("end_date", map.get("end_date"));
                 planMap.put("product_name", map.get("product_name"));

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

@@ -519,8 +519,8 @@ public class PlanServiceImpl extends ServiceImpl<PlanMapper, Plan> implements Pl
                     }
                     if(vehiclSerialNumberCell!=null){
                         String[] split = vehiclSerialNumberCell.getStringCellValue().split("-");
-                        plan.setChicleNumStart(Integer.valueOf(split[0]));
-                        plan.setChicleNumEnd(split.length>1?Integer.valueOf(split[1]):Integer.valueOf(split[0]));
+                        plan.setVehicleNumStart(Integer.valueOf(split[0]));
+                        plan.setVehicleNumEnd(split.length>1?Integer.valueOf(split[1]):Integer.valueOf(split[0]));
                     }
                     plan.setNum(numCell==null?0:Double.valueOf(numCell.getNumericCellValue()).intValue());
                     plan.setMainProcess(mainProcessCell==null?"":mainProcessCell.getStringCellValue());

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

@@ -34,13 +34,13 @@
         <result column="create_time" property="createTime" />
         <result column="create_id" property="createId" />
         <result column="status" property="status" />
-        <result column="chicle_num_start" property="chicleNumStart" />
-        <result column="chicle_num_end" property="chicleNumEnd" />
+        <result column="vehicle_num_start" property="vehicleNumStart" />
+        <result column="vehicle_num_end" property="vehicleNumEnd" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, product_scheduling_num, product_id, product_name, project_code, company_id, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, chicle_num_start, chicle_num_end
+        id, product_scheduling_num, product_id, product_name, project_code, company_id, num, main_process, station_id, station_name, foreman_id, foreman_name, plan_type, start_date, end_date, plan_total_wages, progress, task_name, task_type_id, task_type_name, check_type, task_change_notice_num, plan_man_num, plan_work_hour, money_of_job, describtion, version_number, create_time, create_id, status, vehicle_num_start, vehicle_num_end
     </sql>
 
 </mapper>

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

@@ -25,22 +25,24 @@
     </sql>
 
     <select id="getReportForWorkList" resultType="java.util.HashMap" >
-        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, 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,
-        product.`name` AS product_name,prod_procedure.name AS procedure_name, prod_procedure.check_type, plan.check_type as plan_check_type
+        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, 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,
+        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
         FROM prod_procedure_team a
         left join plan_procedure_total on plan_procedure_total.id = a.plan_procedure_id
         LEFT JOIN plan ON plan.id = plan_procedure_total.plan_id
         LEFT JOIN product ON product.id = plan.`product_id`
         LEFT JOIN prod_procedure ON prod_procedure.id = plan_procedure_total.prod_procedure_id
         where 1 = 1 and a.status = 1 and a.user_id=#{userId}
-        <if test="chicleNum!=null and chicleNum!=''">
-            and  (#{chicleNum} &gt;= plan.chicle_num_start and #{chicleNum} &lt;= plan.chicle_num_end)
+        <if test="vehicleNum!=null and vehicleNum!=''">
+            and  (#{vehicleNum} &gt;= plan.vehicle_num_start and #{vehicleNum} &lt;= plan.vehicle_num_end)
         </if>
         order by plan.id desc
     </select>
 
     <select id="getFillProcedureDetail" resultType="java.util.HashMap" >
-        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, 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,
+        SELECT a.*, plan_procedure_total.plan_id, plan_procedure_total.prod_procedure_id, 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,
                product.`name` AS product_name,prod_procedure.name AS procedure_name, if(plan.plan_type=0,prod_procedure.check_type, plan.check_type) as check_type, plan.station_id
         FROM prod_procedure_team a
                  left join plan_procedure_total on plan_procedure_total.id = a.plan_procedure_id

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

@@ -15,7 +15,7 @@
           <template>
             <div style="float:right;">
               <van-checkbox-group v-model="reportForm.checkedSteelNum" direction="horizontal">
-                <van-checkbox style="padding:5px;" :name="item" @click="onCheckChange" v-for="(item, index) in reportForm.planSteelStampNumberList" :key="item">{{item}}</van-checkbox>
+                <van-checkbox style="padding:5px;" :name="item" @click="onCheckChange" v-for="(item, index) in reportForm.planSteelStampNumberList" :key="index">{{item}}</van-checkbox>
               </van-checkbox-group>
             </div>
           </template>

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

@@ -3,14 +3,15 @@
     <van-nav-bar title="报工" left-text="返回" @click-left="back" fixed left-arrow />
     <div class="distribution_con contentRoll">
       <div> 
-        <van-field v-model="chicleNum" type="digit" label="车辆序号" @blur="getMyPlanProcedureList()"/>
+        <van-field v-model="vehicleNum" type="digit" label="车辆序号" @blur="getMyPlanProcedureList()"/>
       </div>
       <van-empty v-if="myPlanProcedureList.length == 0">暂无待报工任务</van-empty>
-      <div v-for="(prod, prodIndex) in myPlanProcedureList">
+      <div v-for="(prod, prodIndex) in myPlanProcedureList" :key="prodIndex">
         <div class="distribution_header">
           <div class="textDis">{{ prod.plan_type == 0 ? prod.product_name : prod.task_name }}</div>
           <div v-if="prod.plan_type == 0">{{ prod.product_scheduling_num }}</div>
           <div>{{ prod.start_date }}至{{ prod.end_date }}</div>
+          <div v-if="prod.vehicle_num_start && prod.vehicle_num_end">{{ prod.vehicle_num_start }}-{{ prod.vehicle_num_end }}</div>
         </div>
         <div class="distribution_box" v-for="item, index in prod.procedureList" :key="index" @click="reportItem(item)">
           <div>
@@ -70,7 +71,7 @@ export default {
       popupShow: false,
       titleText: '今日计划', // 默认文字
       todayAndTomorrow: true, // true 今日计划，false 明日计划
-      chicleNum:null
+      vehicleNum:null
     };
   },
   computed: {},
@@ -98,7 +99,7 @@ export default {
         duration: 0
       });
       this.$axios.post("/plan-procedure-total/getReportForWorkList", {
-        chicleNum:this.chicleNum
+        vehicleNum:this.vehicleNum
       })
         .then(res => {
           if (res.code == "ok") {

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

@@ -123,9 +123,9 @@
             <el-input v-model="todayPlanForm.progress" maxlength="20"></el-input>
           </el-form-item> -->
           <el-form-item label="车辆序号" style="width: 100%" prop="steelStampNumberStart">
-          <el-input-number class="w45" v-model="todayPlanForm.chicleNumStart" maxlength="20"></el-input-number>
+          <el-input-number class="w45" v-model="todayPlanForm.vehicleNumStart" maxlength="20"></el-input-number>
           {{ "-" }}
-          <el-input-number class="w45" v-model="todayPlanForm.chicleNumEnd" maxlength="20"></el-input-number>
+          <el-input-number class="w45" v-model="todayPlanForm.vehicleNumEnd" maxlength="20"></el-input-number>
           </el-form-item>
           <el-form-item label="数量" prop="num">
             <el-input v-model="todayPlanForm.num" maxlength="10" type="number"></el-input>
@@ -275,8 +275,8 @@ export default {
         projectCode: "",
         // steelStampNumberStart: "",
         // steelStampNumberEnd: "",
-        chicleNumStart:"",
-        chicleNumEnd:"",
+        vehicleNumStart:"",
+        vehicleNumEnd:"",
         num: "",
         mainProcess: "",
         progress: "",
@@ -676,8 +676,8 @@ export default {
       }
         }
       }
-      if(!this.todayPlanForm.chicleNumStart){
-          if(this.todayPlanForm.chicleNumStart){
+      if(!this.todayPlanForm.vehicleNumStart){
+          if(this.todayPlanForm.vehicleNumStart){
               this.$message({
                   message:"车辆序号区间填写不完整",
                   type: "error",
@@ -685,8 +685,8 @@ export default {
               return  
           }
       }
-      if(!this.todayPlanForm.chicleNumEnd){
-          if(this.todayPlanForm.chicleNumEnd){
+      if(!this.todayPlanForm.vehicleNumEnd){
+          if(this.todayPlanForm.vehicleNumEnd){
               this.$message({
                   message:"车辆序号区间填写不完整",
                   type: "error",