From 4ecb79a0d2d8800f1c92a8a64fab7ffbc0593ffd Mon Sep 17 00:00:00 2001 From: xins Date: Thu, 16 May 2024 18:07:24 +0800 Subject: [PATCH] =?UTF-8?q?2.2.4=20MES=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E8=AE=A2=E5=8D=95=E7=BB=91=E5=AE=9A=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hw/mes/controller/MesPurchaseOrderController.java | 6 ++++-- .../hw/mes/service/impl/MesPurchaseOrderServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) 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();