ERP_override.git

			@@ -165,7 +165,7 @@

			private String getOrderId(String dateType){
			String orderId = null;
			if(dateType.equals("day")){
			if(dateType==null \|\| dateType.equals("day")){
			Integer maxOrderId = orderMapper.selectMaxOrderId();
			//查询订单id，并且自增
			String formattedNumber = String.format("%02d", maxOrderId+1);
			@@ -797,4 +797,8 @@
			}
			return saveState;
			}

			public Boolean selectDifferentSize(String orderId) {
			return !orderMapper.selectDifferentSize(orderId).isEmpty();
			}
			}