| | |
|---|
| | | .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; |
|---|
| | |
|---|
| | | .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; |
|---|
| | |
|---|
| | | //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), |
|---|
| | |
|---|
| | | }else{ |
|---|
| | | result.put("msg","连接mes响应超时"); |
|---|
| | | result.put("data",false); |
|---|
| | | } |
|---|
| | | }*/ |
|---|
| | | |
|---|
| | | result.put("data",true); |
|---|
| | | return result; |
|---|
| | | |
|---|
| | | } |
|---|
| | |
|---|
| | | //List<Map<String, Object>> flowCard = reportingWorkMapper.getStorageData(); |
|---|
| | | //finishedGoodsInventoryService.addSelectWarehousing(object); |
|---|
| | | return null; |
|---|
| | | }} |
|---|
| | | } |
|---|
| | | |
|---|
| | | public Map<String, Object> mesBasicDataSv() { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | //工序 |
|---|
| | | map.put("process",flowCardMapper.getProcessNameList()); |
|---|
| | | //设备下拉框 |
|---|
| | | map.put("device", reportingWorkMapper.mesSelectWorkBasicDeviceMp()); |
|---|
| | | //班组下拉框 |
|---|
| | | map.put("teams", reportingWorkMapper.mesSelectWorkBasicTeamsMp()); |
|---|
| | | //次破类型 |
|---|
| | | map.put("breakageType", reportingWorkMapper.selectBasicNameByType("breakagetype")); |
|---|
| | | //次破原因 |
|---|
| | | map.put("breakageReason", reportingWorkMapper.selectBasicNameByType("breakagereason")); |
|---|
| | | return map; |
|---|
| | | } |
|---|
| | | } |
|---|
