~admin/ERP_override.git

			@@ -36,6 +36,7 @@

			public Map<String, Object> AddDateWork(String orderId, OrderDetail orderDetail) {
			Map<String, Object> map = new HashMap<>();

			map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
			return map;
			}
			@@ -57,22 +58,28 @@

			if (!orderDetaillist.isEmpty()) {
			for (OrderDetail orderDetail : orderDetaillist) {
			//生成生产订单号

			for (int i = 0; i < count; i++) {
			letters = lettr++;
			productIdVl = orderID + letters;
			//查询生成的生产订单号是否存在

			Integer workCount = workOrderMapper.SelectOrderNumber(productIdVl);
			if (workCount < 1) {
			if (workCount < 1 ) {
			break;
			}

			}
			System.out.println(productIdVl);

			//添加生产订单
			workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
			Integer State = 2;
			Integer States = 1;
			//查询该订单未转生产订单的条数
			Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderDetail.getOrderId());
			System.out.println(NoWorkCount);
			if (NoWorkCount == 0) {
			//条数为0修改转生产订单状态为2，否则为1
			workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), State);
			} else {
			workOrderMapper.UpdateWorkType(orderDetail.getOrderId(), States);
			@@ -93,7 +100,6 @@
			Integer States = 1;
			Integer NoWorkCount = workOrderMapper.SelectWorkCount(orderId);
			Integer YesWorkCount = workOrderMapper.SelectYesWorkCount(orderId);
			System.out.println(NoWorkCount);
			if (NoWorkCount ==YesWorkCount) {
			workOrderMapper.UpdateWorkType(orderId, State);
			} else {