From e4fa0c62097b47533c74240c55c95d481cf27e0b Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Thu, 3 Jul 2025 19:04:31 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E7=9B=98=E7=82=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/UserStorServiceImpl.java | 16 ++++ .../check/contronller/CheckController.java | 10 ++- .../check/service/dao/StIvtCheckMst.java | 3 + .../check/service/dao/StIvtCheckdtl.java | 8 ++ .../dao/mapper/StIvtCheckMstMapper.java | 8 ++ .../dao/mapper/StIvtCheckMstMapper.xml | 39 +++++++++ .../wms/st/instor/service/CheckService.java | 7 +- .../instor/service/impl/CheckServiceImpl.java | 84 +++++++++---------- .../nl/wms/st/instor/wql/QST_IVT_CHECK.wql | 62 -------------- 9 files changed, 126 insertions(+), 111 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.xml diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java index c7de2a1..3ac5fda 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserStorServiceImpl.java @@ -14,7 +14,9 @@ import org.nl.wms.basedata.st.service.UserStorService; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -196,4 +198,18 @@ public class UserStorServiceImpl implements UserStorService { return in_stor_id; } + public List getInStor2() { + String currentUserId = SecurityUtils.getCurrentUserId().toString(); + WQLObject userStorTab = WQLObject.getWQLObject("st_ivt_userstor"); + + JSONArray userStorArr = userStorTab.query("user_id = '" + currentUserId + "'").getResultJSONArray(0); + // 将仓库id拼成字符串 + List list = new ArrayList<>(); + for (int i = 0; i < userStorArr.size(); i++) { + JSONObject json = userStorArr.getJSONObject(i); + list.add(json.getString("stor_id")); + } + return list; + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/contronller/CheckController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/contronller/CheckController.java index dfc2873..b004003 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/contronller/CheckController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/contronller/CheckController.java @@ -3,6 +3,8 @@ package org.nl.wms.st.instor.check.contronller; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.nl.wms.st.instor.service.CheckService; import org.springframework.data.domain.Pageable; @@ -25,8 +27,8 @@ public class CheckController { @GetMapping @Log("查询盘点单") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(checkService.pageQuery(whereJson, page), HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(checkService.pageQuery(whereJson, page)), HttpStatus.OK); } @GetMapping("/getDtlView") @@ -37,8 +39,8 @@ public class CheckController { @GetMapping("/getExceptionDispose") @Log("查询盘点单明细异常") - public ResponseEntity getExceptionDispose(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(checkService.getExceptionDispose(whereJson, page), HttpStatus.OK); + public ResponseEntity getExceptionDispose(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(checkService.getExceptionDispose(whereJson, page)), HttpStatus.OK); } @GetMapping("/getOutBillDtl") diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckMst.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckMst.java index d18c959..4d439fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckMst.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckMst.java @@ -164,4 +164,7 @@ public class StIvtCheckMst implements Serializable { */ private String syscompanyid; + @TableField(exist = false) + private Integer pcsn_num; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckdtl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckdtl.java index f4cf8a1..267eb7f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckdtl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/StIvtCheckdtl.java @@ -1,5 +1,6 @@ package org.nl.wms.st.instor.check.service.dao; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; @@ -159,6 +160,13 @@ public class StIvtCheckdtl implements Serializable { */ private String remark; + @TableField(exist = false) + private String material_code; + + + @TableField(exist = false) + private String material_name; + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.java index d874387..4f63519 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.java @@ -2,7 +2,13 @@ package org.nl.wms.st.instor.check.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; import org.nl.wms.st.instor.check.service.dao.StIvtCheckMst; +import org.nl.wms.st.instor.check.service.dao.StIvtCheckdtl; +import org.nl.wms.st.outbill.service.dto.OutBillQueryPageParam; + +import java.util.List; /** *

@@ -14,5 +20,7 @@ import org.nl.wms.st.instor.check.service.dao.StIvtCheckMst; */ public interface StIvtCheckMstMapper extends BaseMapper { + List recordQuery(List ids); + IPage getExceptionDispose(IPage pages, OutBillQueryPageParam paramMap); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.xml new file mode 100644 index 0000000..f5c2ca7 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/check/service/dao/mapper/StIvtCheckMstMapper.xml @@ -0,0 +1,39 @@ + + + + + + + + + + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java index 6d48086..123754e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/CheckService.java @@ -2,8 +2,11 @@ package org.nl.wms.st.instor.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.st.instor.check.service.dao.StIvtCheckMst; +import org.nl.wms.st.instor.check.service.dao.StIvtCheckdtl; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -18,7 +21,7 @@ public interface CheckService extends IService { * @param page 分页参数 * @return Map */ - Map pageQuery(Map whereJson, Pageable page); + IPage pageQuery(Map whereJson, PageQuery page); /** * 查询数据分页 @@ -36,7 +39,7 @@ public interface CheckService extends IService { * @param page 分页参数 * @return Map */ - Map getExceptionDispose(Map whereJson, Pageable page); + IPage getExceptionDispose(Map whereJson, PageQuery page); /** * 多选删除 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index 23c5c63..d1c0303 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -9,9 +9,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.pdm.subpackagerelation.dao.PdmBiSubpackagerelation; +import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.dao.StIvtIostorinv; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.FileUtil; @@ -25,6 +31,7 @@ import org.nl.wms.st.instor.check.service.dao.StIvtCheckdtl; import org.nl.wms.st.instor.check.service.dao.mapper.StIvtCheckMstMapper; import org.nl.wms.st.instor.check.service.dao.mapper.StIvtCheckdtlMapper; import org.nl.wms.st.instor.service.CheckService; +import org.nl.wms.st.outbill.service.dto.OutBillQueryPageParam; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -48,46 +55,43 @@ public class CheckServiceImpl extends ServiceImpl pageQuery(Map whereJson, Pageable page) { - - HashMap map = new HashMap<>(whereJson); - map.put("flag", "1"); - if (StrUtil.isNotEmpty(map.get("check_code"))) { - map.put("check_code", "%" + map.get("check_code") + "%"); - } + public IPage pageQuery(Map whereJson, PageQuery page) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper(); //获取人员对应的仓库 UserStorServiceImpl userStorService = new UserStorServiceImpl(); - String in_stor_id = userStorService.getInStor(); + List in_stor_id = userStorService.getInStor2(); + wrapper.in(ObjectUtil.isNotEmpty(in_stor_id),StIvtCheckMst::getStor_id,in_stor_id) + .like(ObjectUtil.isNotEmpty(whereJson.get("check_code")),StIvtCheckMst::getCheck_code,whereJson.get("check_code")) + .eq(ObjectUtil.isNotEmpty(whereJson.get("check_type")),StIvtCheckMst::getCheck_type,whereJson.get("check_type")) + .eq(ObjectUtil.isNotEmpty(whereJson.get("create_mode")),StIvtCheckMst::getCreate_mode,whereJson.get("create_mode")) + .eq(ObjectUtil.isNotEmpty(whereJson.get("stor_id")),StIvtCheckMst::getStor_id,whereJson.get("stor_id")) + .eq(ObjectUtil.isNotEmpty(whereJson.get("status")),StIvtCheckMst::getStatus,whereJson.get("status")) + .gt(ObjectUtil.isNotEmpty(whereJson.get("begin_time")),StIvtCheckMst::getInput_time,whereJson.get("begin_time")) + .lt(ObjectUtil.isNotEmpty(whereJson.get("end_time")),StIvtCheckMst::getInput_time,whereJson.get("end_time")) + .orderByDesc(StIvtCheckMst::getCheck_code); - if (ObjectUtil.isNotEmpty(in_stor_id)) { - map.put("in_stor_id", in_stor_id); - } - JSONObject jo = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "check_code desc"); - JSONArray content = jo.getJSONArray("content"); - if (content.isEmpty()) { - return jo; - } - // 拼接主表id - String check_id = content.stream() - .map(row -> (JSONObject) row) - .map(row -> row.getString("check_id")) - .collect(Collectors.joining(",")); + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - JSONArray resultJSONArray = WQL.getWO("QST_IVT_CHECK").addParam("flag", "13").addParam("check_id_in", "(" + check_id + ")").process().getResultJSONArray(0); + IPage ret = stIvtCheckMstMapper.selectPage(pages,wrapper); - for (int i = 0; i < content.size(); i++) { - JSONObject json = content.getJSONObject(i); + List list = ret.getRecords(); - // 匹配相同check_id的数据条数 - int pcsn_num = (int) resultJSONArray.stream() - .map(row -> (JSONObject) row) - .filter(row -> row.getString("check_id").equals(json.getString("check_id"))) - .count(); + List strs = list.stream().map(plan -> plan.getCheck_id()).collect(Collectors.toList()); + if(strs.size()>0){ + List sublist = stIvtCheckMstMapper.recordQuery(strs); + for (int i = 0; i < list.size(); i++) { + StIvtCheckMst json = list.get(i); - json.put("pcsn_num", pcsn_num); + // 匹配相同check_id的数据条数 + int pcsn_num = (int) sublist.stream() + .filter(row -> row.equals(json.getCheck_id())) + .count(); + + json.setPcsn_num(pcsn_num); + } } - return jo; + return ret; } @Override @@ -113,21 +117,15 @@ public class CheckServiceImpl extends ServiceImpl getExceptionDispose(Map whereJson, Pageable page) { + public IPage getExceptionDispose(Map whereJson, PageQuery page) { String box_no = MapUtil.getStr(whereJson, "box_no"); String check_code = MapUtil.getStr(whereJson, "check_code"); + OutBillQueryPageParam param = new OutBillQueryPageParam(); + param.setBill_code(check_code); + param.setBox_no(box_no); - JSONObject map = new JSONObject(); - map.put("check_code", check_code); - map.put("flag", "10"); - - if (ObjectUtil.isNotEmpty(box_no)) { - map.put("box_no", "%" + box_no + "%"); - } - - JSONObject json = WQL.getWO("QST_IVT_CHECK").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "dtl.seq_no ASC"); - - return json; + IPage pages = new Page<>(page.getPage() + 1, page.getSize()); + return stIvtCheckMstMapper.getExceptionDispose(pages, param); } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql index dc3a056..f653bff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql @@ -64,49 +64,6 @@ # 3、业务主过程 # ########################################## - IF 输入.flag = "1" - PAGEQUERY - SELECT - checkmst.check_id AS id, - checkmst.* - FROM - ST_IVT_CheckMst checkmst - WHERE - checkmst.is_delete = '0' - and checkmst.stor_id in 输入.in_stor_id - - OPTION 输入.check_code <> "" - checkmst.check_code like 输入.check_code - ENDOPTION - - OPTION 输入.check_type <> "" - checkmst.check_type = 输入.check_type - ENDOPTION - - OPTION 输入.stor_id <> "" - checkmst.stor_id = 输入.stor_id - ENDOPTION - - OPTION 输入.create_mode <> "" - checkmst.create_mode = 输入.create_mode - ENDOPTION - - OPTION 输入.status <> "" - checkmst.status = 输入.status - ENDOPTION - - OPTION 输入.begin_time <> "" - checkmst.input_time >= 输入.begin_time - ENDOPTION - - OPTION 输入.end_time <> "" - checkmst.input_time <= 输入.end_time - ENDOPTION - - ENDSELECT - ENDPAGEQUERY - ENDIF - IF 输入.flag = "2" QUERY SELECT @@ -379,22 +336,3 @@ ENDSELECT ENDPAGEQUERY ENDIF - - IF 输入.flag = "13" - QUERY - SELECT - sub.*, - dtl.check_id - FROM - pdm_bi_subpackagerelation sub - LEFT JOIN st_ivt_checkdtl dtl ON sub.package_box_sn = dtl.storagevehicle_code - WHERE - 1 = 1 - - OPTION 输入.check_id_in <> "" - dtl.check_id in 输入.check_id_in - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF