2.2.4

MES：修改采购订单绑定销售订单信息

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<MesSaleOrder> list = mesSaleOrderService.selectMesSaleOrderList(querySaleOrder);
+        return getDataTable(list);
     }
 
 

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