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

chenlu

4 天以前 92f4295f9b3255f8615775d3a254c2e7f20409c1

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

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -333,6 +333,9 @@
    resizable: true,
    useKey: true
  },
  sortConfig: {
    multiple: true,
  },
  filterConfig: {   //筛选配置项
    //remote: true
  },

 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);

 north-glass-erp/src/main/resources/mapper/sd/OrderMapper.xml

@@ -39,7 +39,6 @@
            `order` as a
        where
            year(a.create_time)  = year(now())
            and a.id>400
    </select>

    <select id="selectOrderIdMin">