liuqingkun
5 months ago
parent
b066084bd0
commit
b0cb842ad0
53 changed files with 1136 additions and 974 deletions
@ -0,0 +1,107 @@ |
||||
package org.springblade.desk.order.pojo.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import lombok.Data; |
||||
import org.springblade.core.mp.base.BaseEntity; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
|
||||
import java.util.Date; |
||||
|
||||
/** |
||||
* 烧结模具计划-申报 |
||||
* |
||||
* @author lqk |
||||
* @TableName MES_MOLD_APPLY |
||||
*/ |
||||
@TableName(value = "MES_MOLD_APPLY") |
||||
@Data |
||||
public class MoldApply extends BaseEntity { |
||||
@TableField(exist = false) |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 零件编码 |
||||
*/ |
||||
@TableField(value = "PART_CODE") |
||||
private String partCode; |
||||
|
||||
/** |
||||
* 零件名称 |
||||
*/ |
||||
@TableField(value = "PART_NAME") |
||||
private String partName; |
||||
|
||||
/** |
||||
* 工装编码 |
||||
*/ |
||||
@TableField(value = "TOOL_CODE") |
||||
private String toolCode; |
||||
|
||||
/** |
||||
* 工装名称 |
||||
*/ |
||||
@TableField(value = "TOOL_NAME") |
||||
private String toolName; |
||||
|
||||
/** |
||||
* 申报数量 |
||||
*/ |
||||
@TableField(value = "APPLY_NUM") |
||||
private Double applyNum; |
||||
|
||||
/** |
||||
* 计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模) |
||||
*/ |
||||
@TableField(value = "PLAN_TYPE_CODE") |
||||
private String planTypeCode; |
||||
|
||||
/** |
||||
* 计划类型名称;14001:Z:制造(工装不为空且工装名称为压饼模),14002:D:夹具(工装不为空且工装名称为石墨模) |
||||
*/ |
||||
@TableField(value = "PLAN_TYPE_NAME") |
||||
private String planTypeName; |
||||
|
||||
/** |
||||
* 需求日期 |
||||
*/ |
||||
@DateTimeFormat( |
||||
pattern = "yyyy-MM-dd" |
||||
) |
||||
@JsonFormat( |
||||
pattern = "yyyy-MM-dd" |
||||
) |
||||
@TableField(value = "NEED_DATE") |
||||
private Date needDate; |
||||
|
||||
/** |
||||
* 生产标识 |
||||
*/ |
||||
@TableField(value = "QUA_LEVEL") |
||||
private String quaLevel; |
||||
|
||||
/** |
||||
* 类型; 12001、热表，烧结，12002、仓库 |
||||
*/ |
||||
@TableField(value = "MAF_TYPE") |
||||
private Integer mafType; |
||||
|
||||
/** |
||||
* 保管员 |
||||
*/ |
||||
@TableField(value = "KEEPER") |
||||
private Long keeper; |
||||
|
||||
/** |
||||
* 下达人 |
||||
*/ |
||||
@TableField(value = "RELEASER") |
||||
private Long releaser; |
||||
|
||||
/** |
||||
* 备注 |
||||
*/ |
||||
@TableField(value = "MEMO") |
||||
private String memo; |
||||
} |
||||
@ -1,33 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.entity; |
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import lombok.Data; |
||||
import org.springblade.core.mp.base.BaseEntity; |
||||
|
||||
/** |
||||
* 烧结模具计划-工装关联表 |
||||
* |
||||
* @author lqk |
||||
* @TableName MES_MOLD_PLAN_TOOL |
||||
*/ |
||||
@Deprecated |
||||
@TableName(value = "MES_MOLD_PLAN_TOOL") |
||||
@Data |
||||
public class MoldPlanTool extends BaseEntity { |
||||
@TableField(exist = false) |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 烧结模具计划ID |
||||
*/ |
||||
@TableField(value = "MP_ID") |
||||
private Long mpId; |
||||
|
||||
/** |
||||
* 生产订单id |
||||
*/ |
||||
@TableField(value = "TOOL_ID") |
||||
private Long toolId; |
||||
|
||||
} |
||||
@ -0,0 +1,80 @@ |
||||
package org.springblade.desk.order.pojo.enums; |
||||
|
||||
import lombok.AllArgsConstructor; |
||||
import lombok.Getter; |
||||
import org.springblade.core.tool.utils.ObjectUtil; |
||||
import org.springblade.core.tool.utils.StringPool; |
||||
|
||||
import java.util.Arrays; |
||||
|
||||
/** |
||||
* 枚举 烧结模具计划 - 模具需求 |
||||
* |
||||
* @author lqk |
||||
* @date 2025-12-19 9:25 |
||||
*/ |
||||
@Getter |
||||
@AllArgsConstructor |
||||
public enum MoldDemandEnum { |
||||
EMPTY(StringPool.EMPTY, -1), |
||||
|
||||
/** |
||||
* 状态枚举 |
||||
*/ |
||||
STATUS_WAITING("待出库", 10000), |
||||
STATUS_OUT_STORE("已出库", 10001), |
||||
STATUS_DONE("完成", 10002), |
||||
STATUS_CLOSE("关闭", 10003), |
||||
|
||||
/** |
||||
* 状态枚举; 11001、新建，11002:已下发，11003、已完成 |
||||
*/ |
||||
MAF_STATUS_CREATE("新建", 11001), |
||||
MAF_STATUS_SEND("已下发", 11002), |
||||
MAF_STATUS_DONE("已完成", 11003), |
||||
|
||||
/** |
||||
* 类型;12001、热表，烧结，12002、仓库 |
||||
*/ |
||||
MAF_TYPE_RB("热表，烧结", 12001), |
||||
MAF_TYPE_STORE("仓库", 12002), |
||||
|
||||
/** |
||||
* 计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模) |
||||
*/ |
||||
PLAN_TYPE_CODE_Z("Z", 13001), |
||||
PLAN_TYPE_CODE_D("D", 13002), |
||||
PLAN_TYPE_NAME_Z("制造", 14001), |
||||
PLAN_TYPE_NAME_D("夹具", 15002), |
||||
; |
||||
final String name; |
||||
final int code; |
||||
|
||||
/** |
||||
* 匹配枚举值 |
||||
* |
||||
* @param name 名称 |
||||
* @return BladeUserEnum |
||||
*/ |
||||
public static MoldDemandEnum of(String name) { |
||||
return Arrays.stream(MoldDemandEnum.values()) |
||||
.filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web")) |
||||
.findFirst() |
||||
// 在没有找到匹配项时返回默认值
|
||||
.orElse(MoldDemandEnum.EMPTY); |
||||
} |
||||
|
||||
/** |
||||
* 根据值获取名称 |
||||
* |
||||
* @param category |
||||
* @return |
||||
*/ |
||||
public static String getName(int category) { |
||||
MoldDemandEnum item = Arrays.stream(MoldDemandEnum.values()) |
||||
.filter(enumItem -> enumItem.getCode() == category) |
||||
.findFirst() |
||||
.orElse(null); |
||||
return ObjectUtil.isEmpty(item) ? StringPool.EMPTY : item.getName(); |
||||
} |
||||
} |
||||
@ -1,32 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.request; |
||||
|
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlan; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 烧结模具计划 - 保存请求参数 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Deprecated |
||||
@Data |
||||
public class MoldPlanSave { |
||||
/** |
||||
* 烧结模具计划 |
||||
*/ |
||||
private MoldPlan moldPlan; |
||||
|
||||
/** |
||||
* 关联订单明细 |
||||
*/ |
||||
private List<MoldPlanOrder> orderList; |
||||
|
||||
/** |
||||
* 关联工装明细 |
||||
*/ |
||||
private List<MoldPlanTool> toolList; |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.vo; |
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; |
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.AssayContentDetail; |
||||
|
||||
import java.io.Serial; |
||||
|
||||
/** |
||||
* 化验含量明细-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class AssayContentDetailVo extends AssayContentDetail { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.vo; |
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; |
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
|
||||
import java.io.Serial; |
||||
|
||||
/** |
||||
* 烧结模具计划-订单-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class MoldPlanOrderVo extends MoldPlanOrder { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.vo; |
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; |
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
|
||||
import java.io.Serial; |
||||
|
||||
/** |
||||
* 烧结模具计划-模具-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class MoldPlanToolVo extends MoldPlanTool { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
} |
||||
@ -1,30 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.vo; |
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; |
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; |
||||
|
||||
import java.io.Serial; |
||||
|
||||
/** |
||||
* 镀层物料添加量申报明细-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class PlateGoodsApplyDetailVo extends PlateGoodsApplyDetail { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
} |
||||
@ -1,31 +0,0 @@ |
||||
package org.springblade.desk.order.pojo.vo; |
||||
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize; |
||||
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; |
||||
import lombok.Data; |
||||
import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail; |
||||
|
||||
import java.io.Serial; |
||||
|
||||
/** |
||||
* 镀层物料需求申报明细-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class PlateGoodsRecordDetailVo extends PlateGoodsRecordDetail { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
|
||||
} |
||||
@ -0,0 +1,94 @@ |
||||
package org.springblade.desk.order.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.Parameters; |
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import jakarta.validation.Valid; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.desk.order.pojo.entity.MoldApply; |
||||
import org.springblade.desk.order.pojo.vo.MoldApplyVo; |
||||
import org.springblade.desk.order.service.IMoldApplyService; |
||||
import org.springblade.desk.order.wrapper.MoldApplyWrapper; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 应用管理控制器 - 烧结模具计划 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("/order/moldApply") |
||||
@Tag(name = "烧结模具计划-申报", description = "接口") |
||||
public class MoldApplyController extends BladeController { |
||||
|
||||
private final IMoldApplyService moldApplyService; |
||||
|
||||
/** |
||||
* 分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@Parameters({ |
||||
@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), |
||||
@Parameter(name = "toolCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) |
||||
}) |
||||
@Operation(summary = "分页-所有需求", description = "") |
||||
public R<IPage<MoldApplyVo>> page(@Parameter(hidden = true) MoldApply entity, Query query) { |
||||
IPage<MoldApply> page = moldApplyService.selectPage(Condition.getPage(query), entity); |
||||
return R.data(MoldApplyWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 分页-近一月的申报记录 |
||||
*/ |
||||
@Parameters({ |
||||
@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), |
||||
@Parameter(name = "toolCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) |
||||
}) |
||||
@GetMapping("/pageNearlyMonth") |
||||
@Operation(summary = "分页-近一月的模具计划", description = "") |
||||
public R<IPage<MoldApplyVo>> pageNearlyMonth(@Parameter(hidden = true) MoldApply entity, Query query) { |
||||
IPage<MoldApply> page = moldApplyService.pageNearlyMonth(Condition.getPage(query), entity); |
||||
return R.data(MoldApplyWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@Operation(summary = "详情", description = "") |
||||
public R<MoldApply> detail(String id) { |
||||
MoldApply detail = moldApplyService.getById(id); |
||||
return R.data(detail); |
||||
} |
||||
|
||||
/** |
||||
* 新增-根据需求新增 |
||||
*/ |
||||
@PostMapping("/saveByDemand") |
||||
@Operation(summary = "新增-根据需求新增", description = "") |
||||
public R save(@Valid @RequestBody MoldApply moldApply) { |
||||
moldApplyService.save(moldApply); |
||||
return R.status(true); |
||||
} |
||||
|
||||
/** |
||||
* 新增-批量 |
||||
*/ |
||||
@PostMapping("/saveBatch") |
||||
@Operation(summary = "新增-批量", description = "") |
||||
public R save(@Valid @RequestBody List<MoldApply> applylist) { |
||||
moldApplyService.save(applylist); |
||||
return R.status(true); |
||||
} |
||||
} |
||||
@ -0,0 +1,76 @@ |
||||
package org.springblade.desk.order.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.Parameters; |
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemand; |
||||
import org.springblade.desk.order.pojo.enums.MoldDemandEnum; |
||||
import org.springblade.desk.order.pojo.vo.MoldDemandVo; |
||||
import org.springblade.desk.order.service.IMoldDemandDetailService; |
||||
import org.springblade.desk.order.service.IMoldDemandService; |
||||
import org.springblade.desk.order.wrapper.MoldDemandWrapper; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
/** |
||||
* 应用管理控制器 - 烧结模具计划-需求申报 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("/order/moldDemand") |
||||
@Tag(name = "烧结模具计划-需求", description = "接口") |
||||
public class MoldDemandController extends BladeController { |
||||
private final IMoldDemandService moldDemandService; |
||||
private final IMoldDemandDetailService moldDemandDetailService; |
||||
|
||||
/** |
||||
* 分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@Parameters({ |
||||
@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), |
||||
@Parameter(name = "toolCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) |
||||
}) |
||||
@Operation(summary = "分页-所有需求", description = "") |
||||
public R<IPage<MoldDemandVo>> page(@Parameter(hidden = true) MoldDemand entity, Query query) { |
||||
IPage<MoldDemand> page = moldDemandService.selectPage(Condition.getPage(query), entity); |
||||
return R.data(MoldDemandWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@Operation(summary = "详情", description = "") |
||||
public R<MoldDemandVo> detail(String id) { |
||||
MoldDemand detail = moldDemandService.getById(id); |
||||
|
||||
MoldDemandVo vo = MoldDemandWrapper.build().entityVO(detail); |
||||
vo.setLinkOrderList(null); |
||||
vo.setToolUseList(null); |
||||
vo.setNearlyApplyList(null); |
||||
|
||||
return R.data(vo); |
||||
} |
||||
|
||||
/** |
||||
* 批量关闭 |
||||
*/ |
||||
@PostMapping("/closeBatch") |
||||
@Operation(summary = "批量关闭", description = "传入ids") |
||||
public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
||||
Boolean result = moldDemandService.changeStatus(Func.toLongList(ids), MoldDemandEnum.STATUS_CLOSE.getCode()); |
||||
return R.status(result); |
||||
} |
||||
} |
||||
@ -1,135 +0,0 @@ |
||||
package org.springblade.desk.order.controller; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import io.swagger.v3.oas.annotations.Operation; |
||||
import io.swagger.v3.oas.annotations.Parameter; |
||||
import io.swagger.v3.oas.annotations.Parameters; |
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn; |
||||
import io.swagger.v3.oas.annotations.media.Schema; |
||||
import io.swagger.v3.oas.annotations.tags.Tag; |
||||
import jakarta.validation.Valid; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.boot.ctrl.BladeController; |
||||
import org.springblade.core.mp.support.Condition; |
||||
import org.springblade.core.mp.support.Query; |
||||
import org.springblade.core.tool.api.R; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlan; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
import org.springblade.desk.order.pojo.enums.MoldPlanEnum; |
||||
import org.springblade.desk.order.pojo.request.MoldPlanSave; |
||||
import org.springblade.desk.order.pojo.vo.MoldPlanVo; |
||||
import org.springblade.desk.order.service.IMoldPlanOrderService; |
||||
import org.springblade.desk.order.service.IMoldPlanService; |
||||
import org.springblade.desk.order.wrapper.MoldPlanWrapper; |
||||
import org.springframework.web.bind.annotation.*; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 应用管理控制器 - 烧结模具计划 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@RestController |
||||
@RequiredArgsConstructor |
||||
@RequestMapping("/order/moldPlan") |
||||
@Tag(name = "烧结模具计划", description = "接口") |
||||
public class MoldPlanController extends BladeController { |
||||
|
||||
private final IMoldPlanService moldPlanService; |
||||
private final IMoldPlanOrderService moldPlanOrderService; |
||||
|
||||
/** |
||||
* 分页 |
||||
*/ |
||||
@GetMapping("/page") |
||||
@Parameters({ |
||||
@Parameter(name = "moCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), |
||||
@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) |
||||
}) |
||||
@Operation(summary = "分页-所有需求", description = "") |
||||
public R<IPage<MoldPlanVo>> page(@Parameter(hidden = true) MoldPlan entity, Query query) { |
||||
IPage<MoldPlan> page = moldPlanService.selectPage(Condition.getPage(query), entity); |
||||
return R.data(MoldPlanWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 分页 |
||||
*/ |
||||
@GetMapping("/pageApply") |
||||
@Parameters({ |
||||
@Parameter(name = "moCode", description = "工装号", in = ParameterIn.QUERY, schema = @Schema(type = "string")), |
||||
@Parameter(name = "partCode", description = "零件号", in = ParameterIn.QUERY, schema = @Schema(type = "string")) |
||||
}) |
||||
@Operation(summary = "分页-申报记录", description = "") |
||||
public R<IPage<MoldPlanVo>> pageApply(@Parameter(hidden = true) MoldPlan entity, Query query) { |
||||
IPage<MoldPlan> page = moldPlanService.selectPageApply(Condition.getPage(query), entity); |
||||
return R.data(MoldPlanWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 分页-近一月的模具计划 |
||||
*/ |
||||
@GetMapping("/pageNearlyMonth") |
||||
@Operation(summary = "分页-近一月的模具计划", description = "") |
||||
public R<IPage<MoldPlanVo>> pageNearlyMonth(@Parameter(hidden = true) MoldPlan entity, Query query) { |
||||
IPage<MoldPlan> page = moldPlanService.pageNearlyMonth(Condition.getPage(query), entity); |
||||
return R.data(MoldPlanWrapper.build().pageVO(page)); |
||||
} |
||||
|
||||
/** |
||||
* 详情 |
||||
*/ |
||||
@GetMapping("/detail") |
||||
@Operation(summary = "详情", description = "") |
||||
public R<MoldPlan> detail(String id) { |
||||
MoldPlan detail = moldPlanService.getById(id); |
||||
return R.data(detail); |
||||
} |
||||
|
||||
/** |
||||
* 新增 |
||||
*/ |
||||
@PostMapping("/save") |
||||
@Operation(summary = "新增", description = "") |
||||
public R save(@Valid @RequestBody List<MoldPlan> planList) { |
||||
moldPlanService.save(planList); |
||||
return R.status(true); |
||||
} |
||||
|
||||
/** |
||||
* 修改 |
||||
*/ |
||||
@PostMapping("/update") |
||||
@Operation(summary = "修改", description = "") |
||||
public R update(@Valid @RequestBody MoldPlanSave saveData) { |
||||
MoldPlan entity = saveData.getMoldPlan(); |
||||
List<MoldPlanOrder> orderList = saveData.getOrderList(); |
||||
List<MoldPlanTool> toolList = saveData.getToolList(); |
||||
moldPlanService.update(entity, orderList, toolList); |
||||
return R.status(true); |
||||
} |
||||
|
||||
/** |
||||
* 删除 |
||||
*/ |
||||
@PostMapping("/remove") |
||||
@Operation(summary = "逻辑删除", description = "传入ids") |
||||
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
||||
Boolean result = moldPlanService.deleteLogic(Func.toLongList(ids)); |
||||
return R.status(result); |
||||
|
||||
} |
||||
|
||||
/** |
||||
* 批量关闭 |
||||
*/ |
||||
@PostMapping("/closeBatch") |
||||
@Operation(summary = "批量关闭", description = "传入ids") |
||||
public R closeBatch(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { |
||||
Boolean result = moldPlanService.changeStatus(Func.toLongList(ids), MoldPlanEnum.STATUS_CLOSE.getCode()); |
||||
return R.status(result); |
||||
} |
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper |
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.springblade.desk.order.mapper.MoldApplyMapper"> |
||||
<!-- 定义基础公共字段 --> |
||||
<sql id = "baseCommonFields"> |
||||
ID, TENANT_ID, CREATE_USER, CREATE_TIME, CREATE_DEPT, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, |
||||
PART_CODE, PART_NAME, TOOL_CODE, TOOL_NAME, APPLY_NUM, PLAN_TYPE_CODE, PLAN_TYPE_NAME, NEED_DATE, |
||||
QUA_LEVEL, MAF_TYPE, KEEPER, RELEASER, MEMO |
||||
</sql> |
||||
|
||||
<select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldApply"> |
||||
SELECT <include refid = "baseCommonFields" /> |
||||
FROM MES_MOLD_APPLY |
||||
WHERE IS_DELETED = 0 |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
<if test = "entity.toolCode != null and entity.toolCode != ''"> |
||||
AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) |
||||
</if> |
||||
</select> |
||||
|
||||
<select id = "pageNearlyMonth" resultType = "org.springblade.desk.order.pojo.entity.MoldApply"> |
||||
SELECT <include refid = "baseCommonFields" /> |
||||
FROM MES_MOLD_APPLY |
||||
WHERE IS_DELETED = 0 and create_time >= ADD_MONTHS(SYSDATE, -1) |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
<if test = "entity.toolCode != null and entity.toolCode != ''"> |
||||
AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) |
||||
</if> |
||||
</select> |
||||
</mapper> |
||||
@ -0,0 +1,34 @@ |
||||
package org.springblade.desk.order.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemand; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author lqk |
||||
* @description 针对表【MES_MOLD_PLAN(烧结模具计划)】的数据库操作Mapper |
||||
* @createDate 2025-11-24 11:41:58 |
||||
* @Entity org.springblade.desk.order.pojo.entity.MoldDemand |
||||
*/ |
||||
public interface MoldDemandMapper extends BaseMapper<MoldDemand> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
List<MoldDemand> selectPage(IPage page, MoldDemand entity); |
||||
|
||||
/** |
||||
* 自定义分页 - 近一月的模具计划 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
List<MoldDemand> pageNearlyMonth(IPage page, MoldDemand entity); |
||||
} |
||||
@ -0,0 +1,35 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace = "org.springblade.desk.order.mapper.MoldDemandMapper"> |
||||
<!-- 定义基础公共字段 --> |
||||
<sql id = "baseCommonFields"> |
||||
ID, TENANT_ID, CREATE_USER, CREATE_TIME, CREATE_DEPT, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, |
||||
MD_CODE, PART_CODE, PART_NAME, TOOL_CODE, TOOL_NAME, DEMAND_NUM, PLAN_TYPE_CODE, PLAN_TYPE_NAME, |
||||
NEED_DATE, QUA_LEVEL, MAF_TYPE, KEEPER, RELEASER, MEMO, STOCK_NUM, OCCUPY_NUM, |
||||
LINK_ORDER_IDS, MO_CODE, MO_NAME, QUANTITY, YP_ID, ERP_ID, ERP_WO_CODE, MAF_STATUS, URGENT_TYPE |
||||
</sql> |
||||
|
||||
<select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldDemand"> |
||||
SELECT <include refid = "baseCommonFields" /> |
||||
FROM MES_MOLD_DEMAND |
||||
WHERE IS_DELETED = 0 |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
<if test = "entity.toolCode != null and entity.toolCode != ''"> |
||||
AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) |
||||
</if> |
||||
</select> |
||||
|
||||
<select id = "pageNearlyMonth" resultType = "org.springblade.desk.order.pojo.entity.MoldDemand"> |
||||
SELECT <include refid = "baseCommonFields" /> |
||||
FROM MES_MOLD_DEMAND |
||||
WHERE IS_DELETED = 0 and create_time >= ADD_MONTHS(SYSDATE, -1) |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
<if test = "entity.toolCode != null and entity.toolCode != ''"> |
||||
AND TOOL_CODE LIKE CONCAT('%', CONCAT(#{entity.toolCode}, '%')) |
||||
</if> |
||||
</select> |
||||
</mapper> |
||||
@ -1,38 +0,0 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper |
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.springblade.desk.order.mapper.MoldPlanMapper"> |
||||
<select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldPlan"> |
||||
SELECT ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, |
||||
MO_CODE, MO_NAME, QUANTITY, ERP_ID, YP_ID, ERP_WO_CODE, MAF_STATUS, NEED_DATE, KEEPER, RELEASER, QUA_LEVEL, |
||||
PART_CODE, PART_NAME, MEMO, MAF_TYPE, URGENT_TYPE, PLAN_TYPE_CODE, "SOURCE", PLAN_TYPE_NAME, STOCK_NUM, |
||||
OCCUPY_NUM, LINK_ORDER_IDS |
||||
FROM MES_MOLD_PLAN |
||||
WHERE IS_DELETED = 0 |
||||
<if test = "entity.source != null and entity.source != ''"> |
||||
AND SOURCE = #{entity.source} |
||||
</if> |
||||
<if test = "entity.moCode != null and entity.moCode != ''"> |
||||
AND MO_CODE LIKE CONCAT('%', CONCAT(#{entity.moCode}, '%')) |
||||
</if> |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
</select> |
||||
|
||||
<select id = "pageNearlyMonth" resultType = "org.springblade.desk.order.pojo.entity.MoldPlan"> |
||||
SELECT ID, TENANT_ID, CREATE_USER, CREATE_DEPT, CREATE_TIME, UPDATE_USER, UPDATE_TIME, STATUS, IS_DELETED, |
||||
MO_CODE, MO_NAME, QUANTITY, ERP_ID, YP_ID, ERP_WO_CODE, MAF_STATUS, NEED_DATE, KEEPER, RELEASER, QUA_LEVEL, |
||||
PART_CODE, PART_NAME, MEMO, MAF_TYPE, URGENT_TYPE, PLAN_TYPE_CODE, "SOURCE", PLAN_TYPE_NAME, STOCK_NUM, |
||||
OCCUPY_NUM, LINK_ORDER_IDS |
||||
FROM MES_MOLD_PLAN |
||||
WHERE IS_DELETED = 0 and create_time >= ADD_MONTHS(SYSDATE, -1) |
||||
<if test = "entity.moCode != null and entity.moCode != ''"> |
||||
AND MO_CODE LIKE CONCAT('%', CONCAT(#{entity.moCode}, '%')) |
||||
</if> |
||||
<if test = "entity.partCode != null and entity.partCode != ''"> |
||||
AND PART_CODE LIKE CONCAT('%', CONCAT(#{entity.partCode}, '%')) |
||||
</if> |
||||
</select> |
||||
</mapper> |
||||
@ -1,9 +0,0 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper |
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.springblade.desk.order.mapper.MoldPlanOrderMapper"> |
||||
<select id = "selectPage" resultType = "org.springblade.desk.order.pojo.entity.MoldPlanOrder"> |
||||
|
||||
</select> |
||||
</mapper> |
||||
@ -1,25 +0,0 @@ |
||||
package org.springblade.desk.order.mapper; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* @author lqk |
||||
* @description 针对表【MES_MOLD_PLAN_TOOL(烧结模具计划-工装关联表)】的数据库操作Mapper |
||||
* @createDate 2025-11-24 11:41:58 |
||||
* @Entity org.springblade.desk.order.entity.MoldPlanTool |
||||
*/ |
||||
public interface MoldPlanToolMapper extends BaseMapper<MoldPlanTool> { |
||||
|
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
List<MoldPlanTool> selectPage(IPage page, MoldPlanTool entity); |
||||
} |
||||
@ -0,0 +1,41 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldApply; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldApplyService extends BaseService<MoldApply> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldApply> selectPage(IPage<MoldApply> page, MoldApply entity); |
||||
|
||||
|
||||
/** |
||||
* 自定义分页 - 近一月的模具计划 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldApply> pageNearlyMonth(IPage<MoldApply> page, MoldApply entity); |
||||
|
||||
/** |
||||
* 保存 |
||||
* |
||||
* @param applyList |
||||
* @return |
||||
*/ |
||||
boolean save(List<MoldApply> applyList); |
||||
} |
||||
@ -0,0 +1,21 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemandDetail; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldDemandDetailService extends BaseService<MoldDemandDetail> { |
||||
/** |
||||
* 根据需求id查询明细列表 |
||||
* |
||||
* @param demandId |
||||
* @return |
||||
*/ |
||||
List<MoldDemandDetail> listByDemandId(Long demandId); |
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemand; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldDemandService extends BaseService<MoldDemand> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldDemand> selectPage(IPage<MoldDemand> page, MoldDemand entity); |
||||
|
||||
|
||||
/** |
||||
* 保存 |
||||
* |
||||
* @param planList |
||||
* @return |
||||
*/ |
||||
boolean save(List<MoldDemand> planList); |
||||
} |
||||
@ -1,21 +0,0 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldPlanOrderService extends BaseService<MoldPlanOrder> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldPlanOrder> selectPage(IPage<MoldPlanOrder> page, MoldPlanOrder entity); |
||||
} |
||||
@ -1,71 +0,0 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlan; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldPlanService extends BaseService<MoldPlan> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldPlan> selectPage(IPage<MoldPlan> page, MoldPlan entity); |
||||
|
||||
/** |
||||
* 自定义分页 - 人工申报的 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldPlan> selectPageApply(IPage<MoldPlan> page, MoldPlan entity); |
||||
|
||||
/** |
||||
* 自定义分页 - 近一月的模具计划 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldPlan> pageNearlyMonth(IPage<MoldPlan> page, MoldPlan entity); |
||||
|
||||
/** |
||||
* 保存 |
||||
* |
||||
* @param planList |
||||
* @return |
||||
*/ |
||||
boolean save(List<MoldPlan> planList); |
||||
|
||||
/** |
||||
* 保存 |
||||
* |
||||
* @param entity |
||||
* @param orderList |
||||
* @param toolList |
||||
* @return |
||||
*/ |
||||
boolean save(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList); |
||||
|
||||
/** |
||||
* 修改 |
||||
* |
||||
* @param entity |
||||
* @param orderList |
||||
* @param toolList |
||||
* @return |
||||
*/ |
||||
boolean update(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList); |
||||
} |
||||
@ -1,21 +0,0 @@ |
||||
package org.springblade.desk.order.service; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseService; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
public interface IMoldPlanToolService extends BaseService<MoldPlanTool> { |
||||
/** |
||||
* 自定义分页 |
||||
* |
||||
* @param page |
||||
* @param entity |
||||
* @return |
||||
*/ |
||||
IPage<MoldPlanTool> selectPage(IPage<MoldPlanTool> page, MoldPlanTool entity); |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.order.mapper.MoldApplyMapper; |
||||
import org.springblade.desk.order.pojo.entity.MoldApply; |
||||
import org.springblade.desk.order.service.IMoldApplyService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class MoldApplyServiceImpl extends BaseServiceImpl<MoldApplyMapper, MoldApply> implements IMoldApplyService { |
||||
|
||||
@Override |
||||
public IPage<MoldApply> selectPage(IPage<MoldApply> page, MoldApply entity) { |
||||
List<MoldApply> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public IPage<MoldApply> pageNearlyMonth(IPage<MoldApply> page, MoldApply entity) { |
||||
List<MoldApply> dataList = baseMapper.pageNearlyMonth(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public boolean save(List<MoldApply> applyList) { |
||||
return false; |
||||
} |
||||
} |
||||
@ -0,0 +1,28 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.order.mapper.MoldDemandDetailMapper; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemandDetail; |
||||
import org.springblade.desk.order.service.IMoldDemandDetailService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@Service |
||||
public class MoldDemandDetailServiceImpl extends BaseServiceImpl<MoldDemandDetailMapper, MoldDemandDetail> implements IMoldDemandDetailService { |
||||
|
||||
@Override |
||||
public List<MoldDemandDetail> listByDemandId(Long demandId) { |
||||
LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MoldDemandDetail.class) |
||||
.eq(MoldDemandDetail::getMdId, demandId); |
||||
List<MoldDemandDetail> dataList = baseMapper.selectList(wrapper); |
||||
return dataList; |
||||
} |
||||
} |
||||
@ -0,0 +1,50 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; |
||||
import org.springblade.desk.dashboard.service.IDsPartService; |
||||
import org.springblade.desk.order.mapper.MoldDemandMapper; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemand; |
||||
import org.springblade.desk.order.pojo.enums.MoldDemandEnum; |
||||
import org.springblade.desk.order.service.IMoldDemandService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class MoldDemandServiceImpl extends BaseServiceImpl<MoldDemandMapper, MoldDemand> implements IMoldDemandService { |
||||
|
||||
private final IDsPartService dsPartService; |
||||
|
||||
@Override |
||||
public IPage<MoldDemand> selectPage(IPage<MoldDemand> page, MoldDemand entity) { |
||||
List<MoldDemand> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public boolean save(List<MoldDemand> planList) { |
||||
for (MoldDemand moldDemand : planList) { |
||||
moldDemand.setStatus(MoldDemandEnum.MAF_STATUS_CREATE.getCode()); |
||||
// 工装
|
||||
DsPartEntity dsPart = dsPartService.selectDsPartByPatCode(moldDemand.getPartCode()); |
||||
if (dsPart != null && "压饼模".equals(dsPart.getPartName())) { |
||||
moldDemand.setPlanTypeCode(MoldDemandEnum.PLAN_TYPE_CODE_Z.getName()); |
||||
moldDemand.setPlanTypeName(MoldDemandEnum.PLAN_TYPE_CODE_D.getName()); |
||||
} else if (dsPart != null && "石墨模".equals(dsPart.getPartName())) { |
||||
moldDemand.setPlanTypeCode(MoldDemandEnum.PLAN_TYPE_CODE_Z.getName()); |
||||
moldDemand.setPlanTypeName(MoldDemandEnum.PLAN_TYPE_NAME_D.getName()); |
||||
} |
||||
} |
||||
return this.saveBatch(planList); |
||||
} |
||||
|
||||
} |
||||
@ -1,25 +0,0 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.mapper.MoldPlanOrderMapper; |
||||
import org.springblade.desk.order.service.IMoldPlanOrderService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@Service |
||||
public class MoldPlanOrderServiceImpl extends BaseServiceImpl<MoldPlanOrderMapper, MoldPlanOrder> implements IMoldPlanOrderService { |
||||
|
||||
@Override |
||||
public IPage<MoldPlanOrder> selectPage(IPage<MoldPlanOrder> page, MoldPlanOrder entity) { |
||||
List<MoldPlanOrder> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
} |
||||
@ -1,101 +0,0 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import lombok.RequiredArgsConstructor; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; |
||||
import org.springblade.desk.dashboard.service.IDsPartService; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlan; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
import org.springblade.desk.order.mapper.MoldPlanMapper; |
||||
import org.springblade.desk.order.pojo.enums.MoldPlanEnum; |
||||
import org.springblade.desk.order.service.IMoldPlanOrderService; |
||||
import org.springblade.desk.order.service.IMoldPlanService; |
||||
import org.springblade.desk.order.service.IMoldPlanToolService; |
||||
import org.springframework.stereotype.Service; |
||||
import org.springframework.transaction.annotation.Transactional; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@RequiredArgsConstructor |
||||
@Service |
||||
public class MoldPlanServiceImpl extends BaseServiceImpl<MoldPlanMapper, MoldPlan> implements IMoldPlanService { |
||||
|
||||
private final IMoldPlanOrderService orderService; |
||||
|
||||
private final IMoldPlanToolService toolService; |
||||
|
||||
private final IDsPartService dsPartService; |
||||
|
||||
@Override |
||||
public IPage<MoldPlan> selectPage(IPage<MoldPlan> page, MoldPlan entity) { |
||||
List<MoldPlan> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public IPage<MoldPlan> selectPageApply(IPage<MoldPlan> page, MoldPlan entity) { |
||||
entity.setSource(MoldPlanEnum.SOURCE_USER.getCode()); |
||||
List<MoldPlan> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public IPage<MoldPlan> pageNearlyMonth(IPage<MoldPlan> page, MoldPlan entity) { |
||||
List<MoldPlan> dataList = baseMapper.pageNearlyMonth(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
|
||||
@Override |
||||
public boolean save(List<MoldPlan> planList) { |
||||
for (MoldPlan moldPlan : planList) { |
||||
moldPlan.setStatus(MoldPlanEnum.MAF_STATUS_CREATE.getCode()); |
||||
moldPlan.setSource(MoldPlanEnum.SOURCE_USER.getCode()); |
||||
// 工装
|
||||
DsPartEntity dsPart = dsPartService.selectDsPartByPatCode(moldPlan.getPartCode()); |
||||
if (dsPart != null && "压饼模".equals(dsPart.getPartName())) { |
||||
moldPlan.setPlanTypeCode(MoldPlanEnum.PLAN_TYPE_CODE_Z.getName()); |
||||
moldPlan.setPlanTypeName(MoldPlanEnum.PLAN_TYPE_CODE_D.getName()); |
||||
} else if (dsPart != null && "石墨模".equals(dsPart.getPartName())) { |
||||
moldPlan.setPlanTypeCode(MoldPlanEnum.PLAN_TYPE_CODE_Z.getName()); |
||||
moldPlan.setPlanTypeName(MoldPlanEnum.PLAN_TYPE_NAME_D.getName()); |
||||
} |
||||
} |
||||
return this.saveBatch(planList); |
||||
} |
||||
|
||||
@Transactional(rollbackFor = Exception.class) |
||||
@Override |
||||
public boolean save(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList) { |
||||
if (this.save(entity)) { |
||||
for (MoldPlanOrder moldPlanOrder : orderList) { |
||||
moldPlanOrder.setMpId(entity.getId()); |
||||
} |
||||
orderService.saveBatch(orderList); |
||||
|
||||
for (MoldPlanTool moldPlanTool : toolList) { |
||||
moldPlanTool.setMpId(entity.getId()); |
||||
} |
||||
toolService.saveBatch(toolList); |
||||
return true; |
||||
} |
||||
return false; |
||||
} |
||||
|
||||
@Transactional(rollbackFor = Exception.class) |
||||
@Override |
||||
public boolean update(MoldPlan entity, List<MoldPlanOrder> orderList, List<MoldPlanTool> toolList) { |
||||
if (this.save(entity)) { |
||||
orderService.saveBatch(orderList); |
||||
toolService.saveBatch(toolList); |
||||
return true; |
||||
} |
||||
return false; |
||||
} |
||||
} |
||||
@ -1,25 +0,0 @@ |
||||
package org.springblade.desk.order.service.impl; |
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import org.springblade.core.mp.base.BaseServiceImpl; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
import org.springblade.desk.order.mapper.MoldPlanToolMapper; |
||||
import org.springblade.desk.order.service.IMoldPlanToolService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 服务实现类 |
||||
* |
||||
* @author BladeX |
||||
*/ |
||||
@Service |
||||
public class MoldPlanToolServiceImpl extends BaseServiceImpl<MoldPlanToolMapper, MoldPlanTool> implements IMoldPlanToolService { |
||||
|
||||
@Override |
||||
public IPage<MoldPlanTool> selectPage(IPage<MoldPlanTool> page, MoldPlanTool entity) { |
||||
List<MoldPlanTool> dataList = baseMapper.selectPage(page, entity); |
||||
return page.setRecords(dataList); |
||||
} |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.order.pojo.entity.AssayContentDetail; |
||||
import org.springblade.desk.order.pojo.vo.AssayContentDetailVo; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class AssayContentDetailWrapper extends BaseEntityWrapper<AssayContentDetail, AssayContentDetailVo> { |
||||
|
||||
public static AssayContentDetailWrapper build() { |
||||
return new AssayContentDetailWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public AssayContentDetailVo entityVO(AssayContentDetail entity) { |
||||
AssayContentDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, AssayContentDetailVo.class)); |
||||
// vo.setStatusName(AssayContentDetailEnum.getName(entity.getStatus()));
|
||||
return vo; |
||||
} |
||||
} |
||||
@ -0,0 +1,38 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.order.pojo.entity.MoldApply; |
||||
import org.springblade.desk.order.pojo.enums.MoldApplyEnum; |
||||
import org.springblade.desk.order.pojo.vo.MoldApplyVo; |
||||
import org.springblade.system.cache.UserCache; |
||||
import org.springblade.system.pojo.entity.User; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class MoldApplyWrapper extends BaseEntityWrapper<MoldApply, MoldApplyVo> { |
||||
|
||||
public static MoldApplyWrapper build() { |
||||
return new MoldApplyWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public MoldApplyVo entityVO(MoldApply entity) { |
||||
MoldApplyVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldApplyVo.class)); |
||||
|
||||
User user = UserCache.getUser(entity.getCreateUser()); |
||||
if (Func.isNotEmpty(user)) { |
||||
vo.setCreateUserName(user.getAccount()); |
||||
} |
||||
|
||||
vo.setStatusName(MoldApplyEnum.getName(entity.getStatus())); |
||||
vo.setMafTypeName(MoldApplyEnum.getName(entity.getMafType())); |
||||
return vo; |
||||
} |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.order.pojo.entity.MoldDemand; |
||||
import org.springblade.desk.order.pojo.enums.MoldDemandEnum; |
||||
import org.springblade.desk.order.pojo.vo.MoldDemandVo; |
||||
import org.springblade.system.cache.UserCache; |
||||
import org.springblade.system.pojo.entity.User; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class MoldDemandWrapper extends BaseEntityWrapper<MoldDemand, MoldDemandVo> { |
||||
|
||||
public static MoldDemandWrapper build() { |
||||
return new MoldDemandWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public MoldDemandVo entityVO(MoldDemand entity) { |
||||
MoldDemandVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldDemandVo.class)); |
||||
|
||||
User user = UserCache.getUser(entity.getCreateUser()); |
||||
if (Func.isNotEmpty(user)) { |
||||
vo.setCreateUserName(user.getAccount()); |
||||
} |
||||
|
||||
vo.setStatusName(MoldDemandEnum.getName(entity.getStatus())); |
||||
vo.setMafStatusName(MoldDemandEnum.getName(entity.getMafStatus())); |
||||
vo.setMafTypeName(MoldDemandEnum.getName(entity.getMafType())); |
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanOrder; |
||||
import org.springblade.desk.order.pojo.vo.MoldPlanOrderVo; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class MoldPlanOrderWrapper extends BaseEntityWrapper<MoldPlanOrder, MoldPlanOrderVo> { |
||||
|
||||
public static MoldPlanOrderWrapper build() { |
||||
return new MoldPlanOrderWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public MoldPlanOrderVo entityVO(MoldPlanOrder entity) { |
||||
MoldPlanOrderVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanOrderVo.class)); |
||||
// vo.setStatusName(MoldPlanOrderEnum.getName(entity.getStatus()));
|
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlanTool; |
||||
import org.springblade.desk.order.pojo.vo.MoldPlanToolVo; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class MoldPlanToolWrapper extends BaseEntityWrapper<MoldPlanTool, MoldPlanToolVo> { |
||||
|
||||
public static MoldPlanToolWrapper build() { |
||||
return new MoldPlanToolWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public MoldPlanToolVo entityVO(MoldPlanTool entity) { |
||||
MoldPlanToolVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanToolVo.class)); |
||||
// vo.setStatusName(MoldPlanToolEnum.getName(entity.getStatus()));
|
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,39 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.core.tool.utils.Func; |
||||
import org.springblade.desk.order.pojo.entity.MoldPlan; |
||||
import org.springblade.desk.order.pojo.enums.MoldPlanEnum; |
||||
import org.springblade.desk.order.pojo.vo.MoldPlanVo; |
||||
import org.springblade.system.cache.UserCache; |
||||
import org.springblade.system.pojo.entity.User; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class MoldPlanWrapper extends BaseEntityWrapper<MoldPlan, MoldPlanVo> { |
||||
|
||||
public static MoldPlanWrapper build() { |
||||
return new MoldPlanWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public MoldPlanVo entityVO(MoldPlan entity) { |
||||
MoldPlanVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, MoldPlanVo.class)); |
||||
|
||||
User user = UserCache.getUser(entity.getCreateUser()); |
||||
if (Func.isNotEmpty(user)) { |
||||
vo.setCreateUserName(user.getAccount()); |
||||
} |
||||
|
||||
vo.setStatusName(MoldPlanEnum.getName(entity.getStatus())); |
||||
vo.setMafStatusName(MoldPlanEnum.getName(entity.getMafStatus())); |
||||
vo.setMafTypeName(MoldPlanEnum.getName(entity.getMafType())); |
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.order.pojo.entity.PlateGoodsApplyDetail; |
||||
import org.springblade.desk.order.pojo.vo.PlateGoodsApplyDetailVo; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class PlateGoodsApplyDetailWrapper extends BaseEntityWrapper<PlateGoodsApplyDetail, PlateGoodsApplyDetailVo> { |
||||
|
||||
public static PlateGoodsApplyDetailWrapper build() { |
||||
return new PlateGoodsApplyDetailWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public PlateGoodsApplyDetailVo entityVO(PlateGoodsApplyDetail entity) { |
||||
PlateGoodsApplyDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsApplyDetailVo.class)); |
||||
// vo.setStatusName(PlateGoodsApplyDetailEnum.getName(entity.getStatus()));
|
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,27 +0,0 @@ |
||||
package org.springblade.desk.order.wrapper; |
||||
|
||||
import org.springblade.core.mp.support.BaseEntityWrapper; |
||||
import org.springblade.core.tool.utils.BeanUtil; |
||||
import org.springblade.desk.order.pojo.entity.PlateGoodsRecordDetail; |
||||
import org.springblade.desk.order.pojo.vo.PlateGoodsRecordDetailVo; |
||||
|
||||
import java.util.Objects; |
||||
|
||||
/** |
||||
* 包装类,返回视图层所需的字段 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
public class PlateGoodsRecordDetailWrapper extends BaseEntityWrapper<PlateGoodsRecordDetail, PlateGoodsRecordDetailVo> { |
||||
|
||||
public static PlateGoodsRecordDetailWrapper build() { |
||||
return new PlateGoodsRecordDetailWrapper(); |
||||
} |
||||
|
||||
@Override |
||||
public PlateGoodsRecordDetailVo entityVO(PlateGoodsRecordDetail entity) { |
||||
PlateGoodsRecordDetailVo vo = Objects.requireNonNull(BeanUtil.copyProperties(entity, PlateGoodsRecordDetailVo.class)); |
||||
// vo.setStatusName(PlateGoodsRecordDetailEnum.getName(entity.getStatus()));
|
||||
return vo; |
||||
} |
||||
} |
||||
@ -1,43 +1,237 @@ |
||||
-- 化验明细添加槽号对应名称字段 |
||||
ALTER TABLE MES_ASSAY_CONTENT_DETAIL ADD SLOT_NAME VARCHAR2(100) NULL; |
||||
COMMENT ON COLUMN MES_ASSAY_CONTENT_DETAIL.SLOT_NAME IS '槽名称'; |
||||
ALTER TABLE mes_assay_content_detail |
||||
ADD slot_name VARCHAR2(100) NULL; |
||||
COMMENT ON COLUMN mes_assay_content_detail.slot_name IS '槽名称'; |
||||
|
||||
-- 摸具申报添加字段 |
||||
ALTER TABLE MES_MOLD_PLAN ADD STOCK_NUM NUMBER(8,0) NULL; |
||||
COMMENT ON COLUMN MES_MOLD_PLAN.STOCK_NUM IS '库存量'; |
||||
ALTER TABLE MES_MOLD_PLAN ADD OCCUPY_NUM NUMBER(8,0) NULL; |
||||
COMMENT ON COLUMN MES_MOLD_PLAN.OCCUPY_NUM IS '占用量'; |
||||
ALTER TABLE MES_MOLD_PLAN ADD LINK_ORDER_IDS VARCHAR2(255) NULL; |
||||
COMMENT ON COLUMN MES_MOLD_PLAN.LINK_ORDER_IDS IS 'LINK_ORDER_IDS'; |
||||
ALTER TABLE mes_mold_plan |
||||
ADD stock_num NUMBER(8, 0) NULL; |
||||
COMMENT ON COLUMN mes_mold_plan.stock_num IS '库存量'; |
||||
ALTER TABLE mes_mold_plan |
||||
ADD occupy_num NUMBER(8, 0) NULL; |
||||
COMMENT ON COLUMN mes_mold_plan.occupy_num IS '占用量'; |
||||
ALTER TABLE mes_mold_plan |
||||
ADD link_order_ids VARCHAR2(255) NULL; |
||||
COMMENT ON COLUMN mes_mold_plan.link_order_ids IS 'LINK_ORDER_IDS'; |
||||
|
||||
-- 字段长度修改 |
||||
ALTER TABLE MES_ASSAY_CONTENT MODIFY wc_id NUMBER(20,0); |
||||
ALTER TABLE MES_ASSAY_CONTENT MODIFY assay_man NUMBER(20,0); |
||||
ALTER TABLE MES_ASSAY_CONTENT MODIFY APPLY_ID NUMBER(20,0); |
||||
ALTER TABLE MES_ASSAY_CONTENT MODIFY APPLY_STATUS NUMBER(8,0) DEFAULT 0 ; |
||||
ALTER TABLE MES_ASSAY_CONTENT MODIFY IS_USED NUMBER(8,0); |
||||
ALTER TABLE MES_ASSAY_CONTENT_DETAIL MODIFY AC_ID NUMBER(20,0); |
||||
ALTER TABLE MES_MOLD_PLAN MODIFY ERP_ID NUMBER(20,0); |
||||
ALTER TABLE MES_MOLD_PLAN MODIFY YP_ID NUMBER(20,0); |
||||
ALTER TABLE MES_MOLD_PLAN MODIFY KEEPER NUMBER(20,0); |
||||
ALTER TABLE MES_MOLD_PLAN MODIFY RELEASER NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_APPLY MODIFY BO_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_APPLY MODIFY BR_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_APPLY MODIFY AC_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_APPLY MODIFY PGR_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_APPLY MODIFY WC_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD MODIFY WC_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD MODIFY APPROVAL_STATUS NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD MODIFY GOODS_BO_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD MODIFY COEFFICIENT_BO_ID NUMBER(20,0); |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD_DETAIL MODIFY PGRD_ID NUMBER(20,0); |
||||
|
||||
ALTER TABLE MES_PLATE_GOODS_RECORD ADD INVOLVING_RECORD_CODE VARCHAR2(255) NULL; |
||||
COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.INVOLVING_RECORD_CODE IS '本次添加涉及单号'; |
||||
ALTER TABLE MES_PLATE_GOODS_RECORD ADD DETAIL_ORDER_NUM NUMBER(8,0) NULL; |
||||
COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.DETAIL_ORDER_NUM IS '本次关联订单数量'; |
||||
|
||||
ALTER TABLE MES_ASSAY_CONTENT_DETAIL ADD ADD_VAL NUMBER(20,10) NULL; |
||||
COMMENT ON COLUMN MES_ASSAY_CONTENT_DETAIL.ADD_VAL IS '添加量值'; |
||||
ALTER TABLE mes_assay_content |
||||
MODIFY wc_id NUMBER(20, 0); |
||||
ALTER TABLE mes_assay_content |
||||
MODIFY assay_man NUMBER(20, 0); |
||||
ALTER TABLE mes_assay_content |
||||
MODIFY apply_id NUMBER(20, 0); |
||||
ALTER TABLE mes_assay_content |
||||
MODIFY apply_status NUMBER(8, 0) DEFAULT 0; |
||||
ALTER TABLE mes_assay_content |
||||
MODIFY is_used NUMBER(8, 0); |
||||
ALTER TABLE mes_assay_content_detail |
||||
MODIFY ac_id NUMBER(20, 0); |
||||
ALTER TABLE mes_mold_plan |
||||
MODIFY erp_id NUMBER(20, 0); |
||||
ALTER TABLE mes_mold_plan |
||||
MODIFY yp_id NUMBER(20, 0); |
||||
ALTER TABLE mes_mold_plan |
||||
MODIFY keeper NUMBER(20, 0); |
||||
ALTER TABLE mes_mold_plan |
||||
MODIFY releaser NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_apply |
||||
MODIFY bo_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_apply |
||||
MODIFY br_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_apply |
||||
MODIFY ac_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_apply |
||||
MODIFY pgr_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_apply |
||||
MODIFY wc_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_record |
||||
MODIFY wc_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_record |
||||
MODIFY approval_status NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_record |
||||
MODIFY goods_bo_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_record |
||||
MODIFY coefficient_bo_id NUMBER(20, 0); |
||||
ALTER TABLE mes_plate_goods_record_detail |
||||
MODIFY pgrd_id NUMBER(20, 0); |
||||
|
||||
ALTER TABLE mes_plate_goods_record |
||||
ADD involving_record_code VARCHAR2(255) NULL; |
||||
COMMENT ON COLUMN mes_plate_goods_record.involving_record_code IS '本次添加涉及单号'; |
||||
ALTER TABLE mes_plate_goods_record |
||||
ADD detail_order_num NUMBER(8, 0) NULL; |
||||
COMMENT ON COLUMN mes_plate_goods_record.detail_order_num IS '本次关联订单数量'; |
||||
|
||||
ALTER TABLE mes_assay_content_detail |
||||
ADD add_val NUMBER(20, 10) NULL; |
||||
COMMENT ON COLUMN mes_assay_content_detail.add_val IS '添加量值'; |
||||
|
||||
ALTER TABLE mes_yield_order |
||||
ADD goods_demand DECIMAL(20, 10) NULL; |
||||
COMMENT ON COLUMN mes_yield_order.goods_demand IS '物料需求数量'; |
||||
|
||||
ALTER TABLE mes_yield_order |
||||
ADD tools_demand DATE NULL; |
||||
COMMENT ON COLUMN mes_yield_order.tools_demand IS '工装需求数量'; |
||||
|
||||
CREATE TABLE mes_mold_apply |
||||
( |
||||
id NUMBER(20, 0) NOT NULL ENABLE, |
||||
tenant_id NVARCHAR2(12), |
||||
create_user NUMBER(20, 0), |
||||
create_time DATE, |
||||
create_dept NUMBER(20, 0), |
||||
update_user NUMBER(20, 0), |
||||
update_time DATE, |
||||
status NUMBER(11, 0) NOT NULL ENABLE, |
||||
is_deleted NUMBER(11, 0), |
||||
part_code VARCHAR2(255) NULL, |
||||
part_name VARCHAR2(255) NULL, |
||||
tool_code VARCHAR2(255) NULL, |
||||
tool_name VARCHAR2(255) NULL, |
||||
apply_num DECIMAL(20, 10) NULL, |
||||
plan_type_code VARCHAR2(255) NULL, |
||||
plan_type_name VARCHAR2(255) NULL, |
||||
need_date DATE NULL, |
||||
qua_level VARCHAR2(255) NULL, |
||||
maf_type DECIMAL(10, 0) NULL, |
||||
keeper DECIMAL(20, 0) NULL, |
||||
releaser VARCHAR2(255) NULL, |
||||
memo VARCHAR2(255) NULL |
||||
) TABLESPACE jonhon_mes_data; |
||||
COMMENT ON TABLE mes_mold_apply IS '烧结模具计划-申报'; |
||||
COMMENT ON COLUMN mes_mold_apply.id IS '主键'; |
||||
COMMENT ON COLUMN mes_mold_apply.create_user IS '创建人'; |
||||
COMMENT ON COLUMN mes_mold_apply.create_time IS '创建时间'; |
||||
COMMENT ON COLUMN mes_mold_apply.create_dept IS '创建部门'; |
||||
COMMENT ON COLUMN mes_mold_apply.update_user IS '更新人'; |
||||
COMMENT ON COLUMN mes_mold_apply.update_time IS '更新时间'; |
||||
COMMENT ON COLUMN mes_mold_apply.status IS '状态'; |
||||
COMMENT ON COLUMN mes_mold_apply.is_deleted IS '删除标记'; |
||||
COMMENT ON COLUMN mes_mold_apply.part_code IS '零件编码'; |
||||
COMMENT ON COLUMN mes_mold_apply.part_name IS '零件名称'; |
||||
COMMENT ON COLUMN mes_mold_apply.tool_code IS '工装编码'; |
||||
COMMENT ON COLUMN mes_mold_apply.tool_name IS '工装名称'; |
||||
COMMENT ON COLUMN mes_mold_apply.apply_num IS '申报数量'; |
||||
COMMENT ON COLUMN mes_mold_apply.plan_type_code IS '计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模)'; |
||||
COMMENT ON COLUMN mes_mold_apply.plan_type_name IS '计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模)'; |
||||
COMMENT ON COLUMN mes_mold_apply.need_date IS '需求日期'; |
||||
COMMENT ON COLUMN mes_mold_apply.qua_level IS '生产标识'; |
||||
COMMENT ON COLUMN mes_mold_apply.maf_type IS '类型; 12001、热表，烧结，12002、仓库'; |
||||
COMMENT ON COLUMN mes_mold_apply.keeper IS '保管员'; |
||||
COMMENT ON COLUMN mes_mold_apply.releaser IS '下达人'; |
||||
COMMENT ON COLUMN mes_mold_apply.memo IS '备注'; |
||||
|
||||
|
||||
CREATE TABLE mes_mold_demand |
||||
( |
||||
id NUMBER(20, 0) NOT NULL ENABLE, |
||||
tenant_id NVARCHAR2(12), |
||||
create_user NUMBER(20, 0), |
||||
create_time DATE, |
||||
create_dept NUMBER(20, 0), |
||||
update_user NUMBER(20, 0), |
||||
update_time DATE, |
||||
status NUMBER(11, 0) NOT NULL ENABLE, |
||||
is_deleted NUMBER(11, 0), |
||||
md_code VARCHAR2(255) NULL, |
||||
part_code VARCHAR2(255) NULL, |
||||
part_name VARCHAR2(255) NULL, |
||||
tool_code VARCHAR2(255) NULL, |
||||
tool_name VARCHAR2(255) NULL, |
||||
demand_num DECIMAL(20, 10) NULL, |
||||
plan_type_code VARCHAR2(255) NULL, |
||||
plan_type_name VARCHAR2(255) NULL, |
||||
need_date DATE NULL, |
||||
qua_level VARCHAR2(255) NULL, |
||||
maf_type DECIMAL(10, 0) NULL, |
||||
keeper DECIMAL(20, 0) NULL, |
||||
releaser VARCHAR2(255) NULL, |
||||
memo VARCHAR2(255) NULL, |
||||
"SOURCE" DECIMAL(8, 0) NULL, |
||||
stock_num DECIMAL(20, 10) NULL, |
||||
occupy_num DECIMAL(20, 10) NULL, |
||||
link_order_ids VARCHAR2(255) NULL, |
||||
mo_code VARCHAR2(100) NULL, |
||||
mo_name VARCHAR2(100) NULL, |
||||
quantity DECIMAL(20, 10) NULL, |
||||
yp_id DECIMAL(20, 0) NULL, |
||||
erp_id DECIMAL(20, 0) NULL, |
||||
erp_wo_code VARCHAR2(100) NULL, |
||||
maf_status DECIMAL(8, 0) NULL, |
||||
urgent_type VARCHAR2(100) NULL |
||||
) TABLESPACE jonhon_mes_data; |
||||
COMMENT ON TABLE mes_mold_demand IS '烧结模具计划-需求'; |
||||
COMMENT ON COLUMN mes_mold_demand.id IS '主键'; |
||||
COMMENT ON COLUMN mes_mold_demand.create_user IS '创建人'; |
||||
COMMENT ON COLUMN mes_mold_demand.create_time IS '创建时间'; |
||||
COMMENT ON COLUMN mes_mold_demand.create_dept IS '创建部门'; |
||||
COMMENT ON COLUMN mes_mold_demand.update_user IS '更新人'; |
||||
COMMENT ON COLUMN mes_mold_demand.update_time IS '更新时间'; |
||||
COMMENT ON COLUMN mes_mold_demand.status IS '状态'; |
||||
COMMENT ON COLUMN mes_mold_demand.is_deleted IS '删除标记'; |
||||
COMMENT ON COLUMN mes_mold_demand.md_code IS '需求单号'; |
||||
COMMENT ON COLUMN mes_mold_demand.part_code IS '零件编码'; |
||||
COMMENT ON COLUMN mes_mold_demand.part_name IS '零件名称'; |
||||
COMMENT ON COLUMN mes_mold_demand.tool_code IS '工装编码'; |
||||
COMMENT ON COLUMN mes_mold_demand.tool_name IS '工装名称'; |
||||
COMMENT ON COLUMN mes_mold_demand.demand_num IS '需求数量'; |
||||
COMMENT ON COLUMN mes_mold_demand.plan_type_code IS '计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模)'; |
||||
COMMENT ON COLUMN mes_mold_demand.plan_type_name IS '计划类型; 13001:Z:制造(工装不为空且工装名称为压饼模),13002:D:夹具(工装不为空且工装名称为石墨模)'; |
||||
COMMENT ON COLUMN mes_mold_demand.need_date IS '需求日期'; |
||||
COMMENT ON COLUMN mes_mold_demand.qua_level IS '生产标识'; |
||||
COMMENT ON COLUMN mes_mold_demand.maf_type IS '类型; 12001、热表，烧结，12002、仓库'; |
||||
COMMENT ON COLUMN mes_mold_demand.keeper IS '保管员'; |
||||
COMMENT ON COLUMN mes_mold_demand.releaser IS '下达人'; |
||||
COMMENT ON COLUMN mes_mold_demand.memo IS '备注'; |
||||
COMMENT ON COLUMN mes_mold_demand."SOURCE" IS '计划来源;15001:自动生成，15002：人工添加'; |
||||
COMMENT ON COLUMN mes_mold_demand.stock_num IS '库存量'; |
||||
COMMENT ON COLUMN mes_mold_demand.occupy_num IS '占用量'; |
||||
COMMENT ON COLUMN mes_mold_demand.link_order_ids IS '关联生产订单, 多个订单以'',''分割'; |
||||
COMMENT ON COLUMN mes_mold_demand.mo_code IS '模具编码'; |
||||
COMMENT ON COLUMN mes_mold_demand.mo_name IS '模具名称'; |
||||
COMMENT ON COLUMN mes_mold_demand.quantity IS '数量'; |
||||
COMMENT ON COLUMN mes_mold_demand.yp_id IS '生产计划id'; |
||||
COMMENT ON COLUMN mes_mold_demand.erp_id IS 'erpId'; |
||||
COMMENT ON COLUMN mes_mold_demand.erp_wo_code IS 'erpCode'; |
||||
COMMENT ON COLUMN mes_mold_demand.maf_status IS '状态; 11001、新建，11002:已下发，11003、已完成'; |
||||
COMMENT ON COLUMN mes_mold_demand.urgent_type IS '紧急状态'; |
||||
|
||||
CREATE TABLE mes_mold_demand_detail |
||||
( |
||||
id NUMBER(20, 0) NOT NULL ENABLE, |
||||
tenant_id NVARCHAR2(12), |
||||
create_user NUMBER(20, 0), |
||||
create_time DATE, |
||||
create_dept NUMBER(20, 0), |
||||
update_user NUMBER(20, 0), |
||||
update_time DATE, |
||||
status NUMBER(11, 0) NOT NULL ENABLE, |
||||
is_deleted NUMBER(11, 0), |
||||
md_id NUMBER(20, 0) NULL, |
||||
order_id NUMBER(20, 0) NULL |
||||
) TABLESPACE jonhon_mes_data; |
||||
COMMENT ON TABLE mes_mold_demand_detail IS '烧结模具计划-订单关联表'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.id IS '主键'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.create_user IS '创建人'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.create_time IS '创建时间'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.create_dept IS '创建部门'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.update_user IS '更新人'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.update_time IS '更新时间'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.status IS '状态'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.is_deleted IS '删除标记'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.md_id IS '烧结模具计划需求ID'; |
||||
COMMENT ON COLUMN mes_mold_demand_detail.order_id IS '生产订单id'; |
||||
|
||||
ALTER TABLE mes_yield_plan |
||||
ADD generate_glass_cake SMALLINT DEFAULT 0 NULL; |
||||
COMMENT ON COLUMN mes_yield_plan.generate_glass_cake IS '是否生成玻璃饼订单, 0:否，1：是'; |
||||
|
||||
ALTER TABLE mes_yield_plan |
||||
ADD check_close_time DATE NULL; |
||||
COMMENT ON COLUMN mes_yield_plan.check_close_time IS '验证关闭时间'; |
||||
ALTER TABLE mes_yield_plan |
||||
ADD check_totqty_time DATE NULL; |
||||
COMMENT ON COLUMN mes_yield_plan.check_totqty_time IS '验证完工数时间'; |
||||
|
||||
|
||||
Loading…
Reference in new issue