限制报工时间不能是未来时间，与当前时间间隔不能超过15天，补充相关语言

chenlu

2025-08-11 74e77ff9778f602e92a9634708fea35b4eb7d42f

限制报工时间不能是未来时间，与当前时间间隔不能超过15天，补充相关语言

 north-glass-erp/northglass-erp/src/lang/ar.js

@@ -406,6 +406,9 @@
            selectDetailProcessCard:"流程卡明细查询"

        },
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'رقم بطاقة العملية',
@@ -619,8 +622,10 @@
        passAudit:'تمت الموافقة',
        patchCondition:'补片状态',
        changeFailed:'修改失败，请检查是否为报工转移订单',
        hiddenVal:'隐藏',


        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        selectResponsibleTeam:'الرجاء اختيار الفريق المسؤول',
        selectWorkReportingTeam:'الرجاء اختيار الفريق المسؤول',
        successfulModificationOfWorkApplication:'تم تعديل التقرير بنجاح',

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -406,6 +406,9 @@
            printFlowCard:"Process card printing",
            selectDetailProcessCard:"Process card details query"
        },
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'Process Card Number',
@@ -621,7 +624,10 @@
        passAudit:'Pass The Audit',
        patchCondition:'Patch Condition',
        changeFailed:'修改失败，请检查是否为报工转移订单',
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        selectResponsibleTeam:'Please select a responsible team',
        selectWorkReportingTeam:'Please select a responsible team',
        successfulModificationOfWorkApplication:'Report modification succeeded',

 north-glass-erp/northglass-erp/src/lang/kr.js

@@ -415,6 +415,9 @@
            selectDetailProcessCard:'프로세스 카드 상세 조회'

        },
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'프로세스 카드 번호',
@@ -628,8 +631,10 @@
        passAudit:'승인 완료',
        patchCondition:'패치 상태',
        changeFailed:'수정 실패,  실적 보고 이관 주문 여부 확인해 주세요',
        hiddenVal:'隐藏',


        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        selectResponsibleTeam:'담당 팀을 선택해 주세요.',
        selectWorkReportingTeam:'담당 팀을 선택해 주세요.',
        successfulModificationOfWorkApplication:'작업 보고 수정 성공',

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -404,6 +404,9 @@
            printFlowCard:"流程卡打印",
            selectDetailProcessCard:"流程卡明细查询"
        },
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'Номер процесса',
@@ -617,8 +620,10 @@
        passAudit:'Проверка прошла',
        patchCondition:'补片状态',
        changeFailed:'修改失败，请检查是否为报工转移订单',
        hiddenVal:'隐藏',


        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        selectResponsibleTeam:'Пожалуйста, выберите группу ответственности.',
        selectWorkReportingTeam:'Пожалуйста, выберите группу ответственности.',
        successfulModificationOfWorkApplication:'Изменение обратной связи успешно',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -637,7 +637,8 @@
        changeFailed:'修改失败，请检查是否为报工转移订单',
        hiddenVal:'隐藏',


        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        selectResponsibleTeam:'请选择责任班组',
        selectWorkReportingTeam:'请选择责任班组',
        successfulModificationOfWorkApplication:'报工修改成功',

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -1003,6 +1003,23 @@
    return
  }

  const reportingWorkTime = titleUploadData.value.reportingWorkTime
    const currentTime = new Date()
    const targetTime = new Date(reportingWorkTime)
    //未来时间
    if (targetTime > currentTime) {
      ElMessage.error(t('reportingWorks.futureTime'))
      return
    }
    // 两个时间的毫秒差
    const diffMs = currentTime - targetTime
    // 转换为天数
    const diffDays = diffMs / (1000 * 60 * 60 * 24)
    if (diffDays > 15) {
      ElMessage.error(t('reportingWorks.longTime'))
      return
    }

  const seenIds = {}
  const uniqueByOrderNum = xGrid.value.getTableData().fullData.filter(item => {
    // 检查item的id是否已经在seenIds中
@@ -1282,27 +1299,6 @@
      //判断早晚班
      titleUploadData.value.classes=t('reportingWorks.early')
      titleUploadData.value.reportingWorkTime = formatCurrentTime()

      //处理编号列
      //定义存放编号数组
      const s01Values = [];
      for (let i = 0; i < res.data.Detail.length; i++) {
        const s01Values = [];
        // 遍历 detailList 数组，提取 S01 值到 s01Values 数组
        if (res.data.Detail[i].other_columns!=null|| res.data.Detail[i].other_columns!=undefined){
          res.data.Detail.forEach(element => {
            const otherColumnsObject = JSON.parse(element.other_columns);
            const s01Value = otherColumnsObject.S01;
            s01Values.push(s01Value || ''); // 如果 S01 值为空，添加空字符串或者其他默认值
          });

          // 将 s01Values 中的值赋给每个订单详情对象的 s01Value 属性
          res.data.Detail.forEach((detail, index) => {
            detail.s01Value = index < s01Values.length ? s01Values[index] : ''; // 赋值给 s01Value 属性
          });
        }

      }


      //绑定下方表格

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java

@@ -690,7 +690,6 @@
                                //更新报工流程表数据
                                reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
                            }
                            System.out.println(1);
                            //删除报工，将审核状态改为-1
                            reportingWorkMapper.deleteWork(reportingWorkId);


 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml

@@ -208,7 +208,8 @@
        ogd.`group`,
        if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
        od.other_columns,
        ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
        ogd.id as 'glassId',IFNULL(rws.reviewed_state,0) as reviewed_state,
        if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
        ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
        od.building_number) as s01Value

@@ -434,6 +435,9 @@
            ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和
            if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
            e.other_columns,
        if(ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')!='',
        ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),''),
        od.building_number) as s01Value
        IF(count(pl.id)>0,'已补片','') as patchStatusOther,

            <if test="nextProcess != null and nextProcess != ''">  -- 非最后一道工序