Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

lxw

2023-03-01 9df3cb334dca9019155fdfa502142d892667924d

Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

 src/main/java/com/whyc/pojo/BOMFeedback.java

@@ -43,8 +43,9 @@
     * 状态说明:
     * 0:未确认
     * 1:已确认(与我无关,完结)
     * 2:已确认(与我有关,确认回复;待后续上传ECR流水号)
     * 3:已确认已上传ECR流水号,完结
     * 2:已确认(与我有关,完结)
     * 3:已确认(与我有关,确认回复;待后续上传ECR流水号)
     * 4:已确认已上传ECR流水号,完结
     */
    private Integer confirmStatus;
    private String confirmUserName;

 src/main/java/com/whyc/service/BOMFeedbakService.java

@@ -233,7 +233,7 @@

    public Response updateEcrNumber(int id, String ecrNumber) {
        UpdateWrapper<BOMFeedback> update = Wrappers.update();
        update.set("ecr_number",ecrNumber).set("confirm_status",3).eq("id",id);
        update.set("ecr_number",ecrNumber).set("confirm_status",4).eq("id",id);
        mapper.update(null, update);
        return new Response().set(1,true,"上传完成");
    }