Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git

into develop Conflicts: huaheng-wms-core/src/main/resources/application.yml

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git
into develop Conflicts: huaheng-wms-core/src/main/resources/application.yml
谭毅彬
2 parents e6fa2e00 b34336bf
Showing 5 changed files with 16 additions and 12 deletions
ant-design-vue-jeecg/src/api/api.js
ant-design-vue-jeecg/src/views/system/UserList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/controller/ZoneController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/IZoneService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/zone/service/impl/ZoneServiceImpl.java
@@ -213,6 +213,8 @@ export const handleDoubleIn = (params) =&gt; postAction(&#39;/task/taskHeader/handleDou
 export const queryWarehouse = (params) => getAction("/config/sysUserWarehouse/queryWarehouse", params);
 //查询所有仓库
 export const getAllWarehouseList = (params) => getAction("/config/warehouse/getAllWarehouseList", params);
+//查询所有库区
+export const getAllZoneList = (params) => getAction("/config/zone/getAllZoneList", params);
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -196,7 +196,7 @@
 import UserModal from './modules/UserModal'
 import PasswordModal from './modules/PasswordModal'
 import {putAction, getFileAccessHttpUrl} from '@/api/manage';
-import {frozenBatch, getAllWarehouseList, queryall, getZoneList} from '@/api/api'
+import {frozenBatch, getAllWarehouseList, queryall, getZoneList, getAllZoneList} from '@/api/api'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import SysUserAgentModal from "./modules/SysUserAgentModal";
 import JInput from '@/components/jeecg/JInput'
@@ -289,18 +289,17 @@ export default {
         {
           title: '所属仓库',
           align: "center",
-          dataIndex: 'selectedWarehouses',
-          width: 240,
-          key: 'selectedWarehouses',
-          scopedSlots: {customRender: 'selectedWarehouses'}
+          dataIndex: 'selectedWarehouses',          key: 'selectedWarehouses',
+          scopedSlots: {customRender: 'selectedWarehouses'},
+          width: 200
         },
         {
           title: '所属库区',
           align: "center",
           dataIndex: 'zoneCodes',
-          width: 240,
           key: 'zoneCodes',
-          scopedSlots: {customRender: 'zoneCodes'}
+          scopedSlots: {customRender: 'zoneCodes'},
+          width: 200
         },
         // {
         //   title: '部门',
@@ -353,7 +352,7 @@ export default {
   },
   methods: {
     loadFrom() {
-      getZoneList().then((res) => {
+      getAllZoneList().then((res) => {
         if (res.success) {
           this.zoneList = res.result
         }
@@ -186,9 +186,10 @@ public class ZoneController extends JeecgController&lt;Zone, IZoneService&gt; {
     }
  
     @RequestMapping(value = "/getAllZoneList", method = RequestMethod.GET)
-    public Result<List<Zone>> getAllZoneList() {
+    public Result<List<Zone>> getAllZoneList(HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
         Result<List<Zone>> result = new Result<>();
-        List<Zone> list = zoneService.getAllZoneList();
+        List<Zone> list = zoneService.getAllZoneList(warehouseCode);
         result.setResult(list);
         result.setSuccess(true);
         return result;
@@ -16,5 +16,5 @@ public interface IZoneService extends IService&lt;Zone&gt; {
  
     Zone getZoneByCode(String zoneCode, String wareohuseCode);
  
-    public List<Zone> getAllZoneList();
+    List<Zone> getAllZoneList(String wareohuseCode);
 }
@@ -29,7 +29,9 @@ public class ZoneServiceImpl extends ServiceImpl&lt;ZoneMapper, Zone&gt; implements IZ
     }
  
     @Override
-    public List<Zone> getAllZoneList() {
+    public List<Zone> getAllZoneList(String wareohuseCode) {
+        LambdaQueryWrapper<Zone> zoneLambdaQueryWrapper = Wrappers.lambdaQuery();
+        zoneLambdaQueryWrapper.eq(Zone::getWarehouseCode, wareohuseCode);
         return list();
     }
 }