Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

5 天以前 6d6ae282ee8a58d6846e7c6986649c474444dae7

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

@@ -204,7 +204,7 @@

        }else if(dateType.equals("year")){
            Integer maxOrderId = orderMapper.selectMaxOrderIdByYear();
            String formattedNumber = String.format("%"+(orderIdTypeMantissa+4)+"d", maxOrderId+1);
            String formattedNumber = String.format("%0"+(orderIdTypeMantissa+4)+"d", maxOrderId+1);
            Date currentDate = new Date();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yy");
            String formattedDate = dateFormat.format(currentDate);