fix 合箱上线

wujian

2024-01-20 6eaf0550980be829607795ad8d132c90ddb930c4

fix 合箱上线

 jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java

@@ -41,6 +41,15 @@
    @GetMapping("/list")
    public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
    {
        startPage();
        List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('bs:orderScheduling:list')")
    @GetMapping("/list2")
    public TableDataInfo list2(BsOrderScheduling bsOrderScheduling)
    {
//        startPage();
        List<BsOrderScheduling> list = bsOrderSchedulingService.selectBsOrderSchedulingList(bsOrderScheduling);
        return getDataTable(list);

 jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js

@@ -8,7 +8,13 @@
    params: query
  })
}

export function listOrderScheduling2(query) {
  return request({
    url: '/bs/orderScheduling/list2',
    method: 'get',
    params: query
  })
}
// 查询订单排产详细
export function getOrderScheduling(id) {
  return request({

 jcdm-ui/src/views/main/kb/prepareOnline/index.vue

@@ -92,7 +92,7 @@
</template>

<script>
import {listOrderScheduling} from "@/api/main/bs/orderScheduling/orderScheduling";
import {listOrderScheduling2} from "@/api/main/bs/orderScheduling/orderScheduling";
import VueQr from 'vue-qr'
export default {
  name: "index",
@@ -118,7 +118,7 @@
      this.getList();
    },
    getList(){
      listOrderScheduling(this.queryParams).then(response => {
      listOrderScheduling2(this.queryParams).then(response => {
        console.log("--------------------"+response.rows)
        this.dataList = response.rows
        if (this.queryParams.orderNo === '' || this.queryParams.orderNo === null){