补片返工审核修改以及添加日志

廖井涛

2024-09-03 0e44317af217b4b9afa9541fc71f85f11e3be29d

补片返工审核修改以及添加日志

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

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

import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@@ -9,7 +10,7 @@
import java.util.Map;

@Mapper
public interface PatchLogMapper {
public interface PatchLogMapper extends MPJBaseMapper<PatchLog> {

    List<Map<String,Object>> SelectReplenish(@Param("offset") Integer offset,@Param("pageSize") Integer pageSiz,String startDate,String endDate,PatchLog patchLog);


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

@@ -142,14 +142,18 @@
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {


                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                    //审核
                    patchMapper.updateReplenish(patchLog,userName);
                    PatchLog patchLog1=patchMapper.selectOne(new QueryWrapper<PatchLog>().eq("id",patchLog.getId()));
                    //判断是否已经审核
                    if(patchLog1.getReviewStatus()==0){
                        ReportingWork reportingWork = reportingWorkMapper
                                .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                        //修改小片流程卡数量
                        patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                        //审核
                        patchMapper.updateReplenish(patchLog,userName);
                    }else{
                        saveState = false;
                    }

                    Log log = new Log();
                    log.setContent(object.toString());

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

@@ -161,7 +161,13 @@
            }
        }


        //保存日志
        Log log = new Log();
        log.setContent(object.toString());
        log.setFunction("updateRework返工审核");
        log.setOperatorId((String) object.get("userId"));
        log.setOperator((String) object.get("userName"));
        logService.saveLog(log);
        return saveState;

    }