Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-16 a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf

 aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderProcessServiceImpl.java

@@ -133,6 +133,7 @@

    @Override
    public void getWorkOrderProcessFromU9(List<String> docNos) throws Exception {
        List<String> noProcessDocNos = docNos;
        // 设置请求头
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
@@ -169,14 +170,14 @@
                                JSONObject process = (JSONObject) o;
                                if (nowDocNo == null) {
                                    nowDocNo = process.getString("DocNo");
                                    docNos.remove(nowDocNo);
                                    noProcessDocNos.remove(nowDocNo);
                                    haveProcessDocNos.add(nowDocNo);
                                }
                                Map<String, Object> params = new HashMap<>();
                                params.put("docNo", process.getString("DocNo"));
                                params.put("opNum", process.getString("OpNum"));
                                params.put("opId", process.getString("OpID"));
                                Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
//                                Map<String, Object> params = new HashMap<>();
//                                params.put("docNo", process.getString("DocNo"));
//                                params.put("opNum", process.getString("OpNum"));
//                                params.put("opId", process.getString("OpID"));
//                                Long existsId = apsWorkOrderProcessMapper.existsByDocNoOpNumOpId(params);
                                ApsWorkOrderProcess apsWorkOrderProcess = new ApsWorkOrderProcess();
                                apsWorkOrderProcess.setItemCode(process.getString("ItemCode"));
                                apsWorkOrderProcess.setDocNo(process.getString("DocNo"));
@@ -192,17 +193,17 @@
                                apsWorkOrderProcess.setOrg(process.getString("Org"));
                                apsWorkOrderProcess.setOrgCode(process.getString("OrgCode"));
                                apsWorkOrderProcess.setWorkCenter(process.getString("WorkCenter"));
                                if (existsId != null) {
                                    apsWorkOrderProcess.setId(existsId);
                                    apsWorkOrderProcess.setUpdateBy("task");
                                    apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
                                    updateList.add(apsWorkOrderProcess);
                                } else {
//                                if (existsId != null) {
//                                    apsWorkOrderProcess.setId(existsId);
//                                    apsWorkOrderProcess.setUpdateBy("task");
//                                    apsWorkOrderProcess.setUpdateTime(DateUtils.getNowDate());
//                                    updateList.add(apsWorkOrderProcess);
//                                } else {
                                    apsWorkOrderProcess.setId(IdUtil.getSnowflakeNextId());
                                    apsWorkOrderProcess.setCreateBy("task");
                                    apsWorkOrderProcess.setCreateTime(DateUtils.getNowDate());
                                    addList.add(apsWorkOrderProcess);
                                }
//                                }
                                if(!nowDocNo.equals(process.getString("DocNo"))){
                                    //更新工单同步工序状态
                                    docNos.remove(nowDocNo);
@@ -229,10 +230,10 @@
                            param.put("docNos", haveProcessDocNos);
                            apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                        }else{
                            if(!docNos.isEmpty()){
                            if(!noProcessDocNos.isEmpty()){
                                Map<String, Object> param = new HashMap<>();
                                param.put("status", "2");
                                param.put("docNos", docNos);
                                param.put("docNos", noProcessDocNos);
                                apsWorkOrderJobMapper.updateApsWorkOrderJobPrccessStatus(param);
                                apsWorkOrderJobLog.setRequestData(requestBody.toJSONString());
                                apsWorkOrderJobLog.setResponseData(response.getBody());
@@ -365,4 +366,9 @@
        apsWorkOrderProcessMapper.deleteApsProcessRoute();
        apsWorkOrderProcessMapper.insertIntoApsProcessRoute();
    }

    @Override
    public void deleteApsWorkOrderProcess() {
        apsWorkOrderProcessMapper.deleteApsWorkOrderProcess();
    }
}