代码更新

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/rest/UserStorController.java

@@ -0,0 +1,55 @@
+package org.nl.wms.basedata.st.rest;
+
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.logging.annotation.Log;
+import org.nl.wms.basedata.st.service.UserStorService;
+import org.nl.wms.st.instor.service.ChangeService;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "用户仓库关联")
+@RequestMapping("/api/userStor")
+@Slf4j
+public class UserStorController {
+    private final UserStorService userStorService;
+
+    @GetMapping
+    @Log("查询用户信息")
+    @ApiOperation("查询用户信息")
+    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(userStorService.pageQuery(whereJson, page), HttpStatus.OK);
+    }
+
+    @PostMapping("/queryStor")
+    @Log("查询所有仓库")
+    @ApiOperation("查询所有仓库")
+    public ResponseEntity<Object> queryStor(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(userStorService.queryStor(whereJson),HttpStatus.NO_CONTENT);
+    }
+
+    @PostMapping("/queryUserStor")
+    @Log("查询用户对应仓库")
+    @ApiOperation("查询用户对应仓库")
+    public ResponseEntity<Object> queryUserStor(@RequestBody JSONObject whereJson) {
+        return new ResponseEntity<>(userStorService.queryUserStor(whereJson),HttpStatus.NO_CONTENT);
+    }
+
+    @PostMapping("/save")
+    @Log("保存用户仓库信息")
+    @ApiOperation("保存用户仓库信息")
+    public ResponseEntity<Object> save(@RequestBody JSONObject whereJson) {
+        userStorService.save(whereJson);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserStorService.java

@@ -0,0 +1,37 @@
+package org.nl.wms.basedata.st.service;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.data.domain.Pageable;
+
+import java.util.Map;
+
+public interface UserStorService {
+    /**
+     * 查询数据分页
+     *
+     * @param whereJson 条件
+     * @param page      分页参数
+     * @return Map<String, Object>
+     */
+    Map<String, Object> pageQuery(Map whereJson, Pageable page);
+
+    /**
+     * 查询所有仓库
+     * @param whereJson /
+     */
+    JSONArray queryStor(JSONObject whereJson);
+
+    /**
+     * 查询用户对应仓库
+     * @param whereJson /
+     */
+    JSONArray queryUserStor(JSONObject whereJson);
+
+    /**
+     * 保存
+     * @param whereJson /
+     */
+    JSONArray save(JSONObject whereJson);
+
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java

@@ -0,0 +1,64 @@
+package org.nl.wms.basedata.st.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.modules.common.exception.BadRequestException;
+import org.nl.modules.common.utils.SecurityUtils;
+import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
+import org.nl.modules.wql.core.bean.WQLObject;
+import org.nl.modules.wql.util.WqlUtil;
+import org.nl.wms.basedata.st.service.UserStorService;
+import org.nl.wms.sch.manage.TaskStatusEnum;
+import org.nl.wms.st.inbill.service.StorPublicService;
+import org.nl.wms.st.instor.service.ChangeService;
+import org.nl.wms.st.instor.task.HandMoveStorAcsTask;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * PC端出入库新增
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class UserStorServiceImpl implements UserStorService {
+
+    @Override
+    public Map<String, Object> pageQuery(Map whereJson, Pageable page) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "3");
+        if (StrUtil.isNotEmpty(map.get("blurry"))) {
+            map.put("blurry", "%" + map.get("blurry") + "%");
+        }
+        JSONObject jo = WQL.getWO("QST_STOR_ATTR").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "username desc");
+        return jo;
+    }
+
+    @Override
+    public JSONArray queryStor(JSONObject whereJson) {
+        JSONArray rows = WQLObject.getWQLObject("st_ivt_bsrealstorattr").query("is_used = '1' AND is_delete = '0'").getResultJSONArray(0);
+        return rows;
+    }
+
+    @Override
+    public JSONArray queryUserStor(JSONObject whereJson) {
+        return null;
+    }
+
+    @Override
+    public JSONArray save(JSONObject whereJson) {
+        return null;
+    }
+}

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STOR_ATTR.wql

@@ -21,6 +21,7 @@
 	输入.is_productstore					        TYPEAS s_string
 	输入.is_attachment					            TYPEAS s_string
 	输入.is_reversed					            TYPEAS s_string
+	输入.blurry					            TYPEAS s_string
 
 
 [临时表]
@@ -100,5 +101,24 @@
         		ENDQUERY
         	ENDIF
 
+     IF 输入.flag = "3"
+        PAGEQUERY
+            SELECT
+            	*
+            FROM
+            	sys_user
+            WHERE
+            	enabled = '1'
+            OPTION 输入.blurry <> ""
+                (
+                username like 输入.blurry
+                OR
+                nick_name like 输入.blurry
+                )
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF
+
+