diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java index 7b23898..7b32519 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MaterialbaseController.java @@ -3,15 +3,28 @@ package org.nl.wms.basedata_manage.controller; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; +import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; /** - * @author liuxy - * @date 2025-5-13 - **/ + *

+ * 物料基本信息表 控制层 + *

+ * + * @author Liuxy + * @since 2025-05-13 + */ @RestController @RequiredArgsConstructor @RequestMapping("/api/Materia") @@ -21,4 +34,31 @@ public class MaterialbaseController { @Autowired private IMdMeMaterialbaseService iMdMeMaterialbaseService; + @GetMapping + @Log("查询物料") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdMeMaterialbaseService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增物料") + public ResponseEntity create(@Validated @RequestBody MdMeMaterialbase dto) { + iMdMeMaterialbaseService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改物料") + public ResponseEntity update(@Validated @RequestBody MdMeMaterialbase dto) { + iMdMeMaterialbaseService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除物料") + public ResponseEntity delete(@RequestBody Set ids) { + iMdMeMaterialbaseService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MeasureUnitController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MeasureUnitController.java new file mode 100644 index 0000000..812a121 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/MeasureUnitController.java @@ -0,0 +1,64 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService; +import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 计量单位表 控制层 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/mdPbMeasureunit") +@Slf4j +public class MeasureUnitController { + + @Autowired + private IMdPbMeasureunitService iMdPbMeasureunitService; + + @GetMapping + @Log("查询单位") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPbMeasureunitService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增计量单位") + public ResponseEntity create(@Validated @RequestBody MdPbMeasureunit dto) { + iMdPbMeasureunitService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改计量单位") + public ResponseEntity update(@Validated @RequestBody MdPbMeasureunit dto) { + iMdPbMeasureunitService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除计量单位") + public ResponseEntity delete(@RequestBody Set ids) { + iMdPbMeasureunitService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StorageVehicleInfoController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StorageVehicleInfoController.java new file mode 100644 index 0000000..83452be --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/StorageVehicleInfoController.java @@ -0,0 +1,65 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; +import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; +import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 载具基本信息表 控制层 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/storagevehicleinfo") +@Slf4j +public class StorageVehicleInfoController { + + @Autowired + private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; + + @GetMapping + @Log("查询载具") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdPbStoragevehicleinfoService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增载具") + public ResponseEntity create(@Validated @RequestBody MdPbStoragevehicleinfo dto) { + iMdPbStoragevehicleinfoService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改载具") + public ResponseEntity update(@Validated @RequestBody MdPbStoragevehicleinfo dto) { + iMdPbStoragevehicleinfoService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除载具") + public ResponseEntity delete(@RequestBody Set ids) { + iMdPbStoragevehicleinfoService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/SupplierController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/SupplierController.java new file mode 100644 index 0000000..7426fe3 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/SupplierController.java @@ -0,0 +1,64 @@ +package org.nl.wms.basedata_manage.controller; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.base.TableDataInfo; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.logging.annotation.Log; +import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 供应商 控制层 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/supplierbase") +@Slf4j +public class SupplierController { + + @Autowired + private IMdCsSupplierbaseService iMdCsSupplierbaseService; + + @GetMapping + @Log("查询供应商") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iMdCsSupplierbaseService.queryAll(whereJson, page)), HttpStatus.OK); + } + + @PostMapping + @Log("新增供应商") + public ResponseEntity create(@Validated @RequestBody MdCsSupplierbase dto) { + iMdCsSupplierbaseService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改供应商") + public ResponseEntity update(@Validated @RequestBody MdCsSupplierbase dto) { + iMdCsSupplierbaseService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @DeleteMapping + @Log("删除供应商") + public ResponseEntity delete(@RequestBody Set ids) { + iMdCsSupplierbaseService.delete(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/BaseDataEnum.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/BaseDataEnum.java new file mode 100644 index 0000000..cf2072b --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/enums/BaseDataEnum.java @@ -0,0 +1,42 @@ +package org.nl.wms.basedata_manage.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.apache.commons.lang3.StringUtils; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.MapOf; + +import java.util.Map; + +/** + * 基础数据枚举类 + * + * @author Liuxy + * @Date 2025/05/14 20:11 + */ +@AllArgsConstructor +@Getter +public enum BaseDataEnum { + + // 是否 + IS_YES_NOT(MapOf.of("是", "1", "否", "0")), + ; + + private Map code; + + public String code(String desc) { + String code = this.getCode().get(desc); + if (StringUtils.isNotEmpty(code)) { + return code; + } + throw new BadRequestException(this.name() + "对应类型" + desc + "未定义"); + } + + public String check(String code) { + for (Map.Entry entry : this.getCode().entrySet()) + if (entry.getValue().equals("code")) { + return entry.getValue(); + } + throw new BadRequestException(this.name() + "对应类型" + code + "未定义"); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdCsSupplierbaseService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdCsSupplierbaseService.java new file mode 100644 index 0000000..d5a0b83 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdCsSupplierbaseService.java @@ -0,0 +1,46 @@ +package org.nl.wms.basedata_manage.service; + +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.basedata_manage.service.dao.MdCsSupplierbase; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 供应商基本信息表 服务类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface IMdCsSupplierbaseService extends IService { + + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param pageable : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 新增供应商 + * @param dto 实体类 + */ + void create(MdCsSupplierbase dto); + + /** + * 修改供应商 + * @param dto 实体类 + */ + void update(MdCsSupplierbase dto); + + /** + * 删除供应商 + * @param ids 供应商标识集合 + */ + void delete(Set ids); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java index 06e32a8..994de9f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdMeMaterialbaseService.java @@ -1,16 +1,45 @@ package org.nl.wms.basedata_manage.service; +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.basedata_manage.service.dao.MdMeMaterialbase; +import java.util.Map; +import java.util.Set; + /** *

* 物料基本信息表 服务类 *

* - * @author author + * @author Liuxy * @since 2025-05-13 */ public interface IMdMeMaterialbaseService extends IService { + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param pageable : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 新增物料 + * @param dto 物料实体类 + */ + void create(MdMeMaterialbase dto); + + /** + * 修改物料 + * @param dto 物料实体类 + */ + void update(MdMeMaterialbase dto); + /** + * 删除物料 + * @param ids 物料标识集合 + */ + void delete(Set ids); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbMeasureunitService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbMeasureunitService.java new file mode 100644 index 0000000..3483d2b --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbMeasureunitService.java @@ -0,0 +1,47 @@ +package org.nl.wms.basedata_manage.service; + +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.basedata_manage.service.dao.MdPbMeasureunit; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 计量单位表 服务类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface IMdPbMeasureunitService extends IService { + + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param pageable : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 新增计量单位 + * @param dto 实体类 + */ + void create(MdPbMeasureunit dto); + + /** + * 修改计量单位 + * @param dto 实体类 + */ + void update(MdPbMeasureunit dto); + + /** + * 删除计量单位 + * @param ids 计量单位标识集合 + */ + void delete(Set ids); + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java new file mode 100644 index 0000000..a8e8fdf --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IMdPbStoragevehicleinfoService.java @@ -0,0 +1,46 @@ +package org.nl.wms.basedata_manage.service; + +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.basedata_manage.service.dao.MdPbStoragevehicleinfo; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 载具信息表 服务类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface IMdPbStoragevehicleinfoService extends IService { + + /** + * 分页查询 + * @param whereJson : {查询参数} + * @param pageable : 分页对象 + * @return 返回结果 + */ + IPage queryAll(Map whereJson, PageQuery pageable); + + /** + * 新增载具信息 + * @param dto 实体类 + */ + void create(MdPbStoragevehicleinfo dto); + + /** + * 修改载具 + * @param dto 实体类 + */ + void update(MdPbStoragevehicleinfo dto); + + /** + * 删除载具信息 + * @param ids 载具标识集合 + */ + void delete(Set ids); +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java new file mode 100644 index 0000000..58dcc7b --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdCsSupplierbase.java @@ -0,0 +1,141 @@ +package org.nl.wms.basedata_manage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +/** + *

+ * 供应商基本信息表 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_cs_supplierbase") +public class MdCsSupplierbase implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 供应商标识 + */ + @TableId(value = "supp_id") + private String supp_id; + + /** + * 供应商编码 + */ + private String supp_code; + + /** + * 供应商名称 + */ + private String supp_name; + + /** + * 法人代表 + */ + private String jurid_name; + + /** + * 税务登记号 + */ + private String tax_no; + + /** + * 工商注册号 + */ + private String register_no; + + /** + * 经营许可证号 + */ + private String manage_lice_no; + + /** + * 营业执照 + */ + private String busi_char_name; + + /** + * 邮政编码 + */ + private String zip_code; + + /** + * 公司电话 + */ + private String corp_tele_no; + + /** + * 公司地址 + */ + private String corp_address; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 启用时间 + */ + private String is_used_time; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + /** + * 分类标识 + */ + private Long class_id; + + /** + * 备注 + */ + private String remark; + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java index 19dc4da..01783b4 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdMeMaterialbase.java @@ -20,9 +20,7 @@ import lombok.experimental.Accessors; * @since 2025-05-13 */ @Data -@Builder @EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) @TableName("md_me_materialbase") public class MdMeMaterialbase implements Serializable { @@ -31,7 +29,7 @@ public class MdMeMaterialbase implements Serializable { /** * 物料标识 */ - @TableId(value = "material_id", type = IdType.AUTO) + @TableId(value = "material_id") private String material_id; /** @@ -62,12 +60,12 @@ public class MdMeMaterialbase implements Serializable { /** * 基本计量单位 */ - private String baseUnit_id; + private String base_unit_id; /** * 辅助计量单位 */ - private String assUnit_id; + private String ass_unit_id; /** * 批准文号 @@ -132,7 +130,7 @@ public class MdMeMaterialbase implements Serializable { /** * 创建人 */ - private Long create_id; + private String create_id; /** * 创建人姓名 @@ -162,7 +160,7 @@ public class MdMeMaterialbase implements Serializable { /** * 启用时间 */ - private String isUsed_time; + private String is_used_time; /** * 是否启用 diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbMeasureunit.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbMeasureunit.java new file mode 100644 index 0000000..1baec73 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbMeasureunit.java @@ -0,0 +1,93 @@ +package org.nl.wms.basedata_manage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 计量单位表 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_measureunit") +public class MdPbMeasureunit implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 计量单位标识 + */ + @TableId(value = "measure_unit_id") + private String measure_unit_id; + + /** + * 编码 + */ + private String unit_code; + + /** + * 名称 + */ + private String unit_name; + + /** + * 数据精度 + */ + private BigDecimal qty_precision; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 外部标识 + */ + private String ext_id; + + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicleinfo.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicleinfo.java new file mode 100644 index 0000000..9d91065 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicleinfo.java @@ -0,0 +1,132 @@ +package org.nl.wms.basedata_manage.service.dao; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + *

+ * 载具信息表 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("md_pb_storagevehicleinfo") +public class MdPbStoragevehicleinfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 载具标识 + */ + @TableId(value = "storagevehicle_id") + private String storagevehicle_id; + + /** + * 载具编码 + */ + private String storagevehicle_code; + + /** + * 载具名称 + */ + private String storagevehicle_name; + + /** + * 一维码 + */ + private String one_code; + + /** + * 二维码 + */ + private String two_code; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_optid; + + /** + * 修改人姓名 + */ + private String update_optname; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 是否删除 + */ + private String is_delete; + + /** + * 是否启用 + */ + private String is_used; + + /** + * 载具类型 + */ + private String storagevehicle_type; + + /** + * 载具宽度 + */ + private BigDecimal vehicle_width; + + /** + * 载具长度 + */ + private BigDecimal vehicle_long; + + /** + * 载具高度 + */ + private BigDecimal vehicle_height; + + /** + * 托盘重量 + */ + private BigDecimal weigth; + + /** + * 载具是否超仓位 + */ + private String overstruct_type; + + /** + * 占仓位数 + */ + private BigDecimal occupystruct_qty; + + /** + * 外部标识 + */ + private String ext_id; + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.java new file mode 100644 index 0000000..d0bde0a --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; + +/** + *

+ * 供应商基本信息表 Mapper 接口 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface MdCsSupplierbaseMapper extends BaseMapper { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.xml new file mode 100644 index 0000000..c795c36 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdCsSupplierbaseMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.java new file mode 100644 index 0000000..16fd5ca --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; + +/** + *

+ * 计量单位表 Mapper 接口 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface MdPbMeasureunitMapper extends BaseMapper { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.xml new file mode 100644 index 0000000..e342dd4 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbMeasureunitMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java new file mode 100644 index 0000000..b87f9d0 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.basedata_manage.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; + +/** + *

+ * 载具信息表 Mapper 接口 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +public interface MdPbStoragevehicleinfoMapper extends BaseMapper { + +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml new file mode 100644 index 0000000..82a536d --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleinfoMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdCsSupplierbaseServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdCsSupplierbaseServiceImpl.java new file mode 100644 index 0000000..5effb6c --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdCsSupplierbaseServiceImpl.java @@ -0,0 +1,96 @@ +package org.nl.wms.basedata_manage.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata_manage.enums.BaseDataEnum; +import org.nl.wms.basedata_manage.service.IMdCsSupplierbaseService; +import org.nl.wms.basedata_manage.service.dao.MdCsSupplierbase; +import org.nl.wms.basedata_manage.service.dao.mapper.MdCsSupplierbaseMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 供应商基本信息表 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Service +public class MdCsSupplierbaseServiceImpl extends ServiceImpl implements IMdCsSupplierbaseService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + // 查询条件 + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + String search = MapUtil.getStr(whereJson, "search"); + + if (ObjectUtil.isNotEmpty(search)) { + queryWrapper.likeRight(MdCsSupplierbase::getSupp_code, search) + .or(item -> item.likeRight(MdCsSupplierbase::getSupp_name, search)); + } + queryWrapper.eq(MdCsSupplierbase::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); + queryWrapper.orderByDesc(MdCsSupplierbase::getUpdate_time); + + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), + queryWrapper + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(MdCsSupplierbase dto) { + MdCsSupplierbase mdCsSupplierbase = this.baseMapper.selectOne( + new QueryWrapper().lambda() + .eq(MdCsSupplierbase::getSupp_code, dto.getSupp_code()) + ); + if (ObjectUtil.isNotEmpty(mdCsSupplierbase)) { + throw new BadRequestException("当前计量单位编码已存在【"+dto.getSupp_code()+"】"); + } + + // 新增 + dto.setSupp_id(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.save(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MdCsSupplierbase dto) { + MdCsSupplierbase mdCsSupplierbase = this.baseMapper.selectById(dto.getSupp_id()); + if (ObjectUtil.isEmpty(mdCsSupplierbase)) { + throw new BadRequestException("被删除或无权限,操作失败!"); + } + + // 修改 + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.updateById(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java index 1fe2367..5f75529 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdMeMaterialbaseServiceImpl.java @@ -1,20 +1,95 @@ package org.nl.wms.basedata_manage.service.impl; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService; import org.nl.wms.basedata_manage.service.dao.MdMeMaterialbase; import org.nl.wms.basedata_manage.service.dao.mapper.MdMeMaterialbaseMapper; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; /** *

* 物料基本信息表 服务实现类 *

* - * @author author + * @author Liuxy * @since 2025-05-13 */ @Service public class MdMeMaterialbaseServiceImpl extends ServiceImpl implements IMdMeMaterialbaseService { + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + // 查询条件 + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + String search = MapUtil.getStr(whereJson, "search"); + + if (ObjectUtil.isNotEmpty(search)) { + queryWrapper.likeRight(MdMeMaterialbase::getMaterial_code, search) + .or(item -> item.likeRight(MdMeMaterialbase::getMaterial_name, search)); + } + queryWrapper.orderByDesc(MdMeMaterialbase::getUpdate_time); + + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), + queryWrapper + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(MdMeMaterialbase dto) { + // 根据物料编码查询是否有相同物料编码的物料 + MdMeMaterialbase mdMeMaterialbase = this.baseMapper.selectOne( + new QueryWrapper().lambda() + .eq(MdMeMaterialbase::getMaterial_code, dto.getMaterial_code()) + ); + if (ObjectUtil.isNotEmpty(mdMeMaterialbase)) { + throw new BadRequestException("当前物料编码已存在【"+dto.getMaterial_code()+"】"); + } + + // 新增 + dto.setMaterial_id(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.save(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MdMeMaterialbase dto) { + MdMeMaterialbase mdMeMaterialbase = this.baseMapper.selectById(dto.getMaterial_id()); + if (ObjectUtil.isEmpty(mdMeMaterialbase)) { + throw new BadRequestException("被删除或无权限,操作失败!"); + } + + // 修改 + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.updateById(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbMeasureunitServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbMeasureunitServiceImpl.java new file mode 100644 index 0000000..c3b6823 --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbMeasureunitServiceImpl.java @@ -0,0 +1,96 @@ +package org.nl.wms.basedata_manage.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata_manage.enums.BaseDataEnum; +import org.nl.wms.basedata_manage.service.IMdPbMeasureunitService; +import org.nl.wms.basedata_manage.service.dao.MdPbMeasureunit; +import org.nl.wms.basedata_manage.service.dao.mapper.MdPbMeasureunitMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 计量单位表 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Service +public class MdPbMeasureunitServiceImpl extends ServiceImpl implements IMdPbMeasureunitService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + // 查询条件 + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + String search = MapUtil.getStr(whereJson, "search"); + + if (ObjectUtil.isNotEmpty(search)) { + queryWrapper.likeRight(MdPbMeasureunit::getUnit_code, search) + .or(item -> item.likeRight(MdPbMeasureunit::getUnit_name, search)); + } + queryWrapper.eq(MdPbMeasureunit::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); + queryWrapper.orderByDesc(MdPbMeasureunit::getUpdate_time); + + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), + queryWrapper + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(MdPbMeasureunit dto) { + MdPbMeasureunit mdPbMeasureunit = this.baseMapper.selectOne( + new QueryWrapper().lambda() + .eq(MdPbMeasureunit::getUnit_code, dto.getUnit_code()) + ); + if (ObjectUtil.isNotEmpty(mdPbMeasureunit)) { + throw new BadRequestException("当前计量单位编码已存在【"+dto.getUnit_code()+"】"); + } + + // 新增 + dto.setMeasure_unit_id(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.save(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MdPbMeasureunit dto) { + MdPbMeasureunit mdPbMeasureunit = this.baseMapper.selectById(dto.getMeasure_unit_id()); + if (ObjectUtil.isEmpty(mdPbMeasureunit)) { + throw new BadRequestException("被删除或无权限,操作失败!"); + } + + // 修改 + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.updateById(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } +} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java new file mode 100644 index 0000000..2db2a1c --- /dev/null +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -0,0 +1,102 @@ +package org.nl.wms.basedata_manage.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.common.domain.query.PageQuery; +import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.basedata_manage.enums.BaseDataEnum; +import org.nl.wms.basedata_manage.service.IMdPbStoragevehicleinfoService; +import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicleinfo; +import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicleinfoMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Map; +import java.util.Set; + +/** + *

+ * 载具信息表 服务实现类 + *

+ * + * @author Liuxy + * @since 2025-05-14 + */ +@Service +public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl implements IMdPbStoragevehicleinfoService { + + @Override + public IPage queryAll(Map whereJson, PageQuery page) { + // 查询条件 + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda(); + String search = MapUtil.getStr(whereJson, "storagevehicle_code"); + String storagevehicle_type = MapUtil.getStr(whereJson, "storagevehicle_type"); + + if (ObjectUtil.isNotEmpty(search)) { + queryWrapper.likeRight(MdPbStoragevehicleinfo::getStoragevehicle_code, search) + .or(item -> item.likeRight(MdPbStoragevehicleinfo::getStoragevehicle_name, search)); + } + if (ObjectUtil.isNotEmpty(storagevehicle_type)) { + queryWrapper.eq(MdPbStoragevehicleinfo::getStoragevehicle_type, storagevehicle_type); + } + queryWrapper.eq(MdPbStoragevehicleinfo::getIs_delete, BaseDataEnum.IS_YES_NOT.code("否")); + queryWrapper.orderByDesc(MdPbStoragevehicleinfo::getUpdate_time); + + return this.baseMapper.selectPage(new Page<>(page.getPage() + 1, page.getSize()), + queryWrapper + ); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(MdPbStoragevehicleinfo dto) { + // 根据载具编码查询是否有相同载具编码的载具 + MdPbStoragevehicleinfo mdPbStoragevehicleinfo = this.baseMapper.selectOne( + new QueryWrapper().lambda() + .eq(MdPbStoragevehicleinfo::getStoragevehicle_code, dto.getStoragevehicle_code()) + ); + if (ObjectUtil.isNotEmpty(mdPbStoragevehicleinfo)) { + throw new BadRequestException("当前载具编码已存在【"+dto.getStoragevehicle_code()+"】"); + } + + // 新增 + dto.setStoragevehicle_id(IdUtil.getStringId()); + dto.setCreate_id(SecurityUtils.getCurrentUserId()); + dto.setCreate_name(SecurityUtils.getCurrentNickName()); + dto.setCreate_time(DateUtil.now()); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.save(dto); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(MdPbStoragevehicleinfo dto) { + MdPbStoragevehicleinfo mdPbStoragevehicleinfo = this.baseMapper.selectById(dto.getStoragevehicle_id()); + if (ObjectUtil.isEmpty(mdPbStoragevehicleinfo)) { + throw new BadRequestException("被删除或无权限,操作失败!"); + } + + // 修改 + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); + this.updateById(dto); + + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(Set ids) { + this.baseMapper.deleteBatchIds(ids); + } +} diff --git a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue index dc0cfdb..b801798 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -32,8 +32,8 @@ - - + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/measure/index.vue b/wms/nladmin-ui/src/views/wms/basedata/measure/index.vue new file mode 100644 index 0000000..8f88c82 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/measure/index.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/measure/mdPbMeasureunit.js b/wms/nladmin-ui/src/views/wms/basedata/measure/mdPbMeasureunit.js new file mode 100644 index 0000000..ae700b9 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/measure/mdPbMeasureunit.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/mdPbMeasureunit', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/mdPbMeasureunit/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/mdPbMeasureunit', + method: 'put', + data + }) +} + +export function getUnit(params) { + return request({ + url: 'api/mdPbMeasureunit/getUnit', + method: 'get', + params + }) +} + +export default { add, edit, del, getUnit } diff --git a/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue b/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue new file mode 100644 index 0000000..8aa54ff --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue @@ -0,0 +1,280 @@ + + + + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/storagevehicleinfo.js b/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/storagevehicleinfo.js new file mode 100644 index 0000000..63fdfc6 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/storagevehicleinfo/storagevehicleinfo.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/storagevehicleinfo', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/storagevehicleinfo/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/storagevehicleinfo', + method: 'put', + data + }) +} + +export function changeActive(data) { + return request({ + url: 'api/storagevehicleinfo/changeActive', + method: 'put', + data + }) +} + +export function getVehicle(code) { + return request({ + url: 'api/storagevehicleinfo/getVehicle/' + code, + method: 'get' + }) +} + +export default { add, edit, del, changeActive, getVehicle } diff --git a/wms/nladmin-ui/src/views/wms/basedata/supp/index.vue b/wms/nladmin-ui/src/views/wms/basedata/supp/index.vue new file mode 100644 index 0000000..71c972b --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/supp/index.vue @@ -0,0 +1,290 @@ + + + + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/supp/supplierbase.js b/wms/nladmin-ui/src/views/wms/basedata/supp/supplierbase.js new file mode 100644 index 0000000..d04cf8b --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/supp/supplierbase.js @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/supplierbase', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/supplierbase/', + method: 'delete', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/supplierbase', + method: 'put', + data + }) +} + +export default { add, edit, del }