解决报工新增界面保存失败问题,补片审核添加日志,检测审核失败问题
4个文件已修改
23 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue
@@ -203,7 +203,6 @@
              }else{
                ElMessage.warning(t('basicData.msg.reviewFail'))
                router.push("/login")
              }
            })
          }
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -142,12 +142,21 @@
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //审核
                   patchMapper.updateReplenish(patchLog,userName);
                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                    //审核
                    patchMapper.updateReplenish(patchLog,userName);
                    Log log = new Log();
                    log.setContent(object.toString());
                    log.setFunction("updateReplenish补片审核");
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    logService.saveLog(log);
                }
            }
@@ -156,7 +165,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateReplenish");
            sysErrorService.insert(sysError);
            saveState = false;
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -273,6 +273,7 @@
            //判断是否大于当前数量并且抛出异常
            if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
                System.out.println(processNum+"--"+reportingWorkDetail.getBreakageQuantity()+"--"+reportingWorkDetail.getCompletedQuantity());
                Map<String, Object> map = new HashMap<>();
                map.put("orderNumber", reportingWorkDetail.getOrderNumber());
                map.put("technologyNumber", reportingWorkDetail.getOrderNumber());
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -389,14 +389,14 @@
                                   and b.order_id = SUBSTR(#{processId} from 1 for 10)
                                   and b.process = #{thisProcess}
                                   and b.process_id = a.process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
                            from patch_log
                            group by order_sort,technology_number) as c
                            group by process_id,order_sort,technology_number,patch_processes) as c
                           on
                                       c.process_id = a.process_id
                                   and c.order_sort = a.order_number
                                   and c.technology_number = a.technology_number
                                   and c.patch_processes= #{thisProcess}
        where
            a.process_id=SUBSTR(#{processId} from 1 for 14)
          and a.order_number = #{orderNumber}