Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-08-29 b4ecc2c68b386b53caf7f19b8366ec2332ef1e9f

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java

@@ -2,7 +2,6 @@

import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.Rework;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -25,7 +24,7 @@

    Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);

    Boolean updateReportingWorkDetail(@Param("patchLog") PatchLog patchLog);
    Boolean updateReportingWorkDetail(@Param("reportingWorkId") String reportingWorkId,@Param("orderSort") Integer orderSort,@Param("technologyNumber") Integer technologyNumber);

    Boolean updateReplenish(@Param("patchLog") PatchLog patchLog ,  @Param("userName") String userName);

@@ -34,5 +33,12 @@
    List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);


    Boolean deleteReplenishMp(String patchId);

    Boolean updatePatchDdMp(String reportingWorkId, String orderSort, Integer technologyNumber, Integer qualityInspector);

    Boolean updatePatchBgMp(String reportingWorkId, String orderSort, Integer technologyNumber);

    
}