From cc9f55ace05edc477e358b58f7a393c1a4254483 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 15 May 2023 19:47:30 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86/?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/DatazhuazhuaInterceptor.java | 2 +- .../master/MdPbClassstandardController.java | 20 -- .../master/MdPbMeasureunitController.java | 20 -- .../ClassstandardController.java | 39 +-- .../MdPbMeasureunitController.java} | 4 +- .../IMdPbClassstandardService.java | 58 +++++ .../classstandard}/dao/MdPbClassstandard.java | 12 +- .../dto/MdPbClassstandardTree.java | 121 +++++++++ .../impl/MdPbClassstandardServiceImpl.java | 241 ++++++++++++++++++ .../org/nl/wms/masterdata_manage/mdpb.xls | Bin 192512 -> 192512 bytes .../master/IMdPbClassstandardService.java | 16 -- .../dao/mapper/MdPbClassstandardMapper.java | 2 +- .../impl/MdPbClassstandardServiceImpl.java | 20 -- .../dao/mapper/PdmProduceWorkorderMapper.xml | 4 +- .../java/org/nl/wms/storage_manage/stivt.xls | Bin 403456 -> 403456 bytes 15 files changed, 457 insertions(+), 102 deletions(-) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份master/rest => master/controller/classstandard}/ClassstandardController.java (74%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{备份master/rest/UnitController.java => master/controller/measureunit/MdPbMeasureunitController.java} (95%) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java rename mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/{service/master => master/service/classstandard}/dao/MdPbClassstandard.java (85%) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dto/MdPbClassstandardTree.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/DatazhuazhuaInterceptor.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/DatazhuazhuaInterceptor.java index adc69443..e6401faa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/DatazhuazhuaInterceptor.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/mybatis/DatazhuazhuaInterceptor.java @@ -14,7 +14,7 @@ import java.sql.Connection; /** * mybatis数据库操作拦截 */ -@Component +//@Component @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})}) public class DatazhuazhuaInterceptor implements Interceptor { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java deleted file mode 100644 index 35633865..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbClassstandardController.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.master; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 基础数据分类标准表 前端控制器 - *

- * - * @author generator - * @since 2023-05-05 - */ -@RestController -@RequestMapping("/mdPbClassstandard") -public class MdPbClassstandardController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java deleted file mode 100644 index 3668e397..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/master/MdPbMeasureunitController.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.masterdata_manage.controller.master; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 计量单位表 前端控制器 - *

- * - * @author generator - * @since 2023-05-05 - */ -@RestController -@RequestMapping("/mdPbMeasureunit") -public class MdPbMeasureunitController { - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java similarity index 74% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java index 85f7549b..4091997a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/ClassstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java @@ -1,7 +1,8 @@ -package org.nl.wms.masterdata_manage.备份master.rest; +package org.nl.wms.masterdata_manage.master.controller.classstandard; +import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -9,10 +10,13 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -30,24 +34,27 @@ import java.util.Map; @Api(tags = "基础类别管理") @RequestMapping("/api/Classstandard") @Slf4j +@SaIgnore public class ClassstandardController { private final ClassstandardService ClassstandardService; + @Autowired + private IMdPbClassstandardService mdPbClassstandardService; + @GetMapping @Log("查询基础类别") @ApiOperation("查询基础类别") - //@PreAuthorize("@el.check('Classstandard:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(ClassstandardService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity queryList(@RequestParam Map whereJson) { + return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK); } @PostMapping @Log("新增基础类别") @ApiOperation("新增基础类别") //@PreAuthorize("@el.check('Classstandard:add')") - public ResponseEntity create(@Validated @RequestBody ClassstandardDto dto) { - ClassstandardService.create(dto); + public ResponseEntity create(@Validated @RequestBody JSONObject form) { + mdPbClassstandardService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } @@ -55,8 +62,8 @@ public class ClassstandardController { @Log("修改基础类别") @ApiOperation("修改基础类别") //@PreAuthorize("@el.check('Classstandard:edit')") - public ResponseEntity update(@Validated @RequestBody ClassstandardDto dto) { - ClassstandardService.update(dto); + public ResponseEntity update(@Validated @RequestBody JSONObject form) { + mdPbClassstandardService.updateForm(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -64,8 +71,8 @@ public class ClassstandardController { @ApiOperation("删除基础类别") //@PreAuthorize("@el.check('Classstandard:del')") @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - ClassstandardService.deleteAll(ids); + public ResponseEntity delete(@RequestBody String[] ids) { + mdPbClassstandardService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } @@ -73,16 +80,16 @@ public class ClassstandardController { @Log("查询基础类型") @ApiOperation("查询基础类型") //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity query(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.loadClass(whereJson), HttpStatus.OK); + public ResponseEntity query(@RequestParam JSONObject whereJson) { + return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK); } @GetMapping("/getClass") @Log("查询基础类型") @ApiOperation("查询基础类型") //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryClassBycode(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.queryClassBycode(whereJson), HttpStatus.OK); + public ResponseEntity queryClassBycode(@RequestParam JSONObject whereJson) { + return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK); } @@ -90,8 +97,8 @@ public class ClassstandardController { @Log("查询分类基础列表") @ApiOperation("查询分类基础列表") //@PreAuthorize("@el.check('materialtype:list')") - public ResponseEntity queryClassById(@RequestParam Map whereJson) { - return new ResponseEntity<>(ClassstandardService.queryClassById(whereJson), HttpStatus.OK); + public ResponseEntity queryClassById(@RequestParam JSONObject whereJson) { + return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK); } @GetMapping("/getClassTable") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java similarity index 95% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java index a8aa427d..ef19c703 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/UnitController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java @@ -1,5 +1,5 @@ -package org.nl.wms.masterdata_manage.备份master.rest; +package org.nl.wms.masterdata_manage.master.controller.measureunit; import io.swagger.annotations.Api; @@ -26,7 +26,7 @@ import java.util.Map; @Api(tags = "计量单位管理") @RequestMapping("/api/mdPbMeasureunit") @Slf4j -public class UnitController { +public class MdPbMeasureunitController { private final UnitService unitService; @GetMapping diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java new file mode 100644 index 00000000..033abf25 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/IMdPbClassstandardService.java @@ -0,0 +1,58 @@ +package org.nl.wms.masterdata_manage.master.service.classstandard; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard; + +import java.util.List; +import java.util.Map; + +/** + *

+ * 基础数据分类标准表 服务类 + *

+ * + * @author generator + * @since 2023-05-05 + */ +public interface IMdPbClassstandardService extends IService { + + /** + * 物料类型下拉选 + * @param json + * @return + */ + List dropdownList(Map json); + + /** + * 家在物料列表 + * @param whereJson + */ + List loadClass(JSONObject whereJson); + + + List queryClassBycode(JSONObject whereJson); + + List queryClassById(JSONObject whereJson); + + + /** + * 创建 + * @param form + * @return + */ + String create(JSONObject form); + + /** + * 修改 + * @param form + * @return + */ + String updateForm(JSONObject form); + + /** + * 删除当前及子集 + * @param ids + */ + void deleteAll(String[] ids); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dao/MdPbClassstandard.java similarity index 85% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dao/MdPbClassstandard.java index adb46f7a..d32729b5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/MdPbClassstandard.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dao/MdPbClassstandard.java @@ -1,5 +1,6 @@ -package org.nl.wms.masterdata_manage.service.master.dao; +package org.nl.wms.masterdata_manage.master.service.classstandard.dao; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,6 +26,7 @@ public class MdPbClassstandard implements Serializable { /** * 分类标识 */ + @TableId(value = "class_id") private String class_id; /** @@ -55,7 +57,7 @@ public class MdPbClassstandard implements Serializable { /** * 子部门数目 */ - private String sub_count; + private Integer sub_count; /** * 是否叶子 @@ -95,7 +97,7 @@ public class MdPbClassstandard implements Serializable { /** * 创建时间 */ - private LocalDateTime create_time; + private String create_time; /** * 修改人 @@ -110,7 +112,9 @@ public class MdPbClassstandard implements Serializable { /** * 修改时间 */ - private LocalDateTime update_time; + private String update_time; + + private Boolean is_delete; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dto/MdPbClassstandardTree.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dto/MdPbClassstandardTree.java new file mode 100644 index 00000000..9131b4bd --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/dto/MdPbClassstandardTree.java @@ -0,0 +1,121 @@ +package org.nl.wms.masterdata_manage.master.service.classstandard.dto; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 基础数据分类标准表 + *

+ * + * @author generator + * @since 2023-05-05 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_classstandard") +public class MdPbClassstandardTree implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 分类标识 + */ + @TableId(value = "class_id") + private String class_id; + + /** + * 分类编码 + */ + private String class_code; + + /** + * 分类长编码 + */ + private String long_class_code; + + /** + * 分类名称 + */ + private String class_name; + + /** + * 分类简要描述 + */ + private String class_desc; + + /** + * 上级分类标识 + */ + private String parent_class_id; + + /** + * 子部门数目 + */ + private Integer sub_count; + + /** + * 是否叶子 + */ + private Boolean is_leaf; + + /** + * 是否可修改 + */ + private Boolean is_modify; + + /** + * 级别 + */ + private String class_level; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 外部上级标识 + */ + private String ext_parent_id; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + + private List itemClassstrandard; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java new file mode 100644 index 00000000..45201dd3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java @@ -0,0 +1,241 @@ +package org.nl.wms.masterdata_manage.master.service.classstandard.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.lang.Assert; +import cn.hutool.core.lang.hash.Hash; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.nl.common.utils.CopyUtil; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; +import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard; +import org.nl.wms.masterdata_manage.master.service.classstandard.dto.MdPbClassstandardTree; +import org.nl.wms.masterdata_manage.service.master.dao.mapper.MdPbClassstandardMapper; +import org.nl.wms.masterdata_manage.备份master.service.dto.ClassstandardDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 基础数据分类标准表 服务实现类 + *

+ * + * @author generator + * @since 2023-05-05 + */ +@Service +public class MdPbClassstandardServiceImpl extends ServiceImpl implements IMdPbClassstandardService { + + + @Override + public List dropdownList(Map whereJson) { + Assert.isNull(whereJson,"参数不能为空"); + QueryWrapper query = new QueryWrapper() + .eq("parent_class_id", "0") + .eq("is_delete",false); + if (whereJson.get("class_code") !=null) { + query.eq("class_code",whereJson.get("class_code")); + } + List list = this.list(query); + return getMaps(list); + } + + @Override + public List loadClass(JSONObject whereJson) { + List list = this.list(new QueryWrapper() + .eq("is_delete", false) + .eq("parent_class_id", whereJson.getString("pid") == null ? "0":whereJson.getString("pid"))); + List result = getMaps(list); + return result; + } + + @NotNull + private List getMaps(List list) { + List result = new ArrayList<>(); + for (MdPbClassstandard classstandard : list) { + Map item = new HashMap<>(); + if (classstandard.getSub_count() > 0) { + item.put("hasChildren", true); + item.put("leaf", false); + } else { + item.put("hasChildren", false); + item.put("leaf", true); + } + item.put("id", classstandard.getClass_id()); + item.put("label", classstandard.getClass_name()); + item.put("create_user_name", classstandard.getCreate_name()); + item.put("update_user_name", classstandard.getUpdate_name()); + result.add(item); + } + return result; + } + + + @Override + public List queryClassBycode(JSONObject whereJson) { + MdPbClassstandard classstandard = null; + if (!StrUtil.isEmpty(whereJson.getString("parent_class_code"))) { + classstandard = this.getOne(new QueryWrapper().eq("class_code", whereJson.getString("parent_class_code"))); + if (classstandard == null) { + throw new BadRequestException("请输入正确的父节点编号!"); + } + } + QueryWrapper query = new QueryWrapper().eq("is_detele",false); + if (!StrUtil.isEmpty(whereJson.getString("class_code"))) { + query.in("class_code",whereJson.getString("class_code")); + } + if (StrUtil.isNotEmpty(whereJson.getString("parent_class_code"))&&!whereJson.getString("parent_class_code").equals("0")){ + query.eq("class_id",classstandard.getClass_id()); + } + if (StrUtil.isEmpty(whereJson.getString("parent_class_code")) || whereJson.getString("parent_class_code").equals("0")){ + query.eq("parent_class_id","0").or().isNull("parent_class_id"); + } + return getMaps(this.list(query)); + } + + + @Override + public List queryClassById(JSONObject whereJson) { + + QueryWrapper query = new QueryWrapper<>(); + if (!StrUtil.isEmpty(whereJson.getString("whereStr"))) { + query.last(whereJson.getString("whereStr")); + } + if (StrUtil.isNotEmpty(whereJson.getString("class_idStr"))) { + query.in("class_id",whereJson.getString("class_idStr")); + //"('1','2','3')" + } + if (!StrUtil.isEmpty(whereJson.getString("parent_class_id"))) { + query.eq("parent_class_id",whereJson.getString("parent_class_id")); + } + List list = this.list(query); + return getMaps(list); + } + + @Override + @Transactional + public String create(JSONObject form) { + MdPbClassstandard one = this.getOne(new QueryWrapper().eq("class_code", form.getString("class_code"))); + if (one != null) { + throw new BadRequestException(form.getString("class_code")+"存在相同的基础类别编号"); + } + MdPbClassstandard classstandard = form.toJavaObject(MdPbClassstandard.class); + classstandard.setClass_id(IdUtil.getStringId()); + classstandard.setCreate_id(SecurityUtils.getCurrentUserId()); + classstandard.setCreate_name(SecurityUtils.getCurrentNickName()); + classstandard.setCreate_time(DateUtil.now()); + classstandard.setIs_leaf(true); + classstandard.setClass_level(Math.ceil(classstandard.getClass_code().length() / 2.0) + ""); + classstandard.setSub_count(0); + classstandard.setLong_class_code(classstandard.getClass_code()); + this.save(classstandard); + ///更新节点 + if (classstandard.getParent_class_id() != null) { + updateSubCnt(classstandard.getClass_id()); + } + return classstandard.getClass_id(); + } + + public void updateSubCnt(String class_id) { + if (!StringUtils.isEmpty(class_id)){ + MdPbClassstandard one = this.getOne(new QueryWrapper().eq("class_id", class_id).eq("is_delete",false)); + if (one == null){ + throw new BadRequestException(class_id+"没有对应分类数据"); + } + int count = this.count(new QueryWrapper() + .eq("parent_class_id", class_id)); + + one.setSub_count( count); + one.setIs_leaf(count > 0?false:true); + this.updateById(one); + } + } + + @Override + @Transactional + public String updateForm(JSONObject form) { + checkParam(form); + MdPbClassstandard dto = form.toJavaObject(MdPbClassstandard.class); + dto.setUpdate_time(DateUtil.now()); + dto.setUpdate_id(SecurityUtils.getCurrentUserId()); + dto.setUpdate_name(SecurityUtils.getCurrentNickName()); + this.updateById(dto); + + //更新父节点中子节点数目 + String oldPid = this.getOne(new QueryWrapper().eq("class_id", form.getString("class_id"))).getParent_class_id(); + updateSubCnt(oldPid); + updateSubCnt(form.getString("parent_class_id")); + return null; + } + + private void checkParam(JSONObject form) { + Assert.notNull(form,"参数不能为空"); + MdPbClassstandard onebyid = this.getOne(new QueryWrapper().eq("class_id", form.getString("class_id"))); + if (onebyid == null) { + throw new BadRequestException(form.getString("class_id")+"被删除或无权限，操作失败!"); + } + MdPbClassstandard onebycode = this.getOne(new QueryWrapper().eq("class_code", form.getString("class_code"))); + if (onebycode != null) { + throw new BadRequestException("存在相同的供应商编号"); + } + if (form.getString("parent_class_id") != null && form.getString("class_id").equals(form.getString("parent_class_id"))) { + throw new BadRequestException("上级不能为自己"); + } + } + + @Override + public void deleteAll(String[] ids) { + final String TOP_PARENT_ID = "0"; + if (ids == null || ids.length==0){ + return; + } + List list = CopyUtil.copyList(this.list(), MdPbClassstandardTree.class); + Map> collect = list.stream().collect(Collectors.groupingBy(MdPbClassstandardTree::getParent_class_id)); + + Set removeCollect = new HashSet<>(); + for (String id : ids) { + removeCollect.add(id); + List top_parent = collect.remove(id); + this.getChildTree(top_parent, collect, removeCollect); + } + if (!CollectionUtils.isEmpty(removeCollect)){ + this.update(new UpdateWrapper() + .set("is_delete",true) + .set("update_id",SecurityUtils.getCurrentUserId()) + .set("update_name",SecurityUtils.getCurrentNickName()).set("update_time",DateUtil.now()).in("class_id",removeCollect)); + } + } + + private List getChildTree(List top_parent, Map> collect,Set removeCollect){ + removeCollect.addAll(top_parent.stream().map(MdPbClassstandardTree::getClass_id).collect(Collectors.toList())); + + if (CollectionUtils.isEmpty(collect)){ + return top_parent; + } + for (MdPbClassstandardTree parent : top_parent) { + List child = collect.remove(parent.getClass_id()); + if (CollectionUtils.isEmpty(child)){ + continue; + } + List childMenuTree = getChildTree(child, collect,removeCollect); + if (!CollectionUtils.isEmpty(childMenuTree)){ + parent.setItemClassstrandard(childMenuTree); + } + } + return top_parent; + } + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/mdpb.xls index 5160d33169f373b43cf524f44aa64941559631df..f433010b2b41602d074895b76e25a0162a7453bc 100644 GIT binary patch delta 29 lcmZp8z}@hGdqWNj8$&Vo*57T-MJ(+_ER5TWSeW`=0|2gf3s3+6 delta 29 lcmZp8z}@hGdqWNjn}OPT?Uzl>MJ(+_ER5TWSeW`=0|2d?3pW4& diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java deleted file mode 100644 index 39999858..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/IMdPbClassstandardService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.masterdata_manage.service.master; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard; - -/** - *

- * 基础数据分类标准表 服务类 - *

- * - * @author generator - * @since 2023-05-05 - */ -public interface IMdPbClassstandardService extends IService { - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java index ce3b9dcd..04738145 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/dao/mapper/MdPbClassstandardMapper.java @@ -1,7 +1,7 @@ package org.nl.wms.masterdata_manage.service.master.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard; +import org.nl.wms.masterdata_manage.master.service.classstandard.dao.MdPbClassstandard; /** *

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java deleted file mode 100644 index 99d482f7..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/master/impl/MdPbClassstandardServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.masterdata_manage.service.master.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.masterdata_manage.service.master.IMdPbClassstandardService; -import org.nl.wms.masterdata_manage.service.master.dao.MdPbClassstandard; -import org.nl.wms.masterdata_manage.service.master.dao.mapper.MdPbClassstandardMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 基础数据分类标准表 服务实现类 - *

- * - * @author generator - * @since 2023-05-05 - */ -@Service -public class MdPbClassstandardServiceImpl extends ServiceImpl implements IMdPbClassstandardService { - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml index 22749a8f..4548c3c4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml @@ -36,8 +36,8 @@ and ShiftOrder.materialprocess_series in ${query.product_series} - - and ShiftOrder.realproducestart_date >= #{query.begin_time} + + and ShiftOrder.realproducestart_date >= #{query.start_time} and #{query.end_time} >= ShiftOrder.realproducestart_date diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/stivt.xls index fc8218a14c3eddcef76d6341cffe540360c495b1..682be249aff07a760c72ff6645422cc1421adde6 100644 GIT binary patch delta 238 zcmZp;AklC^VnYrK>xPXpSO4Bz$WqM6E0Er|`ghw+Mu^Zy*3VMB4*Ju;LJTZ3R{w7P zsL=jVfpPms1*Xi|eB2C73=9m64BSA-#5CPUjLE8f(Ho&nFPBSzldY1uqq&8dtC^vx zqnQx|17+NuZI#T-%}mXWEln(3%$&`g%v?a&!eo24BwHZU_5;#vcUV{(wB&&{E>vKP GX9oa|qE96N delta 238 zcmZp;AklC^VnYrKD?|4BX_}i0S&A8X8}gP+(`>uR2od_o`dNzi!Rj?&p#=@=rfD{R zRA~RGz_|UR0#oK}K4AtH1_lO324Ns%VVUkD#$?sLXb%$*GXpWp_CqCpSx1H&aIw zb5kb>2FkcQ+bWqF0X3N!8(TUXn}D#H@%DU4wm_!I1}rSw4@k4!0eUQ{2x#L%1-5v0 E0N