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

廖井涛

2024-09-13 be8a84dd3610443ebc82a9c75f888920b882bf01

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -689,6 +689,13 @@
        String oldOrderId = orderJson.getString("oldOrderId");
        String newOrderId = orderJson.getString("newOrderId");
        String orderIdType = orderJson.getString("orderIdType");

        Log log = new Log();
        log.setContent(map.toString());
        log.setFunction("updateOrderId修改订单号");
        log.setOperator(orderJson.getString("creator"));


        if(!Objects.equals(newOrderId, oldOrderId)){
            if(newOrderId.length()!=10){
                return "false4";
@@ -721,6 +728,7 @@
            if(count1>0 && count2==0){
                orderMapper.updateOrderId(oldOrderId,newOrderId);
                saveState= "true";
                logService.saveLog(log);
            }else if(count1==0){
                saveState= "false1";
                ;