Merge branch 'master' of http://121.40.234.130:8899/root/hl_zgbz

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<Object> reload() {
+        produceshiftorderService.reload();
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
 
     @Log("查询工单明细")
     @ApiOperation("查询工单")

nladmin-system/src/main/java/org/nl/acs/order/service/ProduceshiftorderService.java

@@ -36,6 +36,11 @@ public interface ProduceshiftorderService {
      */
     Map<String, Object> querySorting(Map whereJson, Pageable page);
 
+    /**
+     * 数据同步
+     */
+    void reload();
+
     /**
      * 查询所有数据不分页
      *

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");

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 }

qd/src/views/acs/order/index.vue

@@ -25,6 +25,16 @@
         >
           开始分拣
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="primary"
+          icon="el-icon-refresh"
+          @click="reload"
+        >
+          同步
+        </el-button>
       </crudOperation>
 
       <!--    文件上传弹出框-->
@@ -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') {