ERP_override.git

			@@ -57,10 +57,15 @@
			String orderId = orderDetaillist.get(0).getOrderId();

			for (OrderDetail orderDetail : orderDetaillist) {
			if(orderDetail.getOrderId()!= orderId){
			orderId = orderDetail.getOrderId();
			letters = '1';
			lettr = 'A';
			}
			//生成生产订单号
			for (int i = 0; i < count; i++) {
			letters = lettr++;
			productIdVl = orderId + letters;
			productIdVl = orderDetail.getOrderId() + letters;
			//查询生成的生产订单号是否存在
			Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
			if (workCount < 1) {
			@@ -86,22 +91,30 @@
			}

			//删除生产订单
			public Boolean deleteOrderWorkSv(String orderId, String productName) {
			if (!orderId.isEmpty() && !productName.isEmpty()) {
			//删除订单小片表生产订单号
			workOrderMapper.deleteOrderWorkMp(orderId, productName);
			Integer state = 0;
			Integer states = 1;
			//查询该订单未转生产订单的条数
			Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
			//查询该订单转生产订单的条数
			Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
			if (noWorkCount == yesWorkCount) {
			workOrderMapper.updateWorkType(orderId, state);
			} else {
			workOrderMapper.updateWorkType(orderId, states);
			public Boolean deleteOrderWorkSv(String orderId, String productionId) {
			if (!orderId.isEmpty() && !productionId.isEmpty()) {
			//查询该订单是否已经建立流程卡
			Integer getProcessCard = workOrderMapper.selectProcessCard(orderId);
			if (getProcessCard == 0){
			//删除订单小片表生产订单号
			workOrderMapper.deleteOrderWorkMp(orderId, productionId);
			int state = 0;
			int states = 1;
			//查询该订单未转生产订单的条数
			Integer noWorkCount = workOrderMapper.selectWorkCount(orderId);
			//查询该订单转生产订单的条数
			Integer yesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
			if (noWorkCount.equals(yesWorkCount)) {
			workOrderMapper.updateWorkType(orderId, state);
			} else {
			workOrderMapper.updateWorkType(orderId, states);
			}
			return true;
			}
			return true;
			else {
			return false;
			}

			} else {
			return false;
			}