Merge remote-tracking branch 'origin/master'

yyt

2024-01-23 d86d6a6dca39eff9cbd9073c9e23e58308864e51

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

@@ -25,7 +25,7 @@
 * 订单排产Controller
 * 
 * @author jiang
 * @date 2024-01-09
 * @date 2024-01-13
 */
@RestController
@RequestMapping("/bs/orderScheduling")
@@ -41,7 +41,16 @@
    @GetMapping("/list")
    public TableDataInfo list(BsOrderScheduling bsOrderScheduling)
    {
        startPage();
//        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);
    }
@@ -63,10 +72,10 @@
     * 获取订单排产详细信息
     */
    @PreAuthorize("@ss.hasPermi('bs:orderScheduling:query')")
    @GetMapping(value = "/{orderNumber}")
    public AjaxResult getInfo(@PathVariable("orderNumber") String orderNumber)
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return success(bsOrderSchedulingService.selectBsOrderSchedulingByOrderNumber(orderNumber));
        return success(bsOrderSchedulingService.selectBsOrderSchedulingById(id));
    }

    /**
@@ -96,9 +105,9 @@
     */
    @PreAuthorize("@ss.hasPermi('bs:orderScheduling:remove')")
    @Log(title = "订单排产", businessType = BusinessType.DELETE)
   @DeleteMapping("/{orderNumbers}")
    public AjaxResult remove(@PathVariable String[] orderNumbers)
   @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByOrderNumbers(orderNumbers));
        return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByIds(ids));
    }
}