From 3dac744226f363275816f2c4cb01e3ccccec0b42 Mon Sep 17 00:00:00 2001
From: xs <xins@mesnac.com>
Date: Sat, 2 Nov 2024 16:59:13 +0800
Subject: [PATCH] =?UTF-8?q?3.4.3=201=E3=80=81=E5=9C=A8=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=B7=B2=E7=BB=91=E5=AE=9A=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=9F=A5=E7=9C=8B=202=E3=80=81=E5=9C=A8?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=92=8C=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=8F=AF=E4=BB=8EERP=E7=AB=8B?=
 =?UTF-8?q?=E5=8D=B3=E5=90=8C=E6=AD=A5=203=E3=80=81=E5=8E=9F=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E6=9D=A1=E7=A0=81=E5=92=8C=E7=94=9F=E4=BA=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E9=80=89=E6=8B=A9=E4=BF=A1=E6=81=AF=E6=97=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0radiobox=204=E3=80=81=E5=88=A0=E9=99=A4=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=8C=89=E9=92=AE=E5=92=8Cright-toolbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/enums/WmsLocationStatus.java  |   5 +-
 .../mes/controller/MesMobileController.java   |   1 +
 .../controller/MesSaleOrderController.java    |  16 ++-
 .../com/hw/mes/domain/MesBasePalletInfo.java  |  11 ++
 .../impl/MesBasePalletInfoServiceImpl.java    |   1 +
 .../mapper/mes/MesBasePalletInfoMapper.xml    |   2 +
 .../mapper/mes/MesOrderBindMapper.xml         |   2 +
 .../system/controller/SysMenuController.java  |  16 ++-
 .../com/hw/system/mapper/SysMenuMapper.java   |  16 +++
 .../hw/system/service/ISysMenuService.java    |   8 ++
 .../service/impl/SysMenuServiceImpl.java      |  24 ++++
 .../resources/mapper/system/SysMenuMapper.xml |  19 ++++
 .../mapper/wms/WmsRawOutstockMapper.xml       |   1 +
 hw-ui/src/api/mes/saleOrder.js                |  10 ++
 hw-ui/src/views/dms/bom/index.vue             |   2 +-
 hw-ui/src/views/dms/checkplan/index.vue       |  20 ++--
 hw-ui/src/views/dms/debugging/index.vue       |  20 ++--
 .../src/views/dms/dmsBaseAlarmRule/index.vue  |  23 ++--
 .../views/dms/dmsBaseInspectProject/index.vue |  20 ++--
 .../views/dms/dmsBaseInspectRoute/index.vue   |  20 ++--
 .../dms/dmsBaseInspectStandard/index.vue      |  20 ++--
 .../views/dms/dmsBaseMaintProject/index.vue   |  21 ++--
 .../views/dms/dmsBillsLubeDetail/index.vue    |  20 ++--
 .../views/dms/dmsBillsMaintDetail/index.vue   |  20 ++--
 hw-ui/src/views/dms/dmsFiles/index.vue        |  21 ++--
 hw-ui/src/views/dms/dmsInfo/index.vue         |  20 ++--
 hw-ui/src/views/dms/dmsPlanInspect/index.vue  |  20 ++--
 .../views/dms/dmsRecordAlarmInfo/index.vue    |  23 ++--
 .../src/views/dms/dmsRecordInspect/index.vue  |  20 ++--
 hw-ui/src/views/dms/dmsRecordLube/index.vue   |  20 ++--
 hw-ui/src/views/dms/dmsRepair/index.vue       |  20 ++--
 hw-ui/src/views/dms/info/index.vue            |  20 ++--
 hw-ui/src/views/dms/install/index.vue         |  20 ++--
 hw-ui/src/views/dms/knowledgeLube/index.vue   |  20 ++--
 hw-ui/src/views/dms/knowledgeRepair/index.vue |  20 ++--
 hw-ui/src/views/dms/konwledgeMaint/index.vue  |  20 ++--
 hw-ui/src/views/dms/ledger/index.vue          |  20 ++--
 hw-ui/src/views/dms/lubeDetail/index.vue      |   2 +-
 hw-ui/src/views/dms/lubeStandard/index.vue    |  20 ++--
 hw-ui/src/views/dms/lubeStation/index.vue     |  22 ++--
 .../dms/operate/devicedepreciation/index.vue  |  21 ++--
 hw-ui/src/views/dms/param/index.vue           |  20 ++--
 hw-ui/src/views/dms/purchase/index.vue        |  22 ++--
 hw-ui/src/views/dms/shutReason/index.vue      |  21 ++--
 hw-ui/src/views/dms/shutType/index.vue        |  21 ++--
 .../views/dms/specialDeviceParam/index.vue    |  20 ++--
 hw-ui/src/views/dms/standard/index.vue        |  20 ++--
 hw-ui/src/views/dms/station/index.vue         |  20 ++--
 hw-ui/src/views/dms/suplier/index.vue         |  21 ++--
 .../views/ems/base/Energystatistics/index.vue |  10 +-
 .../ems/base/HistoryElectricity/index.vue     |   2 +-
 .../ems/base/baseCollectDeviceInfo/index.vue  |   2 +-
 .../base/baseMonitorInfoIOTDevice/index.vue   |   2 +-
 .../views/ems/base/basepublicuser/index.vue   |  24 ++--
 .../src/views/ems/base/businessType/index.vue |   2 +-
 .../src/views/ems/base/dnbThreshold/index.vue |  20 ++--
 .../views/ems/base/exception/data/index.vue   |  20 ++--
 hw-ui/src/views/ems/base/info/index.vue       |  20 ++--
 .../src/views/ems/base/lineMonitor/index.vue  |  20 ++--
 hw-ui/src/views/ems/base/loss/index.vue       |  22 ++--
 hw-ui/src/views/ems/base/threshold/index.vue  |  20 ++--
 hw-ui/src/views/ems/base/type/index.vue       |  40 +++----
 .../src/views/ems/base/typeRelation/index.vue |  20 ++--
 hw-ui/src/views/mes/materialinfo/index.vue    |  25 ++++-
 .../views/mes/materialinfo/selectMaterial.vue |  24 +++-
 .../views/mes/productOrder/addSaleOrder.vue   |  29 ++++-
 hw-ui/src/views/mes/productOrder/index.vue    |  14 +--
 hw-ui/src/views/mes/projectinfo/index.vue     |  27 ++++-
 .../src/views/mes/purchaseOrder/bindOrder.vue |  20 +++-
 hw-ui/src/views/mes/purchaseOrder/index.vue   |  97 +++++++++++++++-
 .../mes/purchaseOrder/selectOrderBind.vue     |  44 ++++++--
 .../views/mes/saleOrder/bindingPurchase.vue   |  46 +++++++-
 hw-ui/src/views/mes/saleOrder/index.vue       |  52 +++++++++
 hw-ui/src/views/mes/saleOrder/orderBinds.vue  | 105 ++++++++++++++++++
 hw-ui/src/views/mes/supplierInfo/index.vue    |  93 ++++++++++------
 hw-ui/src/views/wms/info/rawinstock/index.vue |   2 +-
 76 files changed, 1079 insertions(+), 535 deletions(-)
 create mode 100644 hw-ui/src/views/mes/saleOrder/orderBinds.vue

diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java
index 17a1161..79b9065 100644
--- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java
+++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/enums/WmsLocationStatus.java
@@ -11,9 +11,10 @@ import java.util.stream.Collectors;
  */
 public enum WmsLocationStatus
 {
-    NORMAL("1", "正常"), AUTOLOCK("2", "自动锁定"), MANUALLOCK("3", "人工锁定"),
+    NORMAL("1", "正常"), AUTOLOCK("2", "自动锁定(入库锁定)"), MANUALLOCK("3", "人工锁定"),
     MOVELOCK("4", "移库锁定"), MERGELOCK("5", "合库锁定"),
-    OUTLOCK("6", "出库锁定"),OUTSIDELOCATIONABNORMAL("8", "因浅库位异常导致深库位不可用"),ABNORMAL("9", "异常");
+    OUTLOCK("6", "出库锁定"),RETURN_OUTLOCK("7", "退货出库锁定"),
+    OUTSIDELOCATIONABNORMAL("8", "因浅库位异常导致深库位不可用"),ABNORMAL("9", "异常");
 
     private final String code;
     private final String info;
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMobileController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMobileController.java
index f6d58d0..3e4afad 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMobileController.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesMobileController.java
@@ -44,6 +44,7 @@ public class MesMobileController extends BaseController {
     @GetMapping("/getMesPalletInfos")
     public TableDataInfo getMesPalletInfos(MesBasePalletInfo mesBasePalletInfo) {
         startPage();
+        mesBasePalletInfo.setBindFlag("1");
         List<MesBasePalletInfo> list = mesBasePalletInfoService.selectMesBasePalletInfoList(mesBasePalletInfo);
         return getDataTable(list);
     }
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesSaleOrderController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesSaleOrderController.java
index 641b5da..99b2001 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesSaleOrderController.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesSaleOrderController.java
@@ -6,8 +6,10 @@ import javax.servlet.http.HttpServletResponse;
 import com.hw.common.core.domain.R;
 import com.hw.common.security.annotation.InnerAuth;
 import com.hw.mes.api.domain.MesBaseBarcodeInfo;
+import com.hw.mes.api.domain.MesOrderBind;
 import com.hw.mes.api.domain.MesSaleOrderRelate;
 import com.hw.mes.api.domain.vo.MesSaleOrderTransferVo;
+import com.hw.mes.service.IMesOrderBindService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -38,7 +40,8 @@ import com.hw.common.core.web.page.TableDataInfo;
 public class MesSaleOrderController extends BaseController {
     @Autowired
     private IMesSaleOrderService mesSaleOrderService;
-
+    @Autowired
+    private IMesOrderBindService mesOrderBindService;
 
     /**
      * 查询销售订单信息列表
@@ -103,6 +106,17 @@ public class MesSaleOrderController extends BaseController {
     }
 
 
+
+    @GetMapping("/listOrderBinds")
+    public TableDataInfo listOrderBinds(MesOrderBind mesOrderBind) {
+        startPage();
+        List<MesOrderBind> list = mesOrderBindService.selectMesOrderBindJoinList(mesOrderBind);
+        return getDataTable(list);
+    }
+
+
+
+
     /**
      * 库存转销售订单
      */
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
index c8bfb09..c3dcc18 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesBasePalletInfo.java
@@ -43,6 +43,9 @@ public class MesBasePalletInfo extends BaseEntity
     @Excel(name = "绑定数量")
     private BigDecimal bindAmount;
 
+    private String bindFlag;
+
+
     public void setPalletInfoId(Long palletInfoId)
     {
         this.palletInfoId = palletInfoId;
@@ -107,6 +110,14 @@ public class MesBasePalletInfo extends BaseEntity
         return bindAmount;
     }
 
+    public String getBindFlag() {
+        return bindFlag;
+    }
+
+    public void setBindFlag(String bindFlag) {
+        this.bindFlag = bindFlag;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java
index d5d59e2..a9ad3d4 100644
--- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java
+++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesBasePalletInfoServiceImpl.java
@@ -191,6 +191,7 @@ public class MesBasePalletInfoServiceImpl implements IMesBasePalletInfoService {
 
         mesBasePalletInfo.setMaterialBarcode(materialBarcode);
         mesBasePalletInfo.setMaterialId(mesBaseBarcodeInfo.getMaterialId());
+        mesBasePalletInfo.setMaterialCode(mesBasePalletInfo.getMaterialCode());
         mesBasePalletInfo.setMaterialName(mesBaseBarcodeInfo.getMaterialName());
         mesBasePalletInfo.setUpdateBy(userName);
         mesBasePalletInfo.setUpdateTime(currentDate);
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml
index ce650cb..e0237c3 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesBasePalletInfoMapper.xml
@@ -28,7 +28,9 @@
         <where>
             <if test="palletInfoCode != null  and palletInfoCode != ''">and pallet_info_code = #{palletInfoCode}</if>
             <if test="materialBarcode != null  and materialBarcode != ''">and material_barcode = #{materialBarcode}</if>
+            <if test="bindFlag != null  and bindFlag != ''">and material_barcode is not null</if>
         </where>
+        order by update_time desc
     </select>
 
     <select id="selectMesBasePalletInfoByPalletInfoId" parameterType="Long" resultMap="MesBasePalletInfoResult">
diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
index 224236f..8b4482a 100644
--- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
+++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesOrderBindMapper.xml
@@ -153,6 +153,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="mergeFlag != null  and mergeFlag != ''"> and mob.bind_amount=1 and mob.barcode_amount=0 and mso.order_amount=1</if>
             <if test="singleFlag != null  and singleFlag != ''"> and mob.bind_amount &gt; mob.barcode_amount</if>
             <if test="safeFlag != null  and safeFlag != ''"> and mob.safe_flag = #{safeFlag}</if>
+            <if test="saleOrderId != null"> and mob.sale_order_id = #{saleOrderId}</if>
+            <if test="purchaseOrderId != null"> and mob.purchase_order_id = #{purchaseOrderId}</if>
             <if test="saleOrderCode != null  and saleOrderCode != ''"> and mob.sale_order_code like concat('%', #{saleOrderCode}, '%')</if>
             <if test="productCode != null  and productCode != ''"> and pbmi.product_code like concat('%', #{productCode}, '%')</if>
             <if test="productName != null  and productName != ''"> and pbmi.product_name like concat('%', #{productName}, '%')</if>
diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysMenuController.java b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysMenuController.java
index 5b0bd99..27ed804 100644
--- a/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysMenuController.java
+++ b/hw-modules/hw-system/src/main/java/com/hw/system/controller/SysMenuController.java
@@ -159,7 +159,7 @@ public class SysMenuController extends BaseController
 
 
     /**
-     * 获取路由信息
+     * 获取PDA路由信息
      *
      * @return 路由信息
      */
@@ -170,4 +170,18 @@ public class SysMenuController extends BaseController
         List<SysMenu> menus = menuService.selectPdaMenuTreeByUserId(userId);
         return success(menus);
     }
+
+
+    /**
+     * 获取WCS路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getWcsRouters")
+    public AjaxResult getWcsRouters()
+    {
+        Long userId = SecurityUtils.getUserId();
+        List<SysMenu> menus = menuService.selectWcsMenuTreeByUserId(userId);
+        return success(menus);
+    }
 }
diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/mapper/SysMenuMapper.java b/hw-modules/hw-system/src/main/java/com/hw/system/mapper/SysMenuMapper.java
index c53fcf9..c1be66f 100644
--- a/hw-modules/hw-system/src/main/java/com/hw/system/mapper/SysMenuMapper.java
+++ b/hw-modules/hw-system/src/main/java/com/hw/system/mapper/SysMenuMapper.java
@@ -147,4 +147,20 @@ public interface SysMenuMapper
     public List<SysMenu> selectPdaMenuTreeByUserId(Long userId);
 
 
+
+    /**
+     * 根据用户ID查询WCS菜单
+     *
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectWcsMenuTreeAll();
+
+    /**
+     * 根据用户ID查询WCS菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectWcsMenuTreeByUserId(Long userId);
+
 }
diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/service/ISysMenuService.java b/hw-modules/hw-system/src/main/java/com/hw/system/service/ISysMenuService.java
index 9b971bb..8010203 100644
--- a/hw-modules/hw-system/src/main/java/com/hw/system/service/ISysMenuService.java
+++ b/hw-modules/hw-system/src/main/java/com/hw/system/service/ISysMenuService.java
@@ -150,4 +150,12 @@ public interface ISysMenuService
      * @return 菜单列表
      */
     public List<SysMenu> selectPdaMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询调度菜单
+     *
+     * @param userId 用户名称
+     * @return 菜单列表
+     */
+    public List<SysMenu> selectWcsMenuTreeByUserId(Long userId);
 }
diff --git a/hw-modules/hw-system/src/main/java/com/hw/system/service/impl/SysMenuServiceImpl.java b/hw-modules/hw-system/src/main/java/com/hw/system/service/impl/SysMenuServiceImpl.java
index c6c5580..1d6f490 100644
--- a/hw-modules/hw-system/src/main/java/com/hw/system/service/impl/SysMenuServiceImpl.java
+++ b/hw-modules/hw-system/src/main/java/com/hw/system/service/impl/SysMenuServiceImpl.java
@@ -557,4 +557,28 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
         return getChildPerms(menus, pdaParentId);
     }
+
+
+
+    /**
+     * 根据用户ID查询调度菜单
+     *
+     * @param userId 用户名称
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectWcsMenuTreeByUserId(Long userId)
+    {
+        int pdaParentId = 2900;
+        List<SysMenu> menus = null;
+        if (SecurityUtils.isAdmin(userId))
+        {
+            menus = menuMapper.selectWcsMenuTreeAll();
+        }
+        else
+        {
+            menus = menuMapper.selectWcsMenuTreeByUserId(userId);
+        }
+        return getChildPerms(menus, pdaParentId);
+    }
 }
diff --git a/hw-modules/hw-system/src/main/resources/mapper/system/SysMenuMapper.xml b/hw-modules/hw-system/src/main/resources/mapper/system/SysMenuMapper.xml
index b11b65c..29f6ca4 100644
--- a/hw-modules/hw-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/hw-modules/hw-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -227,4 +227,23 @@
 	</select>
 
 
+	<select id="selectWcsMenuTreeAll" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m where m.menu_type = 'W' and m.parent_id!=0 and m.status = 0
+		order by m.parent_id, m.order_num
+	</select>
+
+	<select id="selectWcsMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m
+				 left join sys_role_menu rm on m.menu_id = rm.menu_id
+				 left join sys_user_role ur on rm.role_id = ur.role_id
+				 left join sys_role ro on ur.role_id = ro.role_id
+				 left join sys_user u on ur.user_id = u.user_id
+		where u.user_id = #{userId} and m.parent_id!=0 and m.menu_type ='W' and m.status = 0  AND ro.status = 0
+		order by m.parent_id, m.order_num
+	</select>
+
+
+
 </mapper>
diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
index 1dc8714..544dedf 100644
--- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
+++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockMapper.xml
@@ -110,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beginTime != null "> and begin_time = #{beginTime}</if>
             <if test="endTime != null "> and end_time = #{endTime}</if>
         </where>
+        order by apply_date desc
     </select>
 
     <select id="selectWmsRawOutstockByRawOutstockId" parameterType="Long" resultMap="WmsRawOutstockResult">
diff --git a/hw-ui/src/api/mes/saleOrder.js b/hw-ui/src/api/mes/saleOrder.js
index f907df7..2c724d4 100644
--- a/hw-ui/src/api/mes/saleOrder.js
+++ b/hw-ui/src/api/mes/saleOrder.js
@@ -42,3 +42,13 @@ export function delSaleOrder(saleOrderId) {
     method: 'delete'
   })
 }
+
+
+// 查询销售订单绑定采购订单信息列表
+export function listOrderBinds(query) {
+  return request({
+    url: '/mes/saleOrder/listOrderBinds',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/hw-ui/src/views/dms/bom/index.vue b/hw-ui/src/views/dms/bom/index.vue
index 0bb0b7c..281535e 100644
--- a/hw-ui/src/views/dms/bom/index.vue
+++ b/hw-ui/src/views/dms/bom/index.vue
@@ -102,7 +102,7 @@
           @click="toggleExpandAll"
         >展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table
diff --git a/hw-ui/src/views/dms/checkplan/index.vue b/hw-ui/src/views/dms/checkplan/index.vue
index ad44d16..d0192ab 100644
--- a/hw-ui/src/views/dms/checkplan/index.vue
+++ b/hw-ui/src/views/dms/checkplan/index.vue
@@ -111,16 +111,16 @@
           v-hasPermi="['dms:checkplan:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:checkplan:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:checkplan:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="checkplanList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/debugging/index.vue b/hw-ui/src/views/dms/debugging/index.vue
index 0e7072b..357ba39 100644
--- a/hw-ui/src/views/dms/debugging/index.vue
+++ b/hw-ui/src/views/dms/debugging/index.vue
@@ -115,16 +115,16 @@
           v-hasPermi="['dms:debugging:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:debugging:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:debugging:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="debuggingList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue b/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue
index 5d597b9..cd0c4a9 100644
--- a/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue
@@ -99,18 +99,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsBaseAlarmRule:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsBaseAlarmRule:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsBaseAlarmRuleList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
index 7ac76e2..f894bb8 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectProject/index.vue
@@ -104,16 +104,16 @@
           v-hasPermi="['dms:dmsBaseInspectProject:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsBaseInspectProject:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsBaseInspectProject:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsBaseInspectProjectList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue b/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
index f893f62..bd96d34 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectRoute/index.vue
@@ -95,16 +95,16 @@
           v-hasPermi="['dms:dmsBaseInspectRoute:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsBaseInspectRoute:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsBaseInspectRoute:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsBaseInspectRouteList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue b/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
index e974992..137dc43 100644
--- a/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseInspectStandard/index.vue
@@ -88,16 +88,16 @@
           v-hasPermi="['dms:dmsBaseInspectStandard:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsBaseInspectStandard:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsBaseInspectStandard:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsBaseInspectStandardList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue b/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
index ac06a03..49cb1e7 100644
--- a/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
+++ b/hw-ui/src/views/dms/dmsBaseMaintProject/index.vue
@@ -48,17 +48,16 @@
           v-hasPermi="['dms:dmsBaseMaintProject:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsBaseMaintProject:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsBaseMaintProject:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsBaseMaintProjectList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBillsLubeDetail/index.vue b/hw-ui/src/views/dms/dmsBillsLubeDetail/index.vue
index a8ae071..3b58714 100644
--- a/hw-ui/src/views/dms/dmsBillsLubeDetail/index.vue
+++ b/hw-ui/src/views/dms/dmsBillsLubeDetail/index.vue
@@ -88,16 +88,16 @@
           v-hasPermi="['dms:billslubedetail:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:billslubedetail:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:billslubedetail:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="billslubedetailList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsBillsMaintDetail/index.vue b/hw-ui/src/views/dms/dmsBillsMaintDetail/index.vue
index bc8bd24..846af95 100644
--- a/hw-ui/src/views/dms/dmsBillsMaintDetail/index.vue
+++ b/hw-ui/src/views/dms/dmsBillsMaintDetail/index.vue
@@ -88,16 +88,16 @@
           v-hasPermi="['dms:billsmaintdetail:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:billsmaintdetail:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:billsmaintdetail:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="billsmaintdetailList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsFiles/index.vue b/hw-ui/src/views/dms/dmsFiles/index.vue
index 9267a52..8ece5bd 100644
--- a/hw-ui/src/views/dms/dmsFiles/index.vue
+++ b/hw-ui/src/views/dms/dmsFiles/index.vue
@@ -88,17 +88,16 @@
           v-hasPermi="['dms:dmsFiles:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsFiles:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsFiles:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsFilesList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsInfo/index.vue b/hw-ui/src/views/dms/dmsInfo/index.vue
index b52d1e4..df0e1f3 100644
--- a/hw-ui/src/views/dms/dmsInfo/index.vue
+++ b/hw-ui/src/views/dms/dmsInfo/index.vue
@@ -103,16 +103,16 @@
           v-hasPermi="['dms:dmsInfo:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsInfo:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsInfo:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsInfoList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsPlanInspect/index.vue b/hw-ui/src/views/dms/dmsPlanInspect/index.vue
index 77d9807..eb26eec 100644
--- a/hw-ui/src/views/dms/dmsPlanInspect/index.vue
+++ b/hw-ui/src/views/dms/dmsPlanInspect/index.vue
@@ -120,16 +120,16 @@
           v-hasPermi="['dms:dmsPlanInspect:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsPlanInspect:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsPlanInspect:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsPlanInspectList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsRecordAlarmInfo/index.vue b/hw-ui/src/views/dms/dmsRecordAlarmInfo/index.vue
index 9c37583..6f3062c 100644
--- a/hw-ui/src/views/dms/dmsRecordAlarmInfo/index.vue
+++ b/hw-ui/src/views/dms/dmsRecordAlarmInfo/index.vue
@@ -134,18 +134,17 @@
         >删除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsRecordAlarmInfo:export']"
-        >导出
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsRecordAlarmInfo:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsRecordAlarmInfoList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsRecordInspect/index.vue b/hw-ui/src/views/dms/dmsRecordInspect/index.vue
index ca423e9..a942d96 100644
--- a/hw-ui/src/views/dms/dmsRecordInspect/index.vue
+++ b/hw-ui/src/views/dms/dmsRecordInspect/index.vue
@@ -131,16 +131,16 @@
           v-hasPermi="['dms:dmsRecordInspect:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsRecordInspect:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsRecordInspect:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsRecordInspectList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsRecordLube/index.vue b/hw-ui/src/views/dms/dmsRecordLube/index.vue
index a59e430..658b80e 100644
--- a/hw-ui/src/views/dms/dmsRecordLube/index.vue
+++ b/hw-ui/src/views/dms/dmsRecordLube/index.vue
@@ -164,16 +164,16 @@
           v-hasPermi="['dms:dmsRecordLube:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsRecordLube:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsRecordLube:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsRecordLubeList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/dmsRepair/index.vue b/hw-ui/src/views/dms/dmsRepair/index.vue
index 36d7c83..257db6d 100644
--- a/hw-ui/src/views/dms/dmsRepair/index.vue
+++ b/hw-ui/src/views/dms/dmsRepair/index.vue
@@ -113,16 +113,16 @@
           v-hasPermi="['dms:dmsRepair:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:dmsRepair:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:dmsRepair:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dmsRepairList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/info/index.vue b/hw-ui/src/views/dms/info/index.vue
index eb8fee1..dece8a4 100644
--- a/hw-ui/src/views/dms/info/index.vue
+++ b/hw-ui/src/views/dms/info/index.vue
@@ -118,16 +118,16 @@
           disabled
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:info:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:info:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/install/index.vue b/hw-ui/src/views/dms/install/index.vue
index a1cabd8..1bd4d9d 100644
--- a/hw-ui/src/views/dms/install/index.vue
+++ b/hw-ui/src/views/dms/install/index.vue
@@ -101,16 +101,16 @@
           disabled
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:install:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:install:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="installList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/knowledgeLube/index.vue b/hw-ui/src/views/dms/knowledgeLube/index.vue
index 1f49df3..9646b7a 100644
--- a/hw-ui/src/views/dms/knowledgeLube/index.vue
+++ b/hw-ui/src/views/dms/knowledgeLube/index.vue
@@ -70,16 +70,16 @@
           v-hasPermi="['dms:knowledgeLube:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:knowledgeLube:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:knowledgeLube:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/knowledgeRepair/index.vue b/hw-ui/src/views/dms/knowledgeRepair/index.vue
index 62a1edd..ec28326 100644
--- a/hw-ui/src/views/dms/knowledgeRepair/index.vue
+++ b/hw-ui/src/views/dms/knowledgeRepair/index.vue
@@ -66,16 +66,16 @@
           v-hasPermi="['dms:knowledgeRepair:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:knowledgeRepair:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:knowledgeRepair:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/konwledgeMaint/index.vue b/hw-ui/src/views/dms/konwledgeMaint/index.vue
index 9145c6b..a87b2cf 100644
--- a/hw-ui/src/views/dms/konwledgeMaint/index.vue
+++ b/hw-ui/src/views/dms/konwledgeMaint/index.vue
@@ -68,16 +68,16 @@
           v-hasPermi="['dms:konwledgeMaint:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:konwledgeMaint:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:konwledgeMaint:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/ledger/index.vue b/hw-ui/src/views/dms/ledger/index.vue
index ef50068..5949eb2 100644
--- a/hw-ui/src/views/dms/ledger/index.vue
+++ b/hw-ui/src/views/dms/ledger/index.vue
@@ -156,16 +156,16 @@
           v-hasPermi="['dms:ledger:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:ledger:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:ledger:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/lubeDetail/index.vue b/hw-ui/src/views/dms/lubeDetail/index.vue
index 5d65d2e..d29bca3 100644
--- a/hw-ui/src/views/dms/lubeDetail/index.vue
+++ b/hw-ui/src/views/dms/lubeDetail/index.vue
@@ -22,7 +22,7 @@
           v-hasPermi="['dms:lubeDetail:add']"
         >新增</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
     <el-table v-loading="loading" :data="lubeDetailList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
diff --git a/hw-ui/src/views/dms/lubeStandard/index.vue b/hw-ui/src/views/dms/lubeStandard/index.vue
index a233215..778ae30 100644
--- a/hw-ui/src/views/dms/lubeStandard/index.vue
+++ b/hw-ui/src/views/dms/lubeStandard/index.vue
@@ -80,16 +80,16 @@
           v-hasPermi="['dms:lubeStandard:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:lubeStandard:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:lubeStandard:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/lubeStation/index.vue b/hw-ui/src/views/dms/lubeStation/index.vue
index a7b6c53..4c02d50 100644
--- a/hw-ui/src/views/dms/lubeStation/index.vue
+++ b/hw-ui/src/views/dms/lubeStation/index.vue
@@ -105,17 +105,17 @@
           v-hasPermi="['dms:lubeStation:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:lubeStation:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:lubeStation:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="lubeStationList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/operate/devicedepreciation/index.vue b/hw-ui/src/views/dms/operate/devicedepreciation/index.vue
index cb5c676..1cb0c0f 100644
--- a/hw-ui/src/views/dms/operate/devicedepreciation/index.vue
+++ b/hw-ui/src/views/dms/operate/devicedepreciation/index.vue
@@ -116,17 +116,16 @@
           v-hasPermi="['dms:devicedepreciation:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:devicedepreciation:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:devicedepreciation:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="devicedepreciationList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/param/index.vue b/hw-ui/src/views/dms/param/index.vue
index b350d57..fd96e2f 100644
--- a/hw-ui/src/views/dms/param/index.vue
+++ b/hw-ui/src/views/dms/param/index.vue
@@ -104,16 +104,16 @@
           v-hasPermi="['dms:param:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:param:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:param:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/purchase/index.vue b/hw-ui/src/views/dms/purchase/index.vue
index c516ffb..a12b7d9 100644
--- a/hw-ui/src/views/dms/purchase/index.vue
+++ b/hw-ui/src/views/dms/purchase/index.vue
@@ -107,17 +107,17 @@
           v-hasPermi="['dms:purchase:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:purchase:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:purchase:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="purchaseList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/shutReason/index.vue b/hw-ui/src/views/dms/shutReason/index.vue
index 240fed9..54003bc 100644
--- a/hw-ui/src/views/dms/shutReason/index.vue
+++ b/hw-ui/src/views/dms/shutReason/index.vue
@@ -100,17 +100,16 @@
           v-hasPermi="['dms:shutReason:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:shutReason:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:shutReason:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="shutReasonList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/shutType/index.vue b/hw-ui/src/views/dms/shutType/index.vue
index 87133a9..ab11a3e 100644
--- a/hw-ui/src/views/dms/shutType/index.vue
+++ b/hw-ui/src/views/dms/shutType/index.vue
@@ -65,17 +65,16 @@
           v-hasPermi="['dms:shutType:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:shutType:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:shutType:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="shutTypeList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/specialDeviceParam/index.vue b/hw-ui/src/views/dms/specialDeviceParam/index.vue
index 8e6e725..e445665 100644
--- a/hw-ui/src/views/dms/specialDeviceParam/index.vue
+++ b/hw-ui/src/views/dms/specialDeviceParam/index.vue
@@ -96,16 +96,16 @@
           v-hasPermi="['dms:specialDeviceParam:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:specialDeviceParam:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:specialDeviceParam:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/standard/index.vue b/hw-ui/src/views/dms/standard/index.vue
index c2b339c..e3b3009 100644
--- a/hw-ui/src/views/dms/standard/index.vue
+++ b/hw-ui/src/views/dms/standard/index.vue
@@ -88,16 +88,16 @@
           v-hasPermi="['dms:standard:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:standard:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:standard:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/dms/station/index.vue b/hw-ui/src/views/dms/station/index.vue
index c6d5a0a..6e029cd 100644
--- a/hw-ui/src/views/dms/station/index.vue
+++ b/hw-ui/src/views/dms/station/index.vue
@@ -81,16 +81,16 @@
           v-hasPermi="['dms:station:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:station:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:station:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="stationList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/dms/suplier/index.vue b/hw-ui/src/views/dms/suplier/index.vue
index 2c99d38..4272e56 100644
--- a/hw-ui/src/views/dms/suplier/index.vue
+++ b/hw-ui/src/views/dms/suplier/index.vue
@@ -89,17 +89,16 @@
           v-hasPermi="['dms:suplier:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['dms:suplier:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['dms:suplier:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="suplierList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/ems/base/Energystatistics/index.vue b/hw-ui/src/views/ems/base/Energystatistics/index.vue
index 97ea683..06c7b62 100644
--- a/hw-ui/src/views/ems/base/Energystatistics/index.vue
+++ b/hw-ui/src/views/ems/base/Energystatistics/index.vue
@@ -102,11 +102,11 @@
               kW·h
             </div>
           </div>
-          <right-toolbar
-            :showSearch.sync="showSearch"
-            @queryTable="getList"
-            :columns="columns"
-          ></right-toolbar>
+<!--          <right-toolbar-->
+<!--            :showSearch.sync="showSearch"-->
+<!--            @queryTable="getList"-->
+<!--            :columns="columns"-->
+<!--          ></right-toolbar>-->
         </el-row>
         <!-- 用户表格 -->
         <el-table
diff --git a/hw-ui/src/views/ems/base/HistoryElectricity/index.vue b/hw-ui/src/views/ems/base/HistoryElectricity/index.vue
index b6439e3..234769c 100644
--- a/hw-ui/src/views/ems/base/HistoryElectricity/index.vue
+++ b/hw-ui/src/views/ems/base/HistoryElectricity/index.vue
@@ -102,7 +102,7 @@
               @click="handleExport"
             >导出</el-button>
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+<!--          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
         </el-row>
         <!-- 用户表格 -->
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue b/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
index 8daff49..77e8309 100644
--- a/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
+++ b/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -90,7 +90,7 @@
         >导出
         </el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="baseCollectDeviceInfoList" @selection-change="handleSelectionChange">
diff --git a/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index 5eef614..869a99d 100644
--- a/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -48,7 +48,7 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
     </el-row>
 
     <el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId"
diff --git a/hw-ui/src/views/ems/base/basepublicuser/index.vue b/hw-ui/src/views/ems/base/basepublicuser/index.vue
index f0c3658..f928126 100644
--- a/hw-ui/src/views/ems/base/basepublicuser/index.vue
+++ b/hw-ui/src/views/ems/base/basepublicuser/index.vue
@@ -71,18 +71,18 @@
         </el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['base:basepublicuser:export']"
-          icon="el-icon-download"
-          plain
-          size="mini"
-          type="warning"
-          @click="handleExport"
-        >导出
-        </el-button
-        >
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          v-hasPermi="['base:basepublicuser:export']"-->
+<!--          icon="el-icon-download"-->
+<!--          plain-->
+<!--          size="mini"-->
+<!--          type="warning"-->
+<!--          @click="handleExport"-->
+<!--        >导出-->
+<!--        </el-button-->
+<!--        >-->
+<!--      </el-col>-->
 <!--      <right-toolbar-->
 <!--        :showSearch.sync="showSearch"-->
 <!--        @queryTable="getList"-->
diff --git a/hw-ui/src/views/ems/base/businessType/index.vue b/hw-ui/src/views/ems/base/businessType/index.vue
index c5c0ccd..33d8495 100644
--- a/hw-ui/src/views/ems/base/businessType/index.vue
+++ b/hw-ui/src/views/ems/base/businessType/index.vue
@@ -80,7 +80,7 @@
       <el-col :span="1.5">
         共{{list.length}}条
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table
diff --git a/hw-ui/src/views/ems/base/dnbThreshold/index.vue b/hw-ui/src/views/ems/base/dnbThreshold/index.vue
index 1542823..46ddace 100644
--- a/hw-ui/src/views/ems/base/dnbThreshold/index.vue
+++ b/hw-ui/src/views/ems/base/dnbThreshold/index.vue
@@ -55,16 +55,16 @@
           v-hasPermi="['energy:dnbThreshold:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:dnbThreshold:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:dnbThreshold:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/ems/base/exception/data/index.vue b/hw-ui/src/views/ems/base/exception/data/index.vue
index b869062..2c46d3e 100644
--- a/hw-ui/src/views/ems/base/exception/data/index.vue
+++ b/hw-ui/src/views/ems/base/exception/data/index.vue
@@ -38,16 +38,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:data:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:data:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/ems/base/info/index.vue b/hw-ui/src/views/ems/base/info/index.vue
index 06eba2f..e8e077f 100644
--- a/hw-ui/src/views/ems/base/info/index.vue
+++ b/hw-ui/src/views/ems/base/info/index.vue
@@ -70,16 +70,16 @@
           v-hasPermi="['energy:info:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:info:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:info:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/ems/base/lineMonitor/index.vue b/hw-ui/src/views/ems/base/lineMonitor/index.vue
index a9b00fb..eab9673 100644
--- a/hw-ui/src/views/ems/base/lineMonitor/index.vue
+++ b/hw-ui/src/views/ems/base/lineMonitor/index.vue
@@ -66,16 +66,16 @@
           >展开/折叠</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['base:lineMonitor:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['base:lineMonitor:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         共{{list.length}}条
       </el-col>
diff --git a/hw-ui/src/views/ems/base/loss/index.vue b/hw-ui/src/views/ems/base/loss/index.vue
index 271dfee..06447f3 100644
--- a/hw-ui/src/views/ems/base/loss/index.vue
+++ b/hw-ui/src/views/ems/base/loss/index.vue
@@ -89,17 +89,17 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:loss:export']"
-          >导出</el-button
-        >
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:loss:export']"-->
+<!--          >导出</el-button-->
+<!--        >-->
+<!--      </el-col>-->
 <!--      <right-toolbar-->
 <!--        :showSearch.sync="showSearch"-->
 <!--        @queryTable="getList"-->
diff --git a/hw-ui/src/views/ems/base/threshold/index.vue b/hw-ui/src/views/ems/base/threshold/index.vue
index c85622d..88d1010 100644
--- a/hw-ui/src/views/ems/base/threshold/index.vue
+++ b/hw-ui/src/views/ems/base/threshold/index.vue
@@ -55,16 +55,16 @@
           v-hasPermi="['energy:threshold:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:threshold:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:threshold:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/ems/base/type/index.vue b/hw-ui/src/views/ems/base/type/index.vue
index e14d02e..69bba3f 100644
--- a/hw-ui/src/views/ems/base/type/index.vue
+++ b/hw-ui/src/views/ems/base/type/index.vue
@@ -24,16 +24,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['energy:type:add']"-->
-<!--        >新增</el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['energy:type:add']"
+        >新增</el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -56,16 +56,16 @@
 <!--          v-hasPermi="['energy:type:remove']"-->
 <!--        >删除</el-button>-->
 <!--      </el-col>-->
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['energy:type:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['energy:type:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/ems/base/typeRelation/index.vue b/hw-ui/src/views/ems/base/typeRelation/index.vue
index 5f76acf..0f59f2f 100644
--- a/hw-ui/src/views/ems/base/typeRelation/index.vue
+++ b/hw-ui/src/views/ems/base/typeRelation/index.vue
@@ -63,16 +63,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['base:typeRelation:export']"
-        >导出</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['base:typeRelation:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
diff --git a/hw-ui/src/views/mes/materialinfo/index.vue b/hw-ui/src/views/mes/materialinfo/index.vue
index 6305c71..e627714 100644
--- a/hw-ui/src/views/mes/materialinfo/index.vue
+++ b/hw-ui/src/views/mes/materialinfo/index.vue
@@ -149,15 +149,26 @@
       <!--          v-hasPermi="['mes:materialinfo:remove']"-->
       <!--        >删除</el-button>-->
       <!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['mes:materialinfo:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+
       <el-col :span="1.5">
         <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['mes:materialinfo:export']"
-        >导出
+          @click="syncMaterialInfos"
+        >同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -421,6 +432,7 @@ import {
 import {listBaseMaterialType} from "@//api/mes/baseMaterialType";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import {runJob} from "@/api/monitor/job";
 
 export default {
   name: "Materialinfo",
@@ -669,6 +681,13 @@ export default {
     },
 
 
+    syncMaterialInfos(){
+      this.$modal.confirm('确认要立即同步物料信息么？').then(function() {
+        return runJob(161, 'DEFAULT');
+      }).then(() => {
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
+    }
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/materialinfo/selectMaterial.vue b/hw-ui/src/views/mes/materialinfo/selectMaterial.vue
index 2b54710..678b782 100644
--- a/hw-ui/src/views/mes/materialinfo/selectMaterial.vue
+++ b/hw-ui/src/views/mes/materialinfo/selectMaterial.vue
@@ -51,9 +51,18 @@
 
 
 
-    <el-table v-loading="loading" :data="materialinfoList" @selection-change="handleSelectionChange"
-              @row-click="handleRowClick"
-              highlight-current-row>
+    <el-table v-loading="loading" :data="materialinfoList"
+              :highlight-current-row="true"
+              @selection-change="handleSelectionChange"
+              :current-row-key="selectedRowId"
+              ref="selectMaterialRef">
+      <el-table-column label="选择" width="50">
+        <template slot-scope="scope">
+          <el-radio v-model="selectedRowId" :label="scope.row.materialId" @change="handleSelect(scope.row)">
+            {{scope.row.i}}
+          </el-radio>
+        </template>
+      </el-table-column>
       <el-table-column type="selection" width="55" align="center" v-if="false" />
       <el-table-column label="物料ID" align="center" prop="materialId" v-if="false"/>
       <el-table-column label="物料编码" align="center" prop="materialCode"/>
@@ -110,6 +119,7 @@ export default {
       baseMaterialTypeOptions: [],
       // 物料信息表格数据
       materialinfoList: [],
+      selectedRowId:null,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -184,6 +194,14 @@ export default {
     handleRowClick(row) {
       this.selectedRow = row
     },
+    handleSelect(row){
+      this.selectedRow = row;
+      this.selectedRowId = row.materialId;
+      // 滚动到选中行
+      this.$nextTick(() => {
+        this.$refs.selectMaterialRef.setCurrentRow(row);
+      });
+    },
   }
 
 };
diff --git a/hw-ui/src/views/mes/productOrder/addSaleOrder.vue b/hw-ui/src/views/mes/productOrder/addSaleOrder.vue
index a00da6e..f0c0288 100644
--- a/hw-ui/src/views/mes/productOrder/addSaleOrder.vue
+++ b/hw-ui/src/views/mes/productOrder/addSaleOrder.vue
@@ -98,11 +98,21 @@
 <!--        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
     </el-row>
 
-    <el-table v-loading="loading" :data="saleOrderList" @selection-change="handleSelectionChange"
-              @row-click="handleRowClick"
-              highlight-current-row
+    <el-table v-loading="loading" :data="saleOrderList"
+              :highlight-current-row="true"
+              @selection-change="handleSelectionChange"
+              :current-row-key="selectedRowId"
+              ref="selectSaleOrderRef"
     >
-      <el-table-column type="selection" width="55" align="center" v-if="false"/>
+
+      <el-table-column label="选择" width="50">
+        <template slot-scope="scope">
+          <el-radio v-model="selectedRowId" :label="scope.row.saleOrderId" @change="handleSelect(scope.row)">
+            {{scope.row.i}}
+          </el-radio>
+        </template>
+      </el-table-column>
+
       <el-table-column label="主键标识" align="center" prop="saleOrderId" v-if="columns[0].visible"/>
       <el-table-column label="ERP主键" align="center" prop="erpId" v-if="columns[1].visible"/>
       <el-table-column label="ERP订单明细ID" align="center" prop="fentryId" v-if="columns[2].visible"/>
@@ -344,7 +354,7 @@ export default {
       total: 0,
       // 销售订单信息表格数据
       saleOrderList: [],
-
+      selectedRowId:null,
       relateTotal:0,
       //关联的销售订单数据
       relateSaleOrderList:[],
@@ -573,6 +583,15 @@ export default {
       });
     },
 
+
+    handleSelect(row){
+      this.selectedRow = row;
+      this.selectedRowId = row.saleOrderId;
+      // 滚动到选中行
+      this.$nextTick(() => {
+        this.$refs.selectSaleOrderRef.setCurrentRow(row);
+      });
+    },
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/productOrder/index.vue b/hw-ui/src/views/mes/productOrder/index.vue
index d1d1980..69a582e 100644
--- a/hw-ui/src/views/mes/productOrder/index.vue
+++ b/hw-ui/src/views/mes/productOrder/index.vue
@@ -20,10 +20,10 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="销售订单编号" prop="saleorderCode">
+      <el-form-item label="销售订单号" prop="saleorderCode">
         <el-input
           v-model="queryParams.saleorderCode"
-          placeholder="请输入销售订单编号"
+          placeholder="请输入销售订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -160,7 +160,7 @@
         </template>
       </el-table-column>
       <el-table-column label="销售订单ID" align="center" prop="saleOrderId" v-if="columns[2].visible" width="100"/>
-      <el-table-column label="销售订单编号" align="center" prop="saleorderCode" v-if="columns[3].visible" width="100"/>
+      <el-table-column label="销售订单号" align="center" prop="saleorderCode" v-if="columns[3].visible" width="100"/>
       <el-table-column label="项目编号" align="center" prop="projectNo" v-if="columns[5].visible"/>
       <el-table-column label="成品编号" align="center" prop="materialCode" v-if="columns[27].visible" width="100"/>
       <el-table-column label="成品名称" align="center" prop="materialName" v-if="columns[6].visible" width="100"/>
@@ -346,8 +346,8 @@
         <!--        <el-form-item label="销售订单ID" prop="saleOrderId">-->
         <!--          <el-input v-model="form.saleOrderId" placeholder="请输入销售订单ID" />-->
         <!--        </el-form-item>-->
-        <el-form-item label="销售订单编号" prop="saleorderCode" v-if="form.saleType !== MES_SALE_TYPE.MES_SALE_TYPE_PACKING">
-          <el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单编号" :disabled="saleOrderDisabled"
+        <el-form-item label="销售订单号" prop="saleorderCode" v-if="form.saleType !== MES_SALE_TYPE.MES_SALE_TYPE_PACKING">
+          <el-input v-model="form.saleorderCode" placeholder="请点击右侧检索销售订单号" :disabled="saleOrderDisabled"
                     readonly>
             <el-button slot="append" icon="el-icon-search" @click="handleSaleOrderAdd"></el-button>
           </el-input>
@@ -726,7 +726,7 @@ export default {
           {required: true, message: "销售类型不能为空", trigger: "blur"}
         ],
         saleorderCode: [
-          {required: true, message: "销售订单编号不能为空", trigger: "blur"}
+          {required: true, message: "销售订单号不能为空", trigger: "blur"}
         ],
         materialName: [
           {required: true, message: "请选择成品", trigger: "blur"}
@@ -831,7 +831,7 @@ export default {
         {key: 0, label: `主键标识`, visible: false},
         {key: 1, label: `任务编号`, visible: true},
         {key: 2, label: `销售订单ID`, visible: false},
-        {key: 3, label: `销售订单编号`, visible: true},
+        {key: 3, label: `销售订单号`, visible: true},
         {key: 4, label: `销售订单行号`, visible: false},
         {key: 5, label: `项目编号`, visible: false},
         {key: 6, label: `物料名称`, visible: true},
diff --git a/hw-ui/src/views/mes/projectinfo/index.vue b/hw-ui/src/views/mes/projectinfo/index.vue
index 57b6471..1976963 100644
--- a/hw-ui/src/views/mes/projectinfo/index.vue
+++ b/hw-ui/src/views/mes/projectinfo/index.vue
@@ -104,6 +104,17 @@
 <!--          v-hasPermi="['mes:projectinfo:remove']"-->
 <!--        >删除-->
 <!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['mes:projectinfo:export']"-->
+<!--        >导出-->
+<!--        </el-button>-->
 <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
@@ -111,11 +122,11 @@
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['mes:projectinfo:export']"
-        >导出
+          @click="syncProjectInfos"
+        >同步
         </el-button>
       </el-col>
+
 <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>-->
     </el-row>
 
@@ -313,6 +324,7 @@ import {
   addProjectinfo,
   updateProjectinfo
 } from "@/api/mes/projectinfo";
+import {runJob} from "@/api/monitor/job";
 
 export default {
   name: "Projectinfo",
@@ -494,6 +506,15 @@ export default {
       this.download('mes/projectinfo/export', {
         ...this.queryParams
       }, `projectinfo_${new Date().getTime()}.xlsx`)
+    },
+
+
+    syncProjectInfos(){
+      this.$modal.confirm('确认要立即同步项目信息么？').then(function() {
+        return runJob(162, 'DEFAULT');
+      }).then(() => {
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
     }
   }
 };
diff --git a/hw-ui/src/views/mes/purchaseOrder/bindOrder.vue b/hw-ui/src/views/mes/purchaseOrder/bindOrder.vue
index b13689a..351b708 100644
--- a/hw-ui/src/views/mes/purchaseOrder/bindOrder.vue
+++ b/hw-ui/src/views/mes/purchaseOrder/bindOrder.vue
@@ -150,6 +150,11 @@
       </div>
     </el-dialog>
 
+    <!-- 销售订单绑定采购订单信息对话框 -->
+    <el-dialog title="采购订单绑定销售订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
+      <order-binds ref="orderBindsRef" :defineData="orderBindsData"
+                   v-if="orderBindDialogVisible"></order-binds>
+    </el-dialog>
 
   </div>
 </template>
@@ -158,12 +163,14 @@
 import {getPurchaseOrder, bindOrder, deleteOrderBind} from "@/api/mes/purchaseOrder";
 
 import selectSaleOrder from '@//views/mes/purchaseOrder/selectSaleOrder.vue';
+import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
 
 
 export default {
   name: "PurchaseOrder",
   components: {
     'select-saleOrder': selectSaleOrder,
+    'order-binds': orderBinds,
   },
   dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag'],
   data() {
@@ -240,7 +247,9 @@ export default {
       SAFE_FLAG: {
         YES: '1',
         NO: '0'
-      }
+      },
+      orderBindDialogVisible: false,
+      orderBindsData: {},
     };
   },
 
@@ -425,6 +434,15 @@ export default {
       const obj = {path: "/mes/plan/purchaseOrder", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
       this.$tab.closeOpenPage(obj);
     },
+
+
+    // 采购订单绑定销售订单信息页面
+    handleOrderBinds() {
+      this.orderBindDialogVisible = true
+      this.orderBindsData = {
+        purchaseOrderId: this.form.purchaseOrderId,
+      }
+    },
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/purchaseOrder/index.vue b/hw-ui/src/views/mes/purchaseOrder/index.vue
index 8484da7..41ed8c8 100644
--- a/hw-ui/src/views/mes/purchaseOrder/index.vue
+++ b/hw-ui/src/views/mes/purchaseOrder/index.vue
@@ -74,6 +74,53 @@
       </el-form-item>
     </el-form>
 
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--          v-hasPermi="['mes:supplierInfo:add']"-->
+      <!--        >新增</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--          v-hasPermi="['mes:supplierInfo:edit']"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--          v-hasPermi="['mes:supplierInfo:remove']"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="syncPurchaseOrderInfos"
+        >同步
+        </el-button>
+      </el-col>
+
+    </el-row>
+
 
     <el-table v-loading="loading" :data="purchaseOrderList" @selection-change="handleSelectionChange">
       <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"/>
@@ -137,6 +184,14 @@
             v-if="scope.row.orderStatus === ORDER_STATUS.TO_PURCHASE || scope.row.orderStatus === ORDER_STATUS.PURCHASEING"
           >绑定
           </el-button>
+          <el-button
+            type="text"
+            icon="el-icon-info"
+            size="mini"
+            @click="handleOrderBinds(scope.row)"
+            v-hasPermi="['mes:purchaseOrder:bind']"
+          >已绑定
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -177,6 +232,13 @@
         <el-button @click="upload.open = false">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 销售订单绑定采购订单信息对话框 -->
+    <el-dialog title="采购订单绑定销售订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
+      <order-binds ref="orderBindsRef" :defineData="orderBindsData"
+                   v-if="orderBindDialogVisible"></order-binds>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -188,12 +250,22 @@ import {
   addPurchaseOrder,
   updatePurchaseOrder
 } from "@/api/mes/purchaseOrder";
-import router from "@/router";
 import {getToken} from "@/utils/auth";
+import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
+import {runJob} from "@/api/monitor/job";
+
 
 export default {
   name: "PurchaseOrder",
   dicts: ['active_flag', 'mes_purchase_order_status', 'document_status', 'mes_safe_flag','mes_material_bind_flag'],
+  components: {
+    'order-binds': orderBinds,
+  },
+  provide() {
+    return {
+      closeDialog: this.closeDialog,
+    }
+  },
   data() {
     return {
       // 遮罩层
@@ -287,7 +359,9 @@ export default {
       ORDER_STATUS: {
         TO_PURCHASE: "1",//代采购
         PURCHASEING: "2"//采购中
-      }
+      },
+      orderBindDialogVisible: false,
+      orderBindsData: {},
 
     };
   },
@@ -476,8 +550,25 @@ export default {
 
     handleSaleOrderAdd() {
 
-    }
+    },
+
 
+    // 采购订单绑定销售订单信息页面
+    handleOrderBinds(row) {
+      this.orderBindDialogVisible = true
+      this.orderBindsData = {
+        purchaseOrderId: row.purchaseOrderId,
+      }
+    },
+
+
+    syncPurchaseOrderInfos(){
+      this.$modal.confirm('确认要立即同步采购订单信息么？').then(function() {
+        return runJob(164, 'DEFAULT');
+      }).then(() => {
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
+    }
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue b/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue
index 265abbe..773c893 100644
--- a/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue
+++ b/hw-ui/src/views/mes/purchaseOrder/selectOrderBind.vue
@@ -42,7 +42,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="常备物料" v-if="!queryParams.mergeFlag" clearable prop="alwaysFlag">
+      <el-form-item label="常备物料" v-if="queryParams.mergeFlag===null" clearable prop="alwaysFlag">
         <el-select v-model="queryParams.alwaysFlag" placeholder="请选择常备物料标识" clearable>
           <el-option
             v-for="dict in dict.type.mes_material_bind_flag"
@@ -53,7 +53,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="可用标识" v-if="queryParams.mergeFlag" prop="mergeFlag">
+      <el-form-item label="可用标识" v-if="queryParams.mergeFlag!==null" prop="mergeFlag">
         <el-radio-group v-model="queryParams.mergeFlag">
           <el-radio label="1" value="1" >
             是
@@ -64,7 +64,7 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="可用标识" v-if="!queryParams.mergeFlag" prop="singleFlag">
+      <el-form-item label="可用标识" v-if="queryParams.mergeFlag===null" prop="singleFlag">
         <el-radio-group v-model="queryParams.singleFlag">
           <el-radio label="1" value="1" >
             是
@@ -89,11 +89,24 @@
 
     <el-table v-loading="loading"
               :data="orderBindList"
+              :highlight-current-row="true"
               @selection-change="handleSelectionChange"
-              @row-click="handleRowClick"
-              highlight-current-row
+              :current-row-key="selectedRowId"
+              ref="purchaseOrderRef"
     >
-      <el-table-column type="selection" align="center" v-if="selectionVisible"/>
+      <el-table-column label="选择" width="50" v-if="isSingleSelect">
+        <template slot-scope="scope">
+          <el-radio v-model="selectedRowId" :label="scope.row.purchaseOrderId" @change="handleSelect(scope.row)">
+            {{scope.row.i}}
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column
+        type="selection"
+        width="55"
+        :reserve-selection="true"
+        v-if="!isSingleSelect"
+      ></el-table-column>
       <el-table-column label="采购订单ID" align="center" prop="purchaseOrderId"  />
       <el-table-column label="采购订单" align="center" prop="poNo"  />
       <el-table-column label="物料编码" align="center" prop="materialCode" />
@@ -229,6 +242,9 @@ export default {
         {key: 22, label: `更新时间`, visible: false},
       ],
       selectedRows:[],
+      selectedRow:null,
+      selectedRowId:null,
+      isSingleSelect:true,
       ALWAYS_FLAG:{
         YES:"1",
         NO:"0"
@@ -245,10 +261,12 @@ export default {
         this.selectionVisible = true;
         this.queryParams.mergeFlag = "1";
         this.queryParams.singleFlag = null;
+        this.isSingleSelect = false;
       }else{
         this.selectionVisible = false;
         this.queryParams.singleFlag ="1";
         this.queryParams.mergeFlag = null;
+        this.isSingleSelect = true;
       }
 
     },
@@ -315,10 +333,22 @@ export default {
     },
     //选中列赋值
     handleRowClick(row) {
-      this.selectedRow = row
+       this.selectedRow = row
+       this.selectedRowId = row.purchaseOrderId;
+      //alert(this.selectedRowId);
     },
+    handleSelect(row){
+      this.selectedRow = row;
+      this.selectedRowId = row.purchaseOrderId;
+      // 滚动到选中行
+      this.$nextTick(() => {
+        this.$refs.purchaseOrderRef.setCurrentRow(row);
+      });
+    },
+
     // 多选框选中数据
     handleSelectionChange(selection) {
+      alert(JSON.stringify(selection))
       this.ids = selection.map(item => item.purchaseOrderId)
       this.selectedRows = selection.map(item => item)
       this.single = selection.length !== 1
diff --git a/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue b/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
index 7fca378..1ffc5cf 100644
--- a/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
+++ b/hw-ui/src/views/mes/saleOrder/bindingPurchase.vue
@@ -172,15 +172,15 @@
             v-hasPermi="['mes:saleOrder:bind']"
           >保存
           </el-button>
-          <!--el-button
-            type="danger"
+          <el-button
+            type="info"
             plain
-            icon="el-icon-delete"
+            icon="el-icon-info"
             size="mini"
-            @click="handleUnallocateBarCodes"
+            @click="handleOrderBinds"
             v-hasPermi="['mes:saleOrder:bind']"
-          >删除
-          </el-button-->
+          >已绑定
+          </el-button>
         </el-form-item>
       </el-form>
 
@@ -225,6 +225,13 @@
       <!--      </el-col>-->
     </el-row>
 
+
+    <!-- 销售订单绑定采购订单信息对话框 -->
+    <el-dialog title="销售订单绑定采购订单信息" :visible.sync="dialogVisible" append-to-body>
+      <order-binds ref="orderBindsRef" :defineData="orderBindsData"
+                          v-if="dialogVisible"></order-binds>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -236,9 +243,14 @@ import {
   unbindPurchaseOrderList
 } from "@/api/mes/purchaseOrder";
 
+import orderBinds from '@//views/mes/saleOrder/orderBinds.vue';
+
 export default {
   name: "BindingPurchase",
   dicts: ['mes_material_bind_flag'],
+  components: {
+    'order-binds': orderBinds,
+  },
   data() {
     return {
       // 已选采购订单遮罩层
@@ -299,6 +311,9 @@ export default {
         alwaysFlag: null,
         poNo: null
       },
+
+      dialogVisible: false,
+      orderBindsData: {},
     };
   },
   created() {
@@ -458,6 +473,25 @@ export default {
       });
     },
 
+
+
+
+
+
+    // 销售订单绑定采购订单信息页面
+    handleOrderBinds() {
+      this.dialogVisible = true
+
+      this.orderBindsData = {
+        saleOrderId: this.saleOrderForm.saleOrderId,
+      }
+    },
+
+
+    closeDialog() {
+      this.dialogVisible = false;
+    },
+
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/saleOrder/index.vue b/hw-ui/src/views/mes/saleOrder/index.vue
index ab7797b..375dc4a 100644
--- a/hw-ui/src/views/mes/saleOrder/index.vue
+++ b/hw-ui/src/views/mes/saleOrder/index.vue
@@ -116,7 +116,18 @@
           v-hasPermi="['mes:saleOrder:export']"
         >导出</el-button>
       </el-col>
+
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="syncSaleOrderInfos"
+        >同步</el-button>
+      </el-col>
+
     </el-row>
 
     <el-table v-loading="loading" :data="saleOrderList" @selection-change="handleSelectionChange">
@@ -201,6 +212,15 @@
             v-hasPermi="['mes:saleOrder:list']"
             v-if="scope.row.saleOrderClassfication==='2'"
           >详情</el-button>
+          <el-button
+            type="text"
+            icon="el-icon-info"
+            size="mini"
+            @click="handleOrderBinds(scope.row)"
+            v-hasPermi="['mes:saleOrder:bind']"
+            v-if="scope.row.saleOrderClassfication==='1'"
+          >已绑定
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -345,17 +365,26 @@
                           v-if="dialogVisible"></sale-order-relates>
     </el-dialog>
 
+
+    <!-- 销售订单绑定采购订单信息对话框 -->
+    <el-dialog title="销售订单绑定采购订单信息" :visible.sync="orderBindDialogVisible" append-to-body>
+      <order-binds ref="orderBindsRef" :defineData="orderBindsData"
+                   v-if="orderBindDialogVisible"></order-binds>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listSaleOrder, getSaleOrder, delSaleOrder, addSaleOrder, updateSaleOrder } from "@/api/mes/saleOrder";
 import saleOrderRelates from "@/views/mes/saleOrder/saleOrderRelates.vue";
+import orderBinds from "@/views/mes/saleOrder/orderBinds.vue";
+import {runJob} from "@/api/monitor/job";
 
 export default {
   name: "SaleOrder",
   components: {
     'sale-order-relates': saleOrderRelates,
+    'order-binds': orderBinds,
   },
   provide() {
     return {
@@ -451,6 +480,9 @@ export default {
       ],
       dialogVisible: false,
       saleOrderRelatesData: {},
+
+      orderBindDialogVisible: false,
+      orderBindsData: {},
     };
   },
   created() {
@@ -591,7 +623,27 @@ export default {
       }
 
       this.dialogVisible = true
+    },
+
+
+    // 销售订单绑定采购订单信息页面
+    handleOrderBinds(row) {
+      this.orderBindDialogVisible = true
+      this.orderBindsData = {
+        saleOrderId: row.saleOrderId,
+      }
+    },
+
+
+    syncSaleOrderInfos(){
+      this.$modal.confirm('确认要立即同步销售订单信息么？').then(function() {
+        return runJob(163, 'DEFAULT');
+      }).then(() => {
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
     }
+
+
   }
 };
 </script>
diff --git a/hw-ui/src/views/mes/saleOrder/orderBinds.vue b/hw-ui/src/views/mes/saleOrder/orderBinds.vue
new file mode 100644
index 0000000..cbd576a
--- /dev/null
+++ b/hw-ui/src/views/mes/saleOrder/orderBinds.vue
@@ -0,0 +1,105 @@
+<template>
+  <div class="app-container">
+    <el-table v-loading="loading" :data="orderBindList">
+
+      <el-table-column label="采购订单号" align="center" prop="poNo" v-if="purchaseVisible"/>
+      <el-table-column label="物料ID" align="center" prop="materialId" v-if="false"/>
+      <el-table-column label="物料编码" align="center" prop="materialCode" v-if="purchaseVisible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="purchaseVisible"/>
+      <el-table-column label="物料规格" align="center" prop="materialSpec" v-if="purchaseVisible"/>
+
+      <el-table-column label="安全库存" align="center" prop="safeFlag" v-if="saleVisible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.mes_safe_flag" :value="scope.row.safeFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="销售订单号" align="center" prop="saleOrderCode" v-if="saleVisible"/>
+      <el-table-column label="成品ID" align="center" prop="productId" v-if="false"/>
+      <el-table-column label="成品编码" align="center" prop="productCode" v-if="saleVisible"/>
+      <el-table-column label="成品名称" align="center" prop="productName" v-if="saleVisible"/>
+      <el-table-column label="成品规格" align="center" prop="productSpec" v-if="saleVisible"/>
+
+      <el-table-column label="绑定数量" align="center" prop="bindAmount"/>
+
+
+
+
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { listOrderBinds } from "@/api/mes/saleOrder";
+
+export default {
+  name: "OrderBinds",
+  props: {
+    defineData: {
+      type: Object,
+      default: {}
+    }
+  },
+  inject: ['closeDialog'],
+  dicts: [ 'mes_safe_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 总条数
+      total: 0,
+      orderBindList:[],
+      purchaseVisible:false,
+      saleVisible:false,
+      // 选中数组
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.defineData.saleOrderId) {
+        this.queryParams.saleOrderId = this.defineData.saleOrderId;
+        this.purchaseVisible = true;
+        this.saleVisible = false;
+        this.getList();
+      }else if (this.defineData.purchaseOrderId) {
+        this.queryParams.purchaseOrderId = this.defineData.purchaseOrderId;
+        this.purchaseVisible = false;
+        this.saleVisible = true;
+        this.getList();
+      }
+
+
+    },
+
+    /** 查询销售订单信息列表 */
+    getList() {
+      this.loading = true;
+      listOrderBinds(this.queryParams).then(response => {
+        this.orderBindList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+
+  }
+};
+</script>
diff --git a/hw-ui/src/views/mes/supplierInfo/index.vue b/hw-ui/src/views/mes/supplierInfo/index.vue
index 75376c6..7fd7df5 100644
--- a/hw-ui/src/views/mes/supplierInfo/index.vue
+++ b/hw-ui/src/views/mes/supplierInfo/index.vue
@@ -53,49 +53,60 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['mes:supplierInfo:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['mes:supplierInfo:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['mes:supplierInfo:remove']"
-        >删除</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['mes:supplierInfo:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['mes:supplierInfo:edit']"-->
+<!--        >修改</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['mes:supplierInfo:remove']"-->
+<!--        >删除</el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['mes:supplierInfo:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
           plain
           icon="el-icon-download"
           size="mini"
-          @click="handleExport"
-          v-hasPermi="['mes:supplierInfo:export']"
-        >导出</el-button>
+          @click="syncSupplierInfos"
+        >同步
+        </el-button>
       </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+
+        <!--right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar-->
     </el-row>
 
     <el-table v-loading="loading" :data="supplierInfoList" @selection-change="handleSelectionChange">
@@ -198,6 +209,7 @@
 
 <script>
 import { listSupplierInfo, getSupplierInfo, delSupplierInfo, addSupplierInfo, updateSupplierInfo } from "@/api/mes/supplierInfo";
+import {runJob} from "@/api/monitor/job";
 
 export default {
   name: "SupplierInfo",
@@ -372,6 +384,15 @@ export default {
       this.download('mes/supplierInfo/export', {
         ...this.queryParams
       }, `supplierInfo_${new Date().getTime()}.xlsx`)
+    },
+
+
+    syncSupplierInfos(){
+      this.$modal.confirm('确认要立即同步供应商信息么？').then(function() {
+        return runJob(160, 'DEFAULT');
+      }).then(() => {
+        this.$modal.msgSuccess("执行成功");
+      }).catch(() => {});
     }
   }
 };
diff --git a/hw-ui/src/views/wms/info/rawinstock/index.vue b/hw-ui/src/views/wms/info/rawinstock/index.vue
index 4aa564c..8801c8c 100644
--- a/hw-ui/src/views/wms/info/rawinstock/index.vue
+++ b/hw-ui/src/views/wms/info/rawinstock/index.vue
@@ -84,7 +84,7 @@
 
     <el-row :gutter="10" class="mb8">
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+<!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
     </el-row>
 
     <el-table v-loading="loading" :data="rawinstockList">