mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/pgmaster/PgMasterController.java

@@ -1,7 +1,6 @@
 package com.chanko.yunxi.mes.module.heli.controller.admin.pgmaster;
 
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.plansub.vo.PlanSubRespVO;
@@ -10,12 +9,10 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.zjpgmaster.vo.ZjPgMaste
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.bgmasterline.BgMasterLineDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.procedure.ProcedureDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processbom.ProcessBomDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.bgmasterline.BgMasterLineMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.procedure.ProcedureMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.processbom.ProcessBomDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.taskdispatch.TaskDispatchMapper;
@@ -34,7 +31,6 @@ import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import com.chanko.yunxi.mes.framework.common.pojo.PageParam;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
@@ -72,8 +68,6 @@ public class PgMasterController {
 
     @Resource
     private BgMasterLineMapper bgMasterLineMapper;
-    @Resource
-    private ProcedureMapper procedureMapper;
 
 
     @GetMapping("/getBomMx")
@@ -176,7 +170,7 @@ public class PgMasterController {
                     wrapper.eq(TaskDispatchDetailDO::getCheckYn,0);
                     List<TaskDispatchDetailDO> detailDOS = taskDispatchDetailMapper.selectList(wrapper);
                     if (ObjectUtil.isEmpty(detailDOS)){
-                        return error(400,"该零件所有工序都没有过程检");
+                        return error(400,"该零件没有需要检验工序");
                     }else {
                         LambdaQueryWrapper<TaskDispatchDetailDO> wrapper1 = new LambdaQueryWrapper<>();
                         wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDO.getId());
@@ -185,22 +179,8 @@ public class PgMasterController {
                         List<TaskDispatchDetailDO> list = taskDispatchDetailMapper.selectList(wrapper1);
                         if (ObjectUtil.isNotEmpty( list)){
                             if (list.size()==detailDOS.size()){
-                                return error(400,"零件已全部检验完成");
+                                return error(400,"该零件已全部检验完成");
                             }else{
-                                List<TaskDispatchDetailDO> collect1 = detailDOS.stream().filter(item -> item.getProcedureStatus() != 2).collect(Collectors.toList());
-                                List<Long> collect = collect1.stream().map(TaskDispatchDetailDO::getProcedureId).collect(Collectors.toList());
-                                LambdaQueryWrapper<ProcedureDO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                                lambdaQueryWrapper.in(ProcedureDO::getId, collect);
-                                List<ProcedureDO> procedureDOS = procedureMapper.selectList(lambdaQueryWrapper);
-                                    // 转换为 Map<id, name>
-                                    Map<Long, String> procedureNameMap = procedureDOS.stream()
-                                            .collect(Collectors.toMap(
-                                                    ProcedureDO::getId,
-                                                    ProcedureDO::getName,
-                                                    (existing, replacement) -> existing
-                                            ));
-                                List<TaskDispatchDetailDO> collect2 = collect1.stream().filter(item -> item.getReportProcess() == 1).collect(Collectors.toList());
-                                List<TaskDispatchDetailDO> collect3 = collect1.stream().filter(item -> item.getReportProcess() != 1).collect(Collectors.toList());
                                 return error(400,"该零件没有报工完成,请联系报工人员！");
                             }
                         }else{

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/processdesign/vo/ProcessDesignPageReqVO.java

@@ -111,6 +111,4 @@ public class ProcessDesignPageReqVO extends PageParam {
     private Integer isOverProcess;
     @Schema(description = "状态")
     private Integer isOverPro;
-    @Schema(description = "设计日期")
-    private String designDate;
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskinreport/TaskInReportController.java

@@ -109,8 +109,8 @@ public class TaskInReportController {
     @PostMapping("/add")
     @Operation(summary = "小程序下料报工")
     @PreAuthorize("@ss.hasPermission('heli:task-in-report:create')")
-    public CommonResult<Boolean> addTaskInReport(@Valid @RequestBody TaskInReportSaveReqVO createReqVO) {
+    public CommonResult<Long> addTaskInReport(@Valid @RequestBody TaskInReportSaveReqVO createReqVO) {
-        return taskInReportService.addTaskInReport(createReqVO);
+        return success(taskInReportService.addTaskInReport(createReqVO));
     }
 
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java

@@ -314,6 +314,4 @@ public class TaskDispatchDetailDO extends BaseDO {
     private BigDecimal reportPrice;
     @TableField(exist = false)
     private BigDecimal price;
-    @TableField(exist = false)
-    private Long compositionId;
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java

@@ -21,7 +21,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.util.StringUtils;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -296,20 +295,6 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
                     .or()
                     .apply("u6.nickname like concat('%', {0}, '%') and t.process_design_type = {1}", reqVO.getOwnerName(), ProcessDesignTypeEnum.CASTING_DRAWING.name());
         }
-        if ( ObjectUtil.isNotEmpty(reqVO.getDesignDate())) {
-            String designDate = reqVO.getDesignDate();
-            query.and(q -> {
-                q.apply("(t.process_design_type = {0} AND (a.craft_start_date >= {1} or a.craft_end_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_FOUNDRY_TECHNOLOGY.name(), designDate, designDate)
-                        .or()
-                        .apply("(t.process_design_type = {0} AND( b.start_blank_date >= {1} or b.blank_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_WORKBLANK.name(), designDate, designDate)
-                        .or()
-                        .apply("(t.process_design_type = {0} AND (b.start_two_dim_Date >= {1} or b.two_dim_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_2D.name(), designDate, designDate)
-                        .or()
-                        .apply("(t.process_design_type = {0} AND (b.start_three_dim_date >= {1} or b.three_dim_date >= {2}))", ProcessDesignTypeEnum.BLUEPRINT_3D.name(), designDate, designDate)
-                        .or()
-                        .apply("(t.process_design_type = {0} AND (a.cast_start_date >= {1} or a.cast_end_date >= {2}))", ProcessDesignTypeEnum.CASTING_DRAWING.name(), designDate, designDate);
-            });
-        }
         return selectPage(reqVO, query);
     }
     default PageResult<ProcessDesignDO> getExportExcel(ProcessDesignPageReqVO reqVO){

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskdispatch/TaskDispatchDetailMapper.java

@@ -1022,7 +1022,6 @@ public interface TaskDispatchDetailMapper extends BaseMapperX<TaskDispatchDetail
                 .select("e.name as procedureName")
                 .select("g.name as compositionName","g.density as density")
                 .select("g.price as price")
-                .select("g.id as compositionId")
                 .selectSum(TaskInReportDO::getWeight, "weight")
                 .selectSum(TaskInReportDO::getReportPrice, "reportPrice")
                 .leftJoin(TaskDispatchDO.class, "a", TaskDispatchDO::getId, TaskDispatchDetailDO::getDispatchId)

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java

@@ -21,7 +21,6 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.equipmanufacture.EquipMan
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.fpuserdetail.FpUserDetailDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplan.MaterialPlanDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.pgmaster.PgMasterLineDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plantask.PlanTaskDO;
@@ -43,8 +42,6 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.equipmanufacture.EquipManufact
 import com.chanko.yunxi.mes.module.heli.dal.mysql.fpuserdetail.FpUserDetailMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplan.MaterialPlanMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterLineMapper;
-import com.chanko.yunxi.mes.module.heli.dal.mysql.pgmaster.PgMasterMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.plan.PlanMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.plansub.PlanSubMapper;
 import com.chanko.yunxi.mes.module.heli.dal.mysql.plantask.PlanTaskMapper;
@@ -152,8 +149,6 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
     private CustomerMapper customerMapper;
     @Resource
     private CompositionMapper compositionMapper;
-    @Resource
-    private PgMasterLineMapper pgMasterLineMapper;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Long createTaskDispatch(TaskDispatchSaveReqVO createReqVO) {
@@ -1073,11 +1068,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService {
 //                        bdgzsomthingMapper.updateById(bdgzsomthingDO);
 //                    }
 //                }
-                LambdaQueryWrapper<PgMasterLineDO> wrapper = new LambdaQueryWrapper<>();
+                if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && taskDispatchDetailDO.getTestYn().equals("N")&&taskDispatchDetailDO.getCheckYn()==0){
-                wrapper.eq(PgMasterLineDO::getDispatchDetailId, taskDispatchDetailDO.getId());
-                wrapper.last("limit 1");
-                PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectOne(wrapper);
-                if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && taskDispatchDetailDO.getTestYn().equals("N")&&taskDispatchDetailDO.getCheckYn()==0&&ObjectUtil.isEmpty(pgMasterLineDO)){
                     pgMasterService.insertPgList(planDO.getId(),planDO.getProjectId(),taskDispatchDO.getBomDetailId(),taskDispatchDetailDO);
                 }
 //                if (taskDispatchDO.getDispatchType().equals("PRODUCTION") && isBomDetailProductionOver){

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportService.java

@@ -2,8 +2,6 @@ package com.chanko.yunxi.mes.module.heli.service.taskinreport;
 
 import java.util.*;
 import javax.validation.*;
-
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskinreport.vo.*;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskinreport.TaskInReportDO;
 import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
@@ -63,5 +61,5 @@ public interface TaskInReportService {
 
     List<TaskInReportDO> getList(TaskInReportPageReqVO pageReqVO);
 
-    CommonResult<Boolean> addTaskInReport(TaskInReportSaveReqVO createReqVO);
+    Long addTaskInReport(TaskInReportSaveReqVO createReqVO);
 }

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskinreport/TaskInReportServiceImpl.java

@@ -3,7 +3,6 @@ package com.chanko.yunxi.mes.module.heli.service.taskinreport;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.chanko.yunxi.mes.framework.common.pojo.CommonResult;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.formal.FormalDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskdispatch.TaskDispatchDetailDO;
@@ -133,10 +132,7 @@ public class TaskInReportServiceImpl implements TaskInReportService {
     }
 
     @Override
-    public CommonResult<Boolean> addTaskInReport(TaskInReportSaveReqVO createReqVO) {
+    public Long addTaskInReport(TaskInReportSaveReqVO createReqVO) {
-        TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(createReqVO.getDispatchDetailId());
-        if (ObjectUtil.isEmpty(taskDispatchDetailDO)) return CommonResult.error(400,"该派工单不存在，请退出刷新界面!");
-        if (2==taskDispatchDetailDO.getInReportProcess()) return CommonResult.error(400,"该派工单已报工完成，请刷新界面!");
         TaskInReportDO taskInReport = BeanUtils.toBean(createReqVO, TaskInReportDO.class);
         taskInReport.setOwner(getLoginUser().getId());
         taskInReport.setReportTime(LocalDateTime.now());

mes-ui/mes-ui-admin-vue3/.env.pro

@@ -4,14 +4,14 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径https://nxhs.cjyx.cc/admin-api  http://192.168.1.87:8080  https://star.hz-hl.com
-VITE_BASE_URL='http://192.168.1.87:8080'
+VITE_BASE_URL='https://nxhs.cjyx.cc'
 
 
 # 上传路径 http://218.75.46.166:8080
-VITE_UPLOAD_URL='http://192.168.1.87:8080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload'
 
 # 上传路径
-VITE_UPLOAD_BATCH_URL='http://192.168.1.87:8080/admin-api/infra/file/uploadBatch'
+VITE_UPLOAD_BATCH_URL='https://nxhs.cjyx.cc/admin-api/infra/file/uploadBatch'
 
 # 接口前缀
 VITE_API_BASEPATH=

mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/overview.vue

@@ -12,15 +12,6 @@
         :inline="true"
         label-width="110px"
       >
-          <el-form-item label="设计日期" prop="designDate" >
-            <el-date-picker
-              v-model="queryParams.designDate"
-              type="date"
-              value-format="x"
-              class="!w-240px"
-              placeholder="选择设计日期"
-            />
-          </el-form-item>
         <el-form-item label="项目编号" prop="projectCode">
           <el-input
             v-model="queryParams.projectCode"
@@ -186,7 +177,6 @@ import * as ProcessDesignApi from '@/api/heli/processdesign'
 import {useCommonStateWithOut} from "@/store/modules/common";
 import {DICT_TYPE, getIntDictOptions, getStrDictOptions} from "@/utils/dict";
 import {ref} from "vue";
-import dayjs from "dayjs";
 
 
 defineOptions({ name: 'ProcessDesign3D' })
@@ -216,7 +206,6 @@ const queryParams = reactive({
   ownerName:undefined,
   processDesignType:undefined,
   isOverProcess:undefined,
-  designDate:undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -333,13 +322,8 @@ const handleExport = async () => {
 //       return {} // 未开始保持透明背景
 //   }
 // }
-const setDefaultDate = () => {
-  queryParams.designDate = dayjs().startOf('day').format('YYYY-MM-DD')
-
-}
 /** 初始化 **/
 onMounted(() => {
-  setDefaultDate()
   getList()
 })
 </script>

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue

@@ -792,43 +792,22 @@ const open = async (id: number,propertynew :number) => {
 					businessType: 'PROJECT_ORDER'
 				}
 	formData.value.operateLogs = (await getOperateLogPage(logParams)).list
-  console.log(formData.value.operateLogs)
+  if (formData.value.operateLogs && formData.value.operateLogs.length >= 2) {
-  // if (formData.value.operateLogs && formData.value.operateLogs.length >= 2) {
+    if(formData.value.operateLogs.length ==2){
-  //   if(formData.value.operateLogs.length ==2){
+      const approveLog = formData.value.operateLogs[0]
-  //     const approveLog = formData.value.operateLogs[0]
+      formData.value.approveTime = approveLog.startTime
-  //     formData.value.approveTime = approveLog.startTime
+      formData.value.approveUserName = approveLog.userNickname
-  //     formData.value.approveUserName = approveLog.userNickname
+    }else{
-  //   }else if(formData.value.operateLogs.length ==3){
+      const auditLog = formData.value.operateLogs[0]
-  //     const auditLog = formData.value.operateLogs[1]
+      formData.value.auditTime = auditLog.startTime
+      formData.value.auditUserName = auditLog.userNickname
+      const approveLog = formData.value.operateLogs[1]
+      formData.value.approveTime = approveLog.startTime
+      formData.value.approveUserName = approveLog.userNickname
+    }
+    // const auditLog = formData.value.operateLogs[3]
     // formData.value.auditTime = auditLog.startTime
     // formData.value.auditUserName = auditLog.userNickname
-  //     const approveLog = formData.value.operateLogs[2]
-  //     formData.value.approveTime = approveLog.startTime
-  //     formData.value.approveUserName = approveLog.userNickname
-  //   }
-  //   // const auditLog = formData.value.operateLogs[3]
-  //   // formData.value.auditTime = auditLog.startTime
-  //   // formData.value.auditUserName = auditLog.userNickname
-  // }
-  if (formData.value.operateLogs){
-    const filteredLogs = formData.value.operateLogs
-      ?.filter(item => item.type == 9)
-      ?.sort((a, b) => new Date(b.startTime) - new Date(a.startTime))
-      ?.[0];  // 可选链操作符，如果为空返回undefined
-    console.log(filteredLogs)
-
-    const logs = formData.value.operateLogs
-      ?.filter(item => item.type == 10)
-      ?.sort((a, b) => new Date(b.startTime) - new Date(a.startTime))
-      ?.[0];  // 可选链操作符，如果为空返回undefined
-      if (logs){
-        formData.value.auditTime = logs.startTime
-        formData.value.auditUserName = logs.userNickname
-      }
-      if (filteredLogs){
-        formData.value.approveTime = filteredLogs.startTime
-     formData.value.approveUserName = filteredLogs.userNickname
-      }
   }
   formData.value.propertynew = propertynew;
   // loading .value = false;

mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue

@@ -267,7 +267,7 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form
 
                   <el-table-column fixed label="外协" align="center" width="60">
                     <template #default="{ row }">
-                    <el-checkbox class="large-checkbox"  v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)||row.statusFlag"/>
+                    <el-checkbox class="large-checkbox"  v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)||row.flag"/>
 <!--                    <el-checkbox class="large-checkbox"  v-model="row.isOutsourcing" @change="handleOutsourcingChange(row)" :disabled="getDisabledState2(row)"/>-->
                     </template>
                   </el-table-column>
@@ -482,7 +482,7 @@ v-model="row.deviceModel"
                       <!--												v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='')  && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!flag" link type="danger"-->
 
                       <el-button
-                   											v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='')  && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!scope.row.statusFlag" link type="danger"
+                   											v-if="'detail' != active && ((scope.row.purchaseNo ==null || scope.row.purchaseNo=='')  && scope.row.reportProcess == 0&&formData.dispatchStatus != 2)&&!scope.row.flag" link type="danger"
 												size="small" @click.prevent="onDeleteItem(scope.row,scope.$index)">
 												删除
 											</el-button>
@@ -1318,7 +1318,7 @@ const resetForm = () => {
 }
 
 const subFormLoading = ref(false) // 子表单的加载中
-const statusFlag = ref(false) // 是否下料报工
+const flag = ref(false) // 是否下料报工
 const subFormRules = reactive({
 	procedureName: [{
 		required: true,
@@ -1399,7 +1399,7 @@ const queryData = async (id?: number) => {
             checkList.value.push(items.name)
             disabledLabels.value.push(items.name)
             if ((items.name=='下料1'||items.name=='下料2')&&item.inReportProcess!=0&& !item.isOutsourcing){
-              item.statusFlag=true
+              item.flag=true
             }
           }
       })

mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue

@@ -93,7 +93,7 @@ const getListData = async () => {
     // 数组追加
     dataList.value.push(...data.list)
     // 分页条件
-    if (queryParams.pageNo < data.pageNo) {
+    if (queryParams.pageNo < data.total) {
       // 页码累加
       queryParams.pageNo++
       isFinish.value = false
@@ -102,7 +102,9 @@ const getListData = async () => {
       // 分页已结束
       isFinish.value = true
     }
-
+    if (data.msg){
+      isFinish.value = false
+    }
   } catch (e){
     // if(e.data.data==null && e.data.msg){ 2025/11/17 处理成功才调用
     //   //等待三秒再次打开扫码窗口
@@ -111,7 +113,6 @@ const getListData = async () => {
     //   }, delay.value * 1000);
     // }
   } finally {
-    isFinish.value = true
     isLoading.value = false
     queryParams.type=0
   }

mes-ui/mini-app/src/pages/productionInReport/components/dataItem.vue

@@ -99,19 +99,7 @@ onMounted(async () => {
   queryParams.subOrDetailName=getStoredSearchValue()
   await getListData();
 });
-// onShow(async () => {
+
-//   const today = new Date();
-//   const year = today.getFullYear();
-//   const month = String(today.getMonth() + 1).padStart(2, "0");
-//   const day = String(today.getDate()).padStart(2, "0");
-//   isFinish.value = false;
-//   isLoading.value = false;
-//   queryParams.pageNo = 1;
-//   todayStr.value = `${year}-${month}-${day}`;
-//   searchVal.value=getStoredSearchValue()
-//   queryParams.subOrDetailName=getStoredSearchValue()
-//   await getListData();
-// });
 const isScanning = ref(false)
 
 const handleDetail = async (item) => {
@@ -265,7 +253,7 @@ const handleSearch = async (e) => {
               <view class="label">零件名称: {{ item.materialName }}</view>
             </view>
             <view class="row-item">
-              <view class="label" >派工工序: {{ item.procedureName }}</view>
+              <view class="label" >派工工序: <span style="font-weight: bold;">{{ item.procedureName }}</span></view>
 
             </view>
           </view>
@@ -292,7 +280,7 @@ const handleSearch = async (e) => {
           <view
               class="product-item"
               :style="
-              item.endTime < todayStr && props.orderState != '2'
+              item.endTime < todayStr
                 ? 'color:red'
                 : null
             "

mes-ui/mini-app/src/pages/productionInReport/productionInReport-detail.vue

@@ -8,7 +8,7 @@
     getTaskDetailAPI,
     postOperateAPI,
     getListWxAPI,
-    getXLTaskDetailAPI, getTaskInRepotPageAPI, verificationAPI, handleOkAPI, productionCompletedAPI, getCompositionAPI
+    getXLTaskDetailAPI, getTaskInRepotPageAPI, verificationAPI, handleOkAPI, productionCompletedAPI
   } from '@/services/productionReport'
 	const popup = ref<UniHelper.UniPopupInstance>()
 	const userStore = useLoginStore()
@@ -19,10 +19,12 @@
     text: item.label
   }))
 
+	const userId = userStore.userInfo.userId
+	const isShowStart = ref(false)
   const isCancel = ref(true)
 
 
-
+  const isShowEnd = ref(false)
 
 	const length = ref()
 	const widht = ref()
@@ -35,6 +37,7 @@
 
   let isLoading = ref(false)
 	const historyList = ref([])
+	const formObj = ref({})
 	// 历史明细
 	const getData = async () => {
 		// 发送请求
@@ -55,7 +58,7 @@
 	// 详情
 	const getDetailData = async (id) => {
 		// 发送请求
-		isLoading.value = true
+		// isLoading.value = true
 		const params = {
 			id,
 		}
@@ -69,18 +72,15 @@
 	onLoad(async (options : any) => {
 		await getDetailData(options.id)
 		await getData()
+		const obj = historyList.value[0]
+		// 最新的报工是否完成
+		if (obj && obj?.workTime == null && obj.endTime) {
+			popupShow.value = true
+		}
 	})
 
 	// 生产完成
 	const handleComplate = async () => {
-    // if (historyList.value.length<=0){
-    //   uni.showToast({
-    //     icon: 'none',
-    //     duration: 3000,
-    //     title: '当前未报工,不允许报工结束',
-    //   })
-    //   return
-    // }
 		isLoading.value = true;
 		const params = {
 			id: detailInfo.value?.id,
@@ -100,58 +100,54 @@
 	}
 	// 提交报工
 	const handleOk = async () => {
-    if (length.value==null||length.value=='' ||length.value<=0){
+    if (length.value==null||length.value==''){
       uni.showToast({
 				icon: 'none',
 				duration: 3000,
-				title: '长(直径)不能为空,请确认',
+				title: '请输入长度',
 			})
 			return
     }
-
-    if (hight.value==null||hight.value=='' ||hight.value<=0){
-      uni.showToast({
-				icon: 'none',
-				duration: 3000,
-				title: '高度不能为空,请确认！',
-			})
-			return
-    }
-    if (weight.value==null||weight.value=='' ||weight.value<=0 ){
-      uni.showToast({
-				icon: 'none',
-				duration: 3000,
-				title: '重量不能为空,请确认！',
-			})
-			return
-    }
-    if (reportPrice.value==null||reportPrice.value=='' || reportPrice.value<=0){
-      uni.showToast({
-				icon: 'none',
-				duration: 3000,
-				title: '总价不能为空,请确认！',
-			})
-			return
-    }
-    // if (matType.value==null||matType.value==''){
-    //   uni.showToast({
-		// 		icon: 'none',
-		// 		duration: 3000,
-		// 		title: '请选择物料类型',
-		// 	})
-		// 	return
-    // }
-    if (matType.value=='1'||matType.value=='3'){
     if (widht.value==null||widht.value==''){
       uni.showToast({
 				icon: 'none',
 				duration: 3000,
-          title: '物料类型是块料或方料,宽度不能为空，请确认！ ',
+				title: '请输入宽度',
 			})
 			return
     }
+    if (hight.value==null||hight.value==''){
+      uni.showToast({
+				icon: 'none',
+				duration: 3000,
+				title: '请输入高度',
+			})
+			return
+    }
+    if (weight.value==null||weight.value==''){
+      uni.showToast({
+				icon: 'none',
+				duration: 3000,
+				title: '请输入重量',
+			})
+			return
+    }
+    if (reportPrice.value==null||reportPrice.value==''){
+      uni.showToast({
+				icon: 'none',
+				duration: 3000,
+				title: '请输入总价',
+			})
+			return
+    }
+    if (matType.value==null||matType.value==''){
+      uni.showToast({
+				icon: 'none',
+				duration: 3000,
+				title: '请选择物料类型',
+			})
+			return
     }
-
 		const params = {
       dispatchDetailId: detailInfo.value?.id,
       length: length.value,
@@ -173,6 +169,17 @@
     matType.value = '1'
     await getDetailData(detailInfo.value.id)
     await getData()
+	}
+	const handleStart = async () => {
+		const params = {
+			id: detailInfo.value.id,
+		}
+		const data = await postOperateAPI(params)
+		// const pages = getCurrentPages(); // 获取当前页面栈
+		// const currentPage = pages[pages.length - 1]; // 当前页面
+		// const url = `/${currentPage.route}?${Object.entries(currentPage.options).map(([key, val]) => `${key}=${val}`).join('&')}`;
+		// uni.reLaunch({ url }); // 重新加载当前页面
+
 	}
 	const popupShow = ref(false)
   const cancel = () => {
@@ -193,11 +200,9 @@
       });
   }
   const handleLengthChange =async (val) => {
-    if (val){
+    console.log(val)
+    if (val) {
       length.value = parseFloat(val).toFixed(2)
-      var newPrice = await  getCompositionAPI(detailInfo.value.compositionId);
-      console.log(newPrice)
-      console.log(newPrice.price)
       if (matType.value == '1' || matType.value == '3') {
         if (widht.value > 0 && hight.value > 0) {
           var rawResult = length.value * widht.value * hight.value * detailInfo.value.density / 1000000;
@@ -205,7 +210,7 @@
           var price = weight.value * detailInfo.value.price;
           reportPrice.value = price.toFixed(2)
         }
-      } else if (matType.value=='2'){
+      } else {
         if (hight.value > 0) {
           const radius = length.value / 2;
           const radiusSquared = radius * radius;
@@ -218,10 +223,12 @@
           reportPrice.value = price.toFixed(2)
         }
       }
+    }else {
+      weight.value=0.00
+      reportPrice.value=0.00
     }
 	}
   const handleWidhtChange =async (val) => {
-    if (val){
     widht.value=parseFloat(val).toFixed(2)
     if (matType.value=='1'||matType.value=='3'){
       if (length.value>0&&hight.value>0){
@@ -232,9 +239,7 @@
       }
     }
   }
-  }
   const handleHightChange =async (val) => {
-    if (val){
     hight.value=parseFloat(val).toFixed(2)
     if (matType.value=='1'||matType.value=='3'){
       if (widht.value>0&&length.value>0){
@@ -243,7 +248,7 @@
         var price = weight.value * detailInfo.value.price;
         reportPrice.value= price.toFixed(2)
       }
-    }else if (matType.value=='2') {
+    }else {
       if (length.value>0){
         const radius = length.value / 2;
         const radiusSquared = radius * radius;
@@ -256,25 +261,17 @@
         reportPrice.value= price.toFixed(2)
       }
     }
-
-    }
   }
   const handleWeightChange =async (val) => {
-    if (val){
     weight.value=parseFloat(val).toFixed(2)
     var price = weight.value * detailInfo.value.price;
     reportPrice.value= price.toFixed(2)
   }
-  }
   const  onClear= async (type)=>{
-    if (type=='weight'){
+    console.log(type)
-      reportPrice.value=parseFloat("0").toFixed(2)
-    }    else{
-      weight.value=parseFloat("0").toFixed(2)
-      reportPrice.value=parseFloat("0").toFixed(2)
-    }
     uni.hideKeyboard()
-
+    weight.value=0.00
+    reportPrice.value= 0.00
   }
   // 新增
 	const handleAdd = async () => {
@@ -286,6 +283,7 @@
 		popup.value?.open()
 	}
   const handleClose =async ()=>{
+    // uni.hideKeyboard() // 如果有键盘，先隐藏键盘
      length.value = ''
      widht.value = ''
      hight.value = ''
@@ -366,41 +364,41 @@
                 <view class="product-row">
                   <view class="row-item">
                     <view class="label">报工日期：</view>
-                    <view class="val">{{ item.reportTimeStr }}</view>
+                    <view class="val high-color">{{ item.reportTimeStr }}</view>
                   </view>
                   <view class="row-item">
                     <view class="label">报工人：</view>
-                    <view class="val ">{{ item.ownerName }}</view>
+                    <view class="val high-color">{{ item.ownerName }}</view>
                   </view>
                 </view>
 								<view class="product-row">
 									<view class="row-item">
 										<view class="label">物料类型：</view>
-										<view class="val">{{ item.matType }}</view>
+										<view class="val high-color">{{ item.matType }}</view>
 									</view>
 									<view class="row-item">
 										<view class="label">长(直径)：</view>
-										<view class="val ">{{ item.length }} mm</view>
+										<view class="val high-color">{{ item.length }} mm</view>
 									</view>
 								</view>
                 <view class="product-row">
                   <view class="row-item">
                     <view class="label">宽度：</view>
-                    <view class="val">{{ item.widht }} mm</view>
+                    <view class="val high-color">{{ item.widht }} mm</view>
                   </view>
                   <view class="row-item">
                     <view class="label">高度：</view>
-                    <view class="val">{{ item.hight }} mm</view>
+                    <view class="val high-color">{{ item.hight }} mm</view>
                   </view>
                 </view>
                 <view class="product-row">
                   <view class="row-item">
                     <view class="label">重量：</view>
-                    <view class="val high-color">{{ item.weight }} <span class="val">Kg</span></view>
+                    <view class="val high-color">{{ item.weight }} Kg</view>
                   </view>
                   <view class="row-item">
                     <view class="label">总价：</view>
-                    <view class="val high-color">{{ item.reportPrice }} <span class="val">元</span></view>
+                    <view class="val high-color">{{ item.reportPrice }} 元</view>
                   </view>
                 </view>
 								<view class="tip-index">
@@ -433,7 +431,7 @@
 				<view class="cont">
           <view class="item">
             <view class="label"><span class="star">*</span>物料类型：</view>
-            <uni-data-select class="val" v-model="matType"  clearable
+            <uni-data-select class="val" v-model="matType" :clearable="false"
                              :localdata="unitDict" placeholder="请选择物料类型">
             </uni-data-select>
             <view class="unit" ></view>
@@ -459,18 +457,18 @@
           </view>
           <view class="item">
             <view class="label"><span class="star">*</span>重量：</view>
-            <uni-easyinput class="val" type="number" v-model="weight"  clearable @change="handleWeightChange"  @clear="onClear('weight')"
+            <uni-easyinput class="val" type="number" v-model="weight"  clearable @change="handleWeightChange"
                            placeholder="请输入重量"></uni-easyinput>
             <view class="unit" >Kg</view>
           </view>
           <view class="item">
             <view class="label"><span class="star">*</span>总价：</view>
-            <uni-easyinput class="val" type="number" v-model="reportPrice" clearable  @clear="onClear('reportPrice')"
+            <uni-easyinput class="val" type="number" v-model="reportPrice" clearable
                            placeholder="请输入总价"></uni-easyinput>
             <view class="unit" >元</view>
           </view>
 				</view>
-				<view class="ok" @click="handleOk">保存</view>
+				<view class="ok" @click="handleOk">确定</view>
 			</uni-popup>
 		</view>
 	</view>

mes-ui/mini-app/src/services/productionReport.ts

@@ -118,10 +118,3 @@ export const productionCompletedAPI = (data: Object) => {
     data,
   })
 }
-// 派工任务详情
-export const getCompositionAPI = (id: number) => {
-  return http<any[]>({
-    method: 'GET',
-    url: `/heli/composition/get/?id=${id}`,
-  })
-}