物料信息

yudao-module-backend-logistics/yudao-module-backend-logistics-api/src/main/java/cn/iocoder/yudao/module/backendlogistics/enums/ErrorCodeConstants.java

@@ -12,28 +12,28 @@ import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 public interface ErrorCodeConstants {
     /**
      * 业务异常的错误码区间，解决：解决各模块错误码定义，避免重复，在此只声明不做实际使用
-     *
+     * <p>
      * 一共 10 位，分成四段
-     *
+     * <p>
      * 第一段，1 位，类型
-     *      1 - 业务级别异常
-     *      x - 预留
+     * 1 - 业务级别异常
+     * x - 预留
      * 第二段，3 位，系统类型
-     *      001 - 用户系统
-     *      002 - 商品系统
-     *      003 - 订单系统
-     *      004 - 支付系统
-     *      005 - 优惠劵系统
-     *      ... - ...
+     * 001 - 用户系统
+     * 002 - 商品系统
+     * 003 - 订单系统
+     * 004 - 支付系统
+     * 005 - 优惠劵系统
+     * ... - ...
      * 第三段，3 位，模块
-     *      不限制规则。
-     *      一般建议，每个系统里面，可能有多个模块，可以再去做分段。以用户系统为例子：
-     *          001 - OAuth2 模块
-     *          002 - User 模块
-     *          003 - MobileCode 模块
+     * 不限制规则。
+     * 一般建议，每个系统里面，可能有多个模块，可以再去做分段。以用户系统为例子：
+     * 001 - OAuth2 模块
+     * 002 - User 模块
+     * 003 - MobileCode 模块
      * 第四段，3 位，错误码
-     *       不限制规则。
-     *       一般建议，每个模块自增。
+     * 不限制规则。
+     * 一般建议，每个模块自增。
      *
      * @author Rayson
      */
@@ -63,5 +63,18 @@ public interface ErrorCodeConstants {
     ErrorCode PLACE_ARCHIVE_MATERIAL_NOT_EXISTS = new ErrorCode(1_100_001_008, "地点档案物料信息不存在");
 
     ErrorCode CORR_FACT_NOT_EXISTS = new ErrorCode(1_100_001_009, "关联工厂信息不存在");
+    // 模块 bseMngt.plceAchi [1_100_002_000 ~ 1_100_002_999]
+    ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(1_100_002_001, "客商协同账号不存在");
+
+    ErrorCode CARRIER_ACCOUNT_NOT_EXISTS = new ErrorCode(1_100_002_002, "物流服务商协同账号不存在");
+    ErrorCode DRIVING_ACCOUNT_NOT_EXISTS = new ErrorCode(1_100_002_003, "司机协同账号不存在");
+
+
+    // 模块 bseMngt.mtrl [1_100_003_000 ~ 1_100_003_999]
+    ErrorCode MTRL_XPD_NOT_EXISTS = new ErrorCode(1_100_003_001, "物资信息扩展不存在");
+    ErrorCode RLWY_MTRL_MAIN_NOT_EXISTS = new ErrorCode(1_100_003_002, "铁路物资对照主不存在");
+    ErrorCode RLWY_MTRL_SUB_NOT_EXISTS = new ErrorCode(1_100_003_003, "铁路物资对照子不存在");
+    ErrorCode RLWY_MTRL_SUB_MATERIAL_EXISTS = new ErrorCode(1_100_003_004, "物资对照已经存在");
+    ErrorCode RLWY_MTRL_MAIN_STATUS_EXISTS = new ErrorCode(1_100_003_004, "铁路品名对照草稿状态才能操作");
 
 }

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/mtrl/MtrlClsController.java

@@ -36,10 +36,10 @@ public class MtrlClsController implements BusinessControllerMarker {
     @Resource
     private MtrlClsService mtrlClsService;
 
-    @GetMapping("/list")
+    @PostMapping("/list")
     @Operation(summary = "获得物料分类列表")
     @PreAuthorize("@ss.hasPermission('lgst:mtrl-cls:query')")
-    public CommonResult<List<MtrlClsRespVO>> getMtrlClsList(@Valid MtrlClsListReqVO listReqVO) {
+    public CommonResult<List<MtrlClsRespVO>> getMtrlClsList(@Valid @RequestBody MtrlClsListReqVO listReqVO) {
         List<MtrlClsDO> list = mtrlClsService.getMtrlClsList(listReqVO);
         return success(BeanUtils.toBean(list, MtrlClsRespVO.class));
     }

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/mtrl/MtrlXpdController.java

@@ -0,0 +1,69 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl;
+
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo.MtrlXpdPageReqVO;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo.MtrlXpdRespVO;
+import cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo.MtrlXpdSaveReqVO;
+import cn.iocoder.yudao.module.backendlogistics.dal.dataobject.bseMngt.mtrl.MtrlXpdDO;
+import cn.iocoder.yudao.module.backendlogistics.service.bseMngt.mtrl.MtrlClsService;
+import cn.iocoder.yudao.module.backendlogistics.service.bseMngt.mtrl.MtrlXpdService;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.web.bind.annotation.*;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import cn.iocoder.yudao.framework.business.interceptor.BusinessControllerMarker;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import jakarta.validation.constraints.*;
+import jakarta.validation.*;
+import jakarta.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.vo.BatchDeleteReqVO;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+
+@Tag(name = "管理后台 - 物资信息扩展")
+@RestController
+@RequestMapping("/lgst/mtrl-xpd")
+@Validated
+public class MtrlXpdController implements BusinessControllerMarker {
+
+
+    @Resource
+    private MtrlXpdService mtrlXpdService;
+
+    @PostMapping("/update")
+    @Operation(summary = "更新物资信息扩展")
+    @PreAuthorize("@ss.hasPermission('lgst:mtrl-xpd:update')")
+//    @PermitAll
+    public CommonResult<Boolean> updateMtrlXpd(@Valid @RequestBody List<MtrlXpdSaveReqVO> updateReqVOs) {
+        mtrlXpdService.updateMtrlXpd(updateReqVOs);
+        return success(true);
+    }
+
+
+    @PostMapping("/page")
+    @Operation(summary = "获得物资信息分页")
+    @PreAuthorize("@ss.hasPermission('lgst:mtrl-xpd:query')")
+    public CommonResult<PageResult<MtrlXpdRespVO>> getMtrlXpdPage(@Valid @RequestBody MtrlXpdPageReqVO pageReqVO) {
+        PageResult<MtrlXpdRespVO> pageResult = mtrlXpdService.getMtrlXpdPage(pageReqVO);
+        return success(pageResult);
+    }
+
+
+
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/mtrl/vo/MtrlXpdPageReqVO.java

@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BusinessBaseDO;
+import com.alibaba.excel.annotation.ExcelProperty;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 物资信息扩展分页 Request VO")
+@Data
+public class MtrlXpdPageReqVO extends PageParam {
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "物资ID", example = "10845")
+    private Long materialId;
+
+    @Schema(description = "物资编码")
+    @ExcelProperty("物资编码")
+    private String materialCode;
+
+    @Schema(description = "物资名称")
+    @ExcelProperty("物资名称")
+    private String materialName;
+
+    @Schema(description = "SAP编码")
+    private String sapCode;
+
+    @Schema(description = "MDM编码")
+    private String mdmCode;
+
+    @Schema(description = "长描述")
+    private String description;
+
+    @Schema(description = "分类id")
+    private Long classesId;
+
+    @Schema(description = "质检标志")
+    private String inspectionFlag;
+
+    @Schema(description = "计量标志")
+    private String meteringFlag;
+
+    @Schema(description = "取样节点")
+    private String samplingNode;
+
+    @Schema(description = "部门id")
+    private Long deptId;
+
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/mtrl/vo/MtrlXpdRespVO.java

@@ -0,0 +1,89 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.beans.Transient;
+import java.io.Serializable;
+import java.util.*;
+
+import net.sf.jsqlparser.statement.select.WithItem;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 物资信息扩展 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class MtrlXpdRespVO{
+
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13011")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "物资ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10845")
+    @ExcelProperty("物资ID")
+    private Long materialId;
+
+    @Schema(description = "物资编码")
+    @ExcelProperty("物资编码")
+    private String materialCode;
+
+    @Schema(description = "物资名称")
+    @ExcelProperty("物资名称")
+    private String materialName;
+
+    @Schema(description = "SAP编码")
+    @ExcelProperty("SAP编码")
+    private String sapCode;
+
+    @Schema(description = "MDM编码")
+    @ExcelProperty("MDM编码")
+    private String mdmCode;
+
+    @Schema(description = "长描述")
+    @ExcelProperty("长描述")
+    private String description;
+
+    @Schema(description = "大类代码")
+    @ExcelProperty("大类代码")
+    private String bigTypeCode;
+
+    @Schema(description = "大类名称", example = "王五")
+    @ExcelProperty("大类名称")
+    private String bigTypeName;
+
+    @Schema(description = "中类代码")
+    @ExcelProperty("中类代码")
+    private String midTypeCode;
+
+    @Schema(description = "中类名称", example = "芋艿")
+    @ExcelProperty("中类名称")
+    private String midTypeName;
+
+    @Schema(description = "小类代码")
+    @ExcelProperty("小类代码")
+    private String smalTypeCode;
+
+    @Schema(description = "小类名称", example = "王五")
+    @ExcelProperty("小类名称")
+    private String smalTypeName;
+
+    @Schema(description = "质检标志")
+    @ExcelProperty("质检标志")
+    private String inspectionFlag;
+
+    @Schema(description = "计量标志")
+    @ExcelProperty("计量标志")
+    private String meteringFlag;
+
+    @Schema(description = "取样节点")
+    @ExcelProperty("取样节点")
+    private String samplingNode;
+
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/mtrl/vo/MtrlXpdSaveReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.mtrl.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 物资信息扩展新增/修改 Request VO")
+@Data
+public class MtrlXpdSaveReqVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "13011")
+    private Long id;
+
+    @Schema(description = "物资ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10845")
+    @NotNull(message = "物资ID不能为空")
+    private Long materialId;
+
+    @Schema(description = "质检标志")
+    private String inspectionFlag;
+
+    @Schema(description = "计量标志")
+    private String meteringFlag;
+
+    @Schema(description = "取样节点")
+    private String samplingNode;
+
+
+
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/rlwyMtrl/vo/RlwyMtrlMainPageReqVO.java

@@ -0,0 +1,60 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.rlwyMtrl.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 铁路物资对照主分页 Request VO")
+@Data
+public class RlwyMtrlMainPageReqVO extends PageParam {
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "状态")
+    private String sts;
+
+    @Schema(description = "铁路运输品名", example = "张三")
+    private String rlwyTrpName;
+
+    @Schema(description = "品名代码")
+    private String nameCd;
+
+    @Schema(description = "拼音码")
+    private String pyCd;
+
+    @Schema(description = "报价费率")
+    private BigDecimal chrgRte;
+
+    @Schema(description = "整车价号")
+    private String exPrcCd;
+
+    @Schema(description = "零担价号")
+    private String prtlPrcCd;
+
+    @Schema(description = "大类代码")
+    private String bigTpCd;
+
+    @Schema(description = "大类名称", example = "李四")
+    private String bigTpName;
+
+    @Schema(description = "中类代码")
+    private String midTpCd;
+
+    @Schema(description = "中类名称", example = "芋艿")
+    private String midTpName;
+
+    @Schema(description = "小类代码")
+    private String smalTpCd;
+
+    @Schema(description = "小类名称", example = "王五")
+    private String smalTpName;
+
+}

yudao-module-backend-logistics/yudao-module-backend-logistics-server/src/main/java/cn/iocoder/yudao/module/backendlogistics/controller/admin/backendlogistics/bseMngt/rlwyMtrl/vo/RlwyMtrlMainRespVO.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.backendlogistics.controller.admin.backendlogistics.bseMngt.rlwyMtrl.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import java.math.BigDecimal;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 铁路物资对照主 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class RlwyMtrlMainRespVO {
+
+    @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "3659")
+    @ExcelProperty("ID")
+    private Long id;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "状态")
+    @ExcelProperty("状态")
+    private String sts;
+
+    @Schema(description = "铁路运输品名", example = "张三")
+    @ExcelProperty("铁路运输品名")
+    private String rlwyTrpName;
+
+    @Schema(description = "品名代码")
+    @ExcelProperty("品名代码")
+    private String nameCd;
+
+    @Schema(description = "拼音码")
+    @ExcelProperty("拼音码")
+    private String pyCd;
+
+    @Schema(description = "报价费率")
+    @ExcelProperty("报价费率")
+    private BigDecimal chrgRte;
+
+    @Schema(description = "整车价号")
+    @ExcelProperty("整车价号")
+    private String exPrcCd;
+
+    @Schema(description = "零担价号")
+    @ExcelProperty("零担价号")
+    private String prtlPrcCd;
+
+    @Schema(description = "大类代码")
+    @ExcelProperty("大类代码")
+    private String bigTpCd;
+
+    @Schema(description = "大类名称", example = "李四")
+    @ExcelProperty("大类名称")
+    private String bigTpName;
+
+    @Schema(description = "中类代码")
+    @ExcelProperty("中类代码")
+    private String midTpCd;
+
+    @Schema(description = "中类名称", example = "芋艿")
+    @ExcelProperty("中类名称")
+    private String midTpName;
+
+    @Schema(description = "小类代码")
+    @ExcelProperty("小类代码")
+    private String smalTpCd;
+
+    @Schema(description = "小类名称", example = "王五")
+    @ExcelProperty("小类名称")
+    private String smalTpName;
+
+}