From 7441bbdb3a2fb30725cae5a7d9235c8378194e9c Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Tue, 22 Oct 2024 14:52:56 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/sectattr/service/dao/Sectattr.java | 56 --------------- .../service/dao/mapper/SectattrMapper.java | 2 - .../service/dao/mapper/SectattrMapper.xml | 30 ++------ .../sectattr/service/dto/SectattrDto.java | 70 ------------------- .../service/impl/SectattrServiceImpl.java | 3 +- .../service/dao/mapper/StorattrMapper.java | 1 - .../service/dao/mapper/StorattrMapper.xml | 12 ---- .../storattr/service/dto/StorattrDto.java | 37 +--------- .../src/views/wms/basedata/st/sect/index.vue | 55 ++------------- .../src/views/wms/basedata/st/stor/index.vue | 5 +- 10 files changed, 18 insertions(+), 253 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java index ebe13a3..ca41490 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/Sectattr.java @@ -38,46 +38,10 @@ public class Sectattr { * 仓库标识 */ private String stor_id; - /** - * 仓库类型 - */ - private String stor_type; /** * 容量 */ private String capacity; - /** - * 宽度 - */ - private String width; - /** - * 高度 - */ - private String height; - /** - * 深度 - */ - private String zdepth; - /** - * 起始X坐标 - */ - private String xqty; - /** - * 起始Y坐标 - */ - private String yqty; - /** - * 起始Z坐标 - */ - private String zqty; - /** - * 负责人 - */ - private String sect_manager_name; - /** - * 负责人电话 - */ - private String mobile_no; /** * 备注 */ @@ -110,26 +74,6 @@ public class Sectattr { * 是否删除 */ private boolean is_delete; - /** - * 背景色 - */ - private String back_ground_color; - /** - * 前景色 - */ - private String front_ground_color; - /** - * 背景图片 - */ - private String back_ground_pic; - /** - * 字体显示方向 - */ - private String font_direction_scode; - /** - * 所在楼层 - */ - private String floor_no; /** * 是否启用 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java index 4892ff4..b9c3e67 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.java @@ -24,6 +24,4 @@ public interface SectattrMapper extends BaseMapper { * @return */ IPage queryAll(@Param("jo")JSONObject jo, @Param("page") IPage page); - - int getTatol(@Param("jo")JSONObject jsonObject); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml index 78ee66e..e35e3fd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dao/mapper/SectattrMapper.xml @@ -2,9 +2,10 @@ - select - * + sect.*, + stor.stor_name from st_ivt_sectattr sect left join st_ivt_bsrealstorattr stor on sect.stor_id=stor.stor_id @@ -20,32 +21,9 @@ and sect.sect_name like concat('%',#{jo.search},'%') or sect.sect_code like concat('%',#{jo.search},'%') - and stor.stor_id = #{jo.stor_id} + and sect.stor_id = #{jo.stor_id} ORDER BY sect.update_time DESC - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java index fb97435..80e41de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/dto/SectattrDto.java @@ -52,56 +52,11 @@ public class SectattrDto implements Serializable { */ private String stor_name; - /** - * 仓库类型 - */ - private String stor_type; - /** * 容量 */ private BigDecimal capacity; - /** - * 宽度 - */ - private BigDecimal width; - - /** - * 高度 - */ - private BigDecimal height; - - /** - * 深度 - */ - private BigDecimal zdepth; - - /** - * 起始X坐标 - */ - private BigDecimal xqty; - - /** - * 起始Y坐标 - */ - private BigDecimal yqty; - - /** - * 起始Z坐标 - */ - private BigDecimal zqty; - - /** - * 负责人 - */ - private String sect_manager_name; - - /** - * 负责人电话 - */ - private String mobile_no; - /** * 备注 */ @@ -142,31 +97,6 @@ public class SectattrDto implements Serializable { */ private String is_delete; - /** - * 背景色 - */ - private String back_ground_color; - - /** - * 前景色 - */ - private String front_ground_color; - - /** - * 背景图片 - */ - private String back_ground_pic; - - /** - * 字体显示方向 - */ - private String font_direction_scode; - - /** - * 所在楼层 - */ - private BigDecimal floor_no; - /** * 是否启用 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java index 4d3f96f..d68f0a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/sectattr/service/impl/SectattrServiceImpl.java @@ -213,8 +213,6 @@ public class SectattrServiceImpl extends ServiceImpl i if (!StrUtil.isEmpty(is_reversed)) { stor_map.put("is_reversed", is_reversed); } - sectattrMapper.selectList(Wrappers.lambdaQuery(Sectattr.class) - .eq(StrUtil.isNotEmpty(is_reversed), Sectattr::getZdepth, is_reversed)); JSONArray stor_ja = WQL.getWO("QST_STOR_ATTR").addParamMap(stor_map).process().getResultJSONArray(0); for (int i = 0; i < stor_ja.size(); i++) { JSONObject stor_jo = stor_ja.getJSONObject(i); @@ -246,6 +244,7 @@ public class SectattrServiceImpl extends ServiceImpl i @Override public JSONObject getStorSect(JSONObject whereJson) { + //TODO,需要优化，不能写死id，可以联合stor表根据is_virtualstore查询为1的仓库 List sectattrs = sectattrMapper.selectList(Wrappers.lambdaQuery(Sectattr.class) .eq(Sectattr::getStor_id, "1582991156504039424") .eq(Sectattr::getSect_type_attr, "09")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java index a3553fe..c28441f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.java @@ -20,5 +20,4 @@ public interface StorattrMapper extends BaseMapper { */ IPage queryAll(@Param("search")String search,@Param("page") IPage page); - int queryAllTotal(@Param("map")HashMap map); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml index 946a4f8..d39e5c1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dao/mapper/StorattrMapper.xml @@ -13,16 +13,4 @@ - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java index 3e919a4..e261db1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/storattr/service/dto/StorattrDto.java @@ -36,16 +36,6 @@ public class StorattrDto implements Serializable { */ private String simple_name; - /** - * 容量 - */ - private BigDecimal stor_capacity; - - /** - * 总面积(㎡) - */ - private BigDecimal total_area; - /** * 仓库性质 */ @@ -57,6 +47,8 @@ public class StorattrDto implements Serializable { private String is_materialstore; + private String is_attachment; + private String is_productstore; private String is_reversed; @@ -65,31 +57,11 @@ public class StorattrDto implements Serializable { private String is_mvin_auto_cfm; - private String area; - - /** - * 地址 - */ - private String storea_ddress; - - /** - * 负责人 - */ - private String principal; - - /** - * 联系电话 - */ - private String office_phone; - - private String mobile_no; - /** * 备注 */ private String remark; - private BigDecimal order_index; private String whstate_scode; @@ -98,8 +70,6 @@ public class StorattrDto implements Serializable { */ private String is_used; - private String base_class_id; - private String create_id; private String create_name; @@ -124,7 +94,4 @@ public class StorattrDto implements Serializable { private String depart_name; - private String company_name; - - private String is_attachment; } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue index 23f080d..d8cdf8b 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/sect/index.vue @@ -98,18 +98,6 @@ - - - - - - - - - - - - @@ -136,10 +124,9 @@ + - -