Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/service/UpPattenUsageService.java

@@ -1,6 +1,7 @@
package com.mes.uppattenusage.service;

import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.engineering.entity.Engineering;
import com.mes.uppattenusage.entity.UpPattenUsage;

@@ -38,13 +39,17 @@
      * 更新上片表状态
      */
     void updateUpPattenUsageState(UpPattenUsage upPattenUsage, Integer state);

     /**
      * 判断此工程是否已保存过
      *
      * @return UpPattenUsage
      */
     UpPattenUsage selectedEngineering(String engineeringId);
     UpPattenUsage selectedTaskEngineering(String engineeringId);

     /**
      * 查询正在执行的上片任务
      *
      * @return UpPattenUsage
      */
     UpPattenUsage selectOverTask();
@@ -56,10 +61,33 @@

     /**
      * 更改上片玻璃状态
      *
      * @return UpPattenUsage
      */
     Boolean updateGlassState(UpPattenUsage upPattenUsage);

     List<Engineering> setRawGlassTaskRequest(Engineering request);
     String setRawGlassTaskRequest(Engineering request);

     String setRawGlassTaskRequest2(Engineering request);

//     List<UpPattenUsage> selectSaveUpPattenUsage(String engineerId, Integer filmRemove, Integer stationCell);

//     UpPattenUsage selectedEngineering(String engineerId, Integer filmRemove, Integer stationCell);

     UpPattenUsage selectedEngineering(String engineerId);

    void deleteTask(String engineerId);


     List<UpPattenUsage> selectLoadTask(Engineering engineering);

     /**
      * 拿走:9/破损:8
      *
      * @param request
      * @return
      */
     String identControls(DamageRequest request);

}