From f2bde247d8ea937ae794efe8e241e681b5759c87 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 27 二月 2021 10:41:35 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/controller/MatController.java | 9 ---- src/main/resources/mapper/LocDetlMapper.xml | 19 +++++++++ src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java | 8 +++ src/main/java/zy/cloud/wms/manager/service/LocDetlService.java | 3 + src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java | 15 +++++-- src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java | 13 +++++- src/main/resources/application.yml | 4 +- 7 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java index b26e1d8..be082ee 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java @@ -40,11 +40,16 @@ @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ - EntityWrapper<LocDetl> wrapper = new EntityWrapper<>(); - excludeTrash(param); - convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper)); + Object nodeId = param.get("node_id"); + if (Cools.isEmpty(nodeId)) { + nodeId = getOriginNode().getId(); + } + return R.ok(locDetlService.getPage(new Page<>(curr, limit) + , String.valueOf(nodeId) + , param.get("loc_no") + , param.get("matnr") + , param.get("maktx")) + ); } private void convert(Map<String, Object> map, EntityWrapper wrapper){ diff --git a/src/main/java/zy/cloud/wms/manager/controller/MatController.java b/src/main/java/zy/cloud/wms/manager/controller/MatController.java index 709ae2e..ea13d5f 100644 --- a/src/main/java/zy/cloud/wms/manager/controller/MatController.java +++ b/src/main/java/zy/cloud/wms/manager/controller/MatController.java @@ -46,15 +46,6 @@ @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ -// EntityWrapper<Mat> wrapper = new EntityWrapper<>(); -// excludeTrash(param); -// convert(param, wrapper); -// if (!Cools.isEmpty(orderByField)){ -// wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); -// } -// Page<Mat> page = matService.selectPage(new Page<>(curr, limit), wrapper); -// -// return R.ok().add(page); Object tagId = param.get("tag_id"); if (Cools.isEmpty(tagId)) { tagId = getOriginTag().getId(); diff --git a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java index 5090bc8..b02db5a 100644 --- a/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java +++ b/src/main/java/zy/cloud/wms/manager/mapper/LocDetlMapper.java @@ -1,12 +1,18 @@ package zy.cloud.wms.manager.mapper; -import zy.cloud.wms.manager.entity.LocDetl; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.plugins.Page; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import zy.cloud.wms.manager.entity.LocDetl; + +import java.util.List; @Mapper @Repository public interface LocDetlMapper extends BaseMapper<LocDetl> { + List<LocDetl> listByPage(Page page, @Param("nodeId") String nodeId, @Param("locNo") Object locNo, @Param("matnr") Object matnr, @Param("maktx") Object maktx); + } diff --git a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java index 0e8d5c6..4202ab1 100644 --- a/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java +++ b/src/main/java/zy/cloud/wms/manager/service/LocDetlService.java @@ -1,8 +1,11 @@ package zy.cloud.wms.manager.service; +import com.baomidou.mybatisplus.plugins.Page; import zy.cloud.wms.manager.entity.LocDetl; import com.baomidou.mybatisplus.service.IService; public interface LocDetlService extends IService<LocDetl> { + Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx); + } diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java index c74583b..65ffa9d 100644 --- a/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java +++ b/src/main/java/zy/cloud/wms/manager/service/impl/LocDetlServiceImpl.java @@ -1,12 +1,19 @@ package zy.cloud.wms.manager.service.impl; -import zy.cloud.wms.manager.mapper.LocDetlMapper; -import zy.cloud.wms.manager.entity.LocDetl; -import zy.cloud.wms.manager.service.LocDetlService; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import zy.cloud.wms.manager.entity.LocDetl; +import zy.cloud.wms.manager.mapper.LocDetlMapper; +import zy.cloud.wms.manager.service.LocDetlService; @Service("locDetlService") public class LocDetlServiceImpl extends ServiceImpl<LocDetlMapper, LocDetl> implements LocDetlService { + @Override + public Page<LocDetl> getPage(Page page, String nodeId, Object locNo, Object matnr, Object maktx) { + return page.setRecords(baseMapper.listByPage(page, nodeId, locNo, matnr, maktx)); + } + + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9796810..536b142 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -33,8 +33,8 @@ mapper-locations: classpath:mapper/*.xml # global-config: # field-strategy: 0 - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl logging: path: /stock/out/logs diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index b8ab871..176d5b2 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -31,4 +31,23 @@ </resultMap> + <select id="listByPage" resultMap="BaseResultMap"> + SELECT + mld.* + FROM man_loc_detl mld + LEFT JOIN man_node mn ON mld.node_id = mn.id + WHERE 1=1 + AND (CHARINDEX(#{nodeId}, ','+mn.path+',') > 0 OR mn.id = #{nodeId}) + <if test="locNo != null and locNo != ''"> + and mld.loc_no like concat('%',#{locNo},'%') + </if> + <if test="matnr != null and matnr != ''"> + and mld.matnr like concat('%',#{matnr},'%') + </if> + <if test="maktx != null and maktx != ''"> + and mld.maktx like concat('%',#{maktx},'%') + </if> + ORDER BY mld.create_time DESC + </select> + </mapper> -- Gitblit v1.9.1