diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java index d92b4a9..888f7f3 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesPurchaseOrderController.java @@ -115,9 +115,11 @@ public class MesPurchaseOrderController extends BaseController */ @RequiresPermissions("mes:purchaseOrder:bind") @GetMapping(value = "/getSaleOrders") - public AjaxResult getSaleOrders(MesSaleOrder querySaleOrder) + public TableDataInfo getSaleOrders(MesSaleOrder querySaleOrder) { - return success(mesSaleOrderService.selectMesSaleOrderList(querySaleOrder)); + startPage(); + List list = mesSaleOrderService.selectMesSaleOrderList(querySaleOrder); + return getDataTable(list); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java index a868be8..95ae136 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesPurchaseOrderServiceImpl.java @@ -106,6 +106,7 @@ public class MesPurchaseOrderServiceImpl implements IMesPurchaseOrderService { @Override @Transactional public int bindOrder(MesPurchaseOrder mesPurchaseOrder) { + //TODO:绑定前看看有没有生成的物料条码,或者判断采购订单状态是否已完成 mesPurchaseOrderMapper.deleteMesOrderBindByPurchaseOrderId(mesPurchaseOrder.getPurchaseOrderId()); Date currentDate = new Date();