diff --git a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java index 21bcbc6..fb1221b 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/rest/ProduceshiftorderController.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.order.service.ProduceshiftorderService; -import org.nl.acs.order.service.dto.ProduceshiftorderDto; import org.nl.annotation.Log; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -48,6 +47,13 @@ public class ProduceshiftorderController { return new ResponseEntity<>(produceshiftorderService.querySorting(whereJson, page), HttpStatus.OK); } + @GetMapping("/reload") + @Log("数据同步") + @ApiOperation("数据同步") + public ResponseEntity reload() { + produceshiftorderService.reload(); + return new ResponseEntity<>(HttpStatus.OK); + } @Log("查询工单明细") @ApiOperation("查询工单") diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java index 8474282..5669204 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java @@ -36,6 +36,11 @@ public interface ProduceshiftorderService { */ Map querySorting(Map whereJson, Pageable page); + /** + * 数据同步 + */ + void reload(); + /** * 查询所有数据不分页 * diff --git a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index d0e0e5a..4d39f07 100644 --- a/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -181,9 +181,6 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A return list; } - - - @Override public ProduceshiftorderDto findById(String order_id) { WQLObject wo = WQLObject.getWQLObject("acs_produceshiftorder"); diff --git a/qd/src/api/acs/order/order.js b/qd/src/api/acs/order/order.js index 3dea033..67bf528 100644 --- a/qd/src/api/acs/order/order.js +++ b/qd/src/api/acs/order/order.js @@ -114,5 +114,12 @@ export function selectTemplateList() { }) } +export function reload() { + return request({ + url: 'api/produceshiftorder/reload', + method: 'get' + }) +} + export default { add, edit, del, importExcel, getDtl, send, device_pause, device_restore, clear, stop, order_pause, order_force_complete, detail_pause, detail_force_complete, - selectTemplateList } + selectTemplateList, reload } diff --git a/qd/src/views/acs/order/index.vue b/qd/src/views/acs/order/index.vue index 97f9645..fe7eda1 100644 --- a/qd/src/views/acs/order/index.vue +++ b/qd/src/views/acs/order/index.vue @@ -25,6 +25,16 @@ > 开始分拣 + + 同步 + @@ -284,6 +294,13 @@ export default { this.$refs.upload.submit() this.dialogVisible = false }, + reload() { + crudProduceshiftorder.reload().then(res => { + this.crud.toQuery() + }).catch(err => { + console.log(err.response.data.message) + }) + }, send(data) { debugger if (data[0].order_status !== '00') {