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

廖井涛

2024-07-25 15fa56463061f1e94140e23e98987aa3131714bf

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

@@ -4,11 +4,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.FlowCardMapper;
import com.example.erp.mapper.pp.PatchLogMapper;
import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -32,10 +36,17 @@
    final
    ReportingWorkMapper reportingWorkMapper;

    public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper) {
    final
    FlowCardMapper flowCardMapper;

    final LogService logService;

    public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper,FlowCardMapper flowCardMapper,LogService logService) {
        this.patchMapper = patchMapper;
        this.sysErrorService = sysErrorService;
        this.reportingWorkMapper = reportingWorkMapper;
        this.flowCardMapper = flowCardMapper;
        this.logService = logService;
    }


@@ -88,6 +99,7 @@
                    //添加返工记录，修改次破明细数量
                    patchMapper.insertReplenish(patchLog,oddNumber);
                    patchMapper.updateDamageDetails(patchLog);
                    patchMapper.updateReportingWorkDetail(patchLog.getReportingWorkId(), Integer.valueOf(patchLog.getOrderSort()),patchLog.getTechnologyNumber());
                }
            }

@@ -101,6 +113,14 @@
            saveState = false;

        }

        //保存日志
        Log log = new Log();
        log.setContent(object.toString());
        log.setFunction("saveReplenish补片新增");
        log.setOperatorId((String) object.get("userId"));
        log.setOperator((String) object.get("userName"));
        logService.saveLog(log);

        return saveState;

@@ -126,7 +146,6 @@
                   patchMapper.updateReplenish(patchLog,userName);
                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    System.out.println(reportingWork.getReportingWorkId());
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                }
@@ -165,8 +184,30 @@
        return oddNumbers;
    }

    public Object selectPrintSv(java.sql.Date selectTime1, java.sql.Date selectTime2, FlowCard flowCard) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", flowCardMapper.selectReplenishPrintMp(selectTime1,selectTime2,flowCard));
        map.put("type", flowCardMapper.selectType());
        return map;
    }

    public Map<String, Object> getSelectPrintCustomLabelSv(String type, Map<String, Object> object) {
        Map<String, Object> map = new HashMap<>();
        List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();//最终结果
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("printList")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            for (FlowCard flowCard : flowCardList) {

                Map<String, Object> itemmap = new HashMap<>();
                itemmap.put("data", flowCardMapper.getRepairPrintCustomData(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getReportingWorkId()));
                list.add(itemmap);



            }
        }
        map.put("data", list);
        map.put("title", flowCardMapper.getPrintTitle(type));
        return map;
    }
}