修改仓库管理2.0

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -375,5 +375,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     @Override
     public void saveList(List<BusSalesOrder> orders){
 
-    };
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrdersWx(PagerQuery<AppBusSalesOrderQuery> pq) {
+        return null;
+    }
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -397,8 +397,8 @@
     </select>
     <select id="getStaffNameByRoleCode" resultType="com.yxt.anrui.portal.api.sysstaffinfo.StaffByRole">
         SELECT
-            u.sid as manager,
-            sf.`name` as managerSid
+            u.sid as managerSid,
+            sf.`name` as manager
         FROM
             sys_user_role AS ur
                 LEFT JOIN sys_role AS r ON ur.roleSid = r.sid

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -69,6 +69,11 @@ import java.util.List;
 @Component
 public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
 
+    @Override
+    public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersWx(PagerQuery<BusOrderSalesQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<OrderStateVo> saleOrderState(String saleOrderSid) {
         return null;
@@ -363,4 +368,4 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<List<SalerBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
         return null;
     }
-}
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfo.java

@@ -16,6 +16,7 @@ public class WmsWarehouseInfo extends BaseEntity {
     private String mob;//手机
     private String telephone;//联系电话
     private String manager;//主管
+    private String managerSid;//主管
     private String areaSid;//地区sid
     private String address;//地址
     private String longitude;//经度

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoDto.java

@@ -26,6 +26,7 @@ public class WmsWarehouseInfoDto implements Dto {
 //    private String mob;//手机
 //    private String telephone;//联系电话
     private String manager;//主管
+    private String managerSid;//主管
     private String areaSid;//地区sid
     private String address;//地址
     private String longitude;//经度

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java

@@ -251,6 +251,7 @@ public class WmsWarehouseInfoService extends MybatisBaseService<WmsWarehouseInfo
         roleCode.add("75");
         roleCode.add("76");
         query.setCreateOrgSid(createOrgSid);
+        query.setRoleCode(roleCode);
         List<StaffByRole> data = sysStaffinfoFeign.getStaffNameByRoleCode(query).getData();
         if (!data.isEmpty()) {
             for (StaffByRole datum : data) {

yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoVo.java

@@ -32,6 +32,7 @@ public class WmsWarehouseInfoVo implements Vo {
 //    private String mob;//手机
 //    private String telephone;//联系电话
     private String manager;//主管
+    private String managerSid;//主管
     private String areaSid;//地区sid
     private String address;//地址
     private String longitude;//经度