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

chenlu

2025-11-20 e00b54ec7322cf7cba5883e17f2e2843f71b8833

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

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderFile.java

@@ -16,6 +16,7 @@
    private  String orderNumber;
    private  String fileName;
    private  String fileData;
    private  String fileJson;
    private  String imageBase64;
    private LocalDateTime createTime;


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

@@ -746,6 +746,14 @@
        JSONObject reportingWorkJson = new JSONObject(reportingWorkMap);
        ReportingWork reportingWork = JSONObject.parseObject(JSONObject.toJSONString(reportingWorkJson.get("title")), ReportingWork.class);
        List<ReportingWorkDetail> reportingWorkDetails = JSONArray.parseArray(JSONObject.toJSONString(reportingWorkJson.get("detail")), ReportingWorkDetail.class);


        ReportingWork reportingWork1 = reportingWorkMapper.selectOne(new LambdaQueryWrapper<ReportingWork>()
                .eq(ReportingWork::getReportingWorkId, reportingWork.getReportingWorkId()));
        reportingWork.setCreatorId(reportingWork1.getCreatorId());
        reportingWork.setCreator(reportingWork1.getCreator());
        reportingWork.setUpdateTime(LocalDateTime.now());

        //查询该报工是否为报工转移订单
        Integer transferState = reportingWorkMapper.selectReviewedState(reportingWork.getReportingWorkId());
        if (transferState !=3){
@@ -1690,6 +1698,8 @@
                    stringRedisTemplate.rename(key, "upload:" + key);
                });
            }
        }else{
            return;
        }
        //添加暂停时间，方式获取map时，redis中数据还在变化
        Thread.sleep(200);

 north-glass-erp/src/test/java/com/example/erp/ErpApplicationTests.java

@@ -19,6 +19,8 @@

    @Test
    void test() {
        int x =100;
        System.out.println(6.5+x/8);
//        stringRedisTemplate.opsForValue().set("test", "test");
//        Object test = stringRedisTemplate.opsForValue().get("test");
    }