ERP_override.git

			@@ -168,6 +168,7 @@
			} else {
			deliveryId = "";
			}
			String deliveryIdType = object.get("deliveryIdType").toString();
			Delivery delivery = JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), Delivery.class);
			List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("delivery")), OrderDetail.class);
			List<DeliveryOtherMoney> deliveryOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(object.get("otherMoney")), DeliveryOtherMoney.class);
			@@ -206,7 +207,7 @@
			deliveryMapper.updateDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
			} else {
			//获取单号
			oddNumber = orderNumberSetting("发货");
			oddNumber = orderNumberSetting("发货",deliveryIdType);
			//新增发货表数据
			deliveryMapper.insertDelivery(delivery, oddNumber, orderDetaillist.get(0).getOrderId());
			}
			@@ -738,12 +739,15 @@
			}
			}

			public String orderNumberSetting(String type) {
			public String orderNumberSetting(String type,String deliveryIdType) {
			//根据类型自动生成不同的操作单号
			String alias="";
			if(Objects.equals(type, "发货")){
			alias="FH";
			}
			String oddNumbers="";

			if(deliveryIdType.equals("day")){
			//查询当天的最大数量
			Integer maximum=deliveryMapper.getmaximum(type);
			//设置两位不够补0
			@@ -752,7 +756,17 @@
			Date currentDate = new Date();
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
			String formattedDate = dateFormat.format(currentDate);
			String oddNumbers = alias+formattedDate+formattedNumber;
			oddNumbers = alias+formattedDate+formattedNumber;
			}else if(deliveryIdType.equals("month")){
			Integer maximum = deliveryMapper.getmaximumMonth();
			String formattedNumber = String.format("%04d", maximum+1);
			Date currentDate = new Date();
			SimpleDateFormat dateFormat = new SimpleDateFormat("yyMM");
			String formattedDate = dateFormat.format(currentDate);
			oddNumbers = alias+formattedDate+formattedNumber;

			}

			return oddNumbers;
			}
			}