ERP_override.git

			@@ -1035,7 +1035,7 @@
			.eq("order_sort", reportingWork.get("oldOrderNumber"))
			.eq("review_status",0)
			);
			if (patchLogs.isEmpty()){
			if (!patchLogs.isEmpty()){
			result.put("msg","旧订单存在补片未审核数据");
			result.put("data",false);
			return result;
			@@ -1046,7 +1046,7 @@
			.eq("order_sort", reportingWork.get("oldOrderNumber"))
			.eq("review_status",0)
			);
			if (patchLogs.isEmpty()){
			if (!patchLogs.isEmpty()){
			result.put("msg","旧订单存在返工未审核数据，请先审核报工后再进行转出");
			result.put("data",false);
			return result;
			@@ -1172,7 +1172,7 @@
			//restTemplate.postForObject("http://localhost:8086/order/test",orderNumberTransferList,String.class);

			//向mes发送http请求
			ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
			/*ResponseEntity<OrderNumberTransferDTO> response =restTemplate.exchange(
			"http://localhost:88/api/loadGlass/order/order/orderChange",
			HttpMethod.POST,
			new HttpEntity<>(orderNumberTransferList),
			@@ -1184,7 +1184,9 @@
			}else{
			result.put("msg","连接mes响应超时");
			result.put("data",false);
			}
			}*/

			result.put("data",true);
			return result;

			}
			@@ -1249,12 +1251,12 @@

			}

			public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
			return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
			}
			public List<BasicDataProduce> selectEquipmentByProcessSv(String process) {
			return reportingWorkMapper.SelectWorkBasicDeviceMp(process);
			}

			public String saveWorkStorage(Map<String, Object> object) {
			//List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
			//finishedGoodsInventoryService.addSelectWarehousing(object);
			return null;
			}}
			public String saveWorkStorage(Map<String, Object> object) {
			//List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData();
			//finishedGoodsInventoryService.addSelectWarehousing(object);
			return null;
			}}