chenx/qhmes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

胶料信息

Browse Source
This commit is contained in:
chenx
2026-05-20 15:30:42 +08:00
parent 84286a6769
commit 34b6ed4478
7 changed files with 157 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/controller/MesMaterialController.java
View File

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@Slf4j
@Tag(name = "MES-物料信息")
@Tag(name = "MES-胶料信息")
@RestController
@RequestMapping("/mes/material/material")
public class MesMaterialController extends JeecgController<MesMaterial, IMesMaterialService> {
@@ -39,8 +39,8 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
return Result.OK(pageList);
}
@AutoLog(value = "MES-物料信息-添加")
@Operation(summary = "MES-物料信息-添加")
@AutoLog(value = "MES-胶料信息-添加")
@Operation(summary = "MES-胶料信息-添加")
@RequiresPermissions("mes:mes_material:add")
@PostMapping("/add")
public Result<String> add(@RequestBody MesMaterial model) {
@@ -49,8 +49,8 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
return Result.OK("添加成功！");
}
@AutoLog(value = "MES-物料信息-编辑")
@Operation(summary = "MES-物料信息-编辑")
@AutoLog(value = "MES-胶料信息-编辑")
@Operation(summary = "MES-胶料信息-编辑")
@RequiresPermissions("mes:mes_material:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody MesMaterial model) {
@@ -59,8 +59,8 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
return Result.OK("编辑成功!");
}
@AutoLog(value = "MES-物料信息-通过id删除")
@Operation(summary = "MES-物料信息-通过id删除")
@AutoLog(value = "MES-胶料信息-通过id删除")
@Operation(summary = "MES-胶料信息-通过id删除")
@RequiresPermissions("mes:mes_material:delete")
@DeleteMapping("/delete")
public Result<String> delete(@RequestParam(name = "id") String id) {
@@ -72,8 +72,8 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
return Result.OK("删除成功!");
}
@AutoLog(value = "MES-物料信息-批量删除")
@Operation(summary = "MES-物料信息-批量删除")
@AutoLog(value = "MES-胶料信息-批量删除")
@Operation(summary = "MES-胶料信息-批量删除")
@RequiresPermissions("mes:mes_material:deleteBatch")
@DeleteMapping("/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids") String ids) {
@@ -94,7 +94,7 @@ public class MesMaterialController extends JeecgController<MesMaterial, IMesMate
@RequiresPermissions("mes:mes_material:exportXls")
@RequestMapping("/exportXls")
public ModelAndView exportXls(HttpServletRequest request, MesMaterial model) {
return super.exportXls(request, model, MesMaterial.class, "MES物料信息");
return super.exportXls(request, model, MesMaterial.class, "MES胶料信息");
}
@RequiresPermissions("mes:mes_material:importExcel")

25
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mes/material/entity/MesMaterial.java
View File

@@ -19,7 +19,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("mes_material")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@Schema(description = "MES物料主数据")
@Schema(description = "MES胶料主数据")
public class MesMaterial implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,15 +28,15 @@ public class MesMaterial implements Serializable {
@Excel(name = "物料编码", width = 15)
private String materialCode;
@Excel(name = "物料名称", width = 20)
@Excel(name = "胶料名称", width = 20)
private String materialName;
@Excel(name = "别名", width = 15)
@Excel(name = "胶料别名", width = 15)
private String aliasName;
@Excel(name = "简称", width = 15)
private String shortName;
@Excel(name = "分类", width = 15, dictTable = "mes_material_category", dicText = "category_name", dicCode = "id")
@Dict(dictTable = "mes_material_category", dicText = "category_name", dicCode = "id")
@Excel(name = "胶料类别", width = 15, dictTable = "sys_category", dicText = "name", dicCode = "id")
@Dict(dictTable = "sys_category", dicText = "name", dicCode = "id")
private String categoryId;
@Excel(name = "等级", width = 12)
private String materialGrade;
@@ -57,16 +57,27 @@ public class MesMaterial implements Serializable {
@Excel(name = "换算系数", width = 12)
private BigDecimal unitConvertRate;
@Excel(name = "ERP编号", width = 15)
private String erpCode;
@Excel(name = "终炼胶保质期(天)", width = 15)
private Integer finalShelfLifeDays;
@Excel(name = "母炼胶保质期(天)", width = 15)
private Integer masterShelfLifeDays;
@Excel(name = "最小停放时间(时)", width = 15)
private Integer minStandingHours;
@Excel(name = "标准码", width = 15)
private String standardCode;
@Excel(name = "产地", width = 15)
private String originPlace;
@Excel(name = "供应商ID", width = 15)
private String supplierId;
@Excel(name = "客户ID", width = 15)
@Excel(name = "胶料客户", width = 15, dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
@Dict(dictTable = "mes_xsl_customer", dicText = "customer_name", dicCode = "id")
private String customerId;
@Excel(name = "启用状态", width = 10)
@Excel(name = "使用状态", width = 10, replace = {"使用中_1", "停用_0"})
private Integer enableFlag;
@Excel(name = "是否为特种胶", width = 12, replace = {"是_1", "否_0"})
private Integer isSpecialRubber;
@Excel(name = "ERP同步", width = 10)
private Integer syncFromErpFlag;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")