From b0cb842ad019950c75c40bcb9b3d9e7e7d615461 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Fri, 23 Jan 2026 09:28:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E5=9D=97-=E7=83=A7?= =?UTF-8?q?=E7=BB=93=E6=A8=A1=E5=85=B7=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/order/pojo/entity/MoldApply.java | 107 +++++++ .../entity/{MoldPlan.java => MoldDemand.java} | 100 ++++--- ...ldPlanOrder.java => MoldDemandDetail.java} | 10 +- .../desk/order/pojo/entity/MoldPlanTool.java | 33 --- .../desk/order/pojo/entity/YieldOrder.java | 12 + .../desk/order/pojo/entity/YieldPlan.java | 39 ++- .../{MoldPlanEnum.java => MoldApplyEnum.java} | 12 +- .../desk/order/pojo/enums/MoldDemandEnum.java | 80 ++++++ .../desk/order/pojo/request/MoldPlanSave.java | 32 --- .../order/pojo/vo/AssayContentDetailVo.java | 30 -- .../vo/{MoldPlanVo.java => MoldApplyVo.java} | 14 +- ...oldPlanDetailVo.java => MoldDemandVo.java} | 17 +- .../desk/order/pojo/vo/MoldPlanOrderVo.java | 30 -- .../desk/order/pojo/vo/MoldPlanToolVo.java | 30 -- .../pojo/vo/PlateGoodsApplyDetailVo.java | 30 -- .../pojo/vo/PlateGoodsRecordDetailVo.java | 31 -- .../controller/AssayContentController.java | 2 +- .../order/controller/MoldApplyController.java | 94 +++++++ .../controller/MoldDemandController.java | 76 +++++ .../order/controller/MoldPlanController.java | 135 --------- .../controller/PlateGoodsApplyController.java | 2 +- .../PlateGoodsRecordController.java | 2 +- ...ldPlanMapper.java => MoldApplyMapper.java} | 10 +- .../desk/order/mapper/MoldApplyMapper.xml | 36 +++ ...apper.java => MoldDemandDetailMapper.java} | 6 +- ...lMapper.xml => MoldDemandDetailMapper.xml} | 4 +- .../desk/order/mapper/MoldDemandMapper.java | 34 +++ .../desk/order/mapper/MoldDemandMapper.xml | 35 +++ .../desk/order/mapper/MoldPlanMapper.xml | 38 --- .../desk/order/mapper/MoldPlanOrderMapper.xml | 9 - .../desk/order/mapper/MoldPlanToolMapper.java | 25 -- .../desk/order/mapper/YieldOrderMapper.xml | 4 +- .../desk/order/service/IMoldApplyService.java | 41 +++ .../service/IMoldDemandDetailService.java | 21 ++ .../order/service/IMoldDemandService.java | 32 +++ .../order/service/IMoldPlanOrderService.java | 21 -- .../desk/order/service/IMoldPlanService.java | 71 ----- .../order/service/IMoldPlanToolService.java | 21 -- .../service/impl/MoldApplyServiceImpl.java | 38 +++ .../impl/MoldDemandDetailServiceImpl.java | 28 ++ .../service/impl/MoldDemandServiceImpl.java | 50 ++++ .../impl/MoldPlanOrderServiceImpl.java | 25 -- .../service/impl/MoldPlanServiceImpl.java | 101 ------- .../service/impl/MoldPlanToolServiceImpl.java | 25 -- .../wrapper/AssayContentDetailWrapper.java | 27 -- .../desk/order/wrapper/MoldApplyWrapper.java | 38 +++ .../desk/order/wrapper/MoldDemandWrapper.java | 39 +++ .../order/wrapper/MoldPlanOrderWrapper.java | 27 -- .../order/wrapper/MoldPlanToolWrapper.java | 27 -- .../desk/order/wrapper/MoldPlanWrapper.java | 39 --- .../wrapper/PlateGoodsApplyDetailWrapper.java | 27 -- .../PlateGoodsRecordDetailWrapper.java | 27 -- doc/sql/mes/increase-260120.sql | 266 +++++++++++++++--- 53 files changed, 1136 insertions(+), 974 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldApply.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/{MoldPlan.java => MoldDemand.java} (82%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/{MoldPlanOrder.java => MoldDemandDetail.java} (74%) delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanTool.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/{MoldPlanEnum.java => MoldApplyEnum.java} (87%) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/MoldPlanSave.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/{MoldPlanVo.java => MoldApplyVo.java} (76%) rename blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/{MoldPlanDetailVo.java => MoldDemandVo.java} (72%) delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldApplyController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/{MoldPlanMapper.java => MoldApplyMapper.java} (62%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml rename blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/{MoldPlanOrderMapper.java => MoldDemandDetailMapper.java} (69%) rename blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/{MoldPlanToolMapper.xml => MoldDemandDetailMapper.xml} (68%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandDetailService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandDetailServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldApplyWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldApply.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldApply.java new file mode 100644 index 000000000..5d8b2d730 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldApply.java @@ -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; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java similarity index 82% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlan.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java index 5ac24a81e..947f27b87 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemand.java @@ -10,16 +10,70 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** - * 烧结模具计划 + * 烧结模具计划-需求 * * @author lqk - * @TableName MES_MOLD_PLAN + * @TableName MES_MOLD_DEMAND */ -@TableName(value = "MES_MOLD_PLAN") +@TableName(value = "MES_MOLD_DEMAND") @Data -public class MoldPlan extends BaseEntity { - @TableField(exist = false) - private static final long serialVersionUID = 1L; +public class MoldDemand extends BaseEntity { + @TableField(exist = false) + private static final long serialVersionUID = 1L; + + /** + * 需求单号 + */ + @TableField(value = "MD_CODE") + private String mdCode; + + /** + * 零件编码 + */ + @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 = "DEMAND_NUM") + private Double demandNum; + + /** + * 库存量 + */ + @TableField(value = "STOCK_NUM") + private Integer stockNum; + + /** + * 占用量 + */ + @TableField(value = "OCCUPY_NUM") + private Integer occupyNum; + + /** + * 关联生产订单, 多个订单以','分割 + */ + @TableField(value = "LINK_ORDER_IDS") + private String linkOrderIds; /** * 模具编码 @@ -111,17 +165,7 @@ public class MoldPlan extends BaseEntity { @TableField(value = "QUA_LEVEL") private String quaLevel; - /** - * 零件编码 - */ - @TableField(value = "PART_CODE") - private String partCode; - /** - * 零件名称 - */ - @TableField(value = "PART_NAME") - private String partName; /** * 备注 @@ -134,28 +178,4 @@ public class MoldPlan extends BaseEntity { */ @TableField(value = "URGENT_TYPE") private String urgentType; - - /** - * 计划来源;15001:自动生成，15002：人工添加 - */ - @TableField(value = "SOURCE") - private Integer source; - - /** - * 库存量 - */ - @TableField(value = "STOCK_NUM") - private Integer stockNum; - - /** - * 占用量 - */ - @TableField(value = "OCCUPY_NUM") - private Integer occupyNum; - - /** - * 关联生产订单, 多个订单以','分割 - */ - @TableField(value = "LINK_ORDER_IDS") - private String linkOrderIds; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemandDetail.java similarity index 74% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanOrder.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemandDetail.java index 975928621..6116729f0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldDemandDetail.java @@ -11,17 +11,17 @@ import org.springblade.core.mp.base.BaseEntity; * @author lqk * @TableName MES_MOLD_PLAN_ORDER */ -@TableName(value = "MES_MOLD_PLAN_ORDER") +@TableName(value = "MES_MOLD_DEMAND_DETAIL") @Data -public class MoldPlanOrder extends BaseEntity { +public class MoldDemandDetail extends BaseEntity { @TableField(exist = false) private static final long serialVersionUID = 1L; /** - * 烧结模具计划ID + * 烧结模具计划需求ID */ - @TableField(value = "MP_ID") - private Long mpId; + @TableField(value = "MD_ID") + private Long mdId; /** * 生产订单id diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanTool.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanTool.java deleted file mode 100644 index b45ca20f6..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/MoldPlanTool.java +++ /dev/null @@ -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; - -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java index 989d5a28f..87a2ed98e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldOrder.java @@ -9,6 +9,7 @@ import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.tool.utils.DateUtil; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; /** @@ -345,4 +346,15 @@ public class YieldOrder extends BaseEntity { */ @TableField(value = "RECEIVE_TIME") private Date receiveTime; + + /** + * 物料需求数量 + */ + @TableField(value = "GOODS_DEMAND") + private BigDecimal goodsDemand; + /** + * 工装需求数量 + */ + @TableField(value = "TOOLS_DEMAND") + private BigDecimal toolsDemand; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java index 76b0871c3..281232ff6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/entity/YieldPlan.java @@ -2,8 +2,10 @@ 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.math.BigDecimal; import java.util.Date; @@ -41,7 +43,7 @@ public class YieldPlan extends BaseEntity { /** * 产品型号 */ - @TableField(value = "PRODUCT_TYPE") + @TableField(value = "product_type") private String productType; /** @@ -180,9 +182,44 @@ public class YieldPlan extends BaseEntity { /** * 关闭时间 */ + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) @TableField(value = "CLOSE_TIME") private Date closeTime; + /** + * 是否生成玻璃饼订单, 0:否，1：是 + */ + @TableField(value = "GENERATE_GLASS_CAKE") + private Integer generateGlassCake; + + /** + * 验证关闭时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @TableField(value = "CHECK_CLOSE_TIME") + private Date checkCloseTime; + + /** + * 验证完工数时间 + */ + @DateTimeFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @JsonFormat( + pattern = "yyyy-MM-dd HH:mm:ss" + ) + @TableField(value = "CHECK_TOTQTY_TIME") + private Date checkTotqtyTime; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldPlanEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldApplyEnum.java similarity index 87% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldPlanEnum.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldApplyEnum.java index efbd9a00f..365a6e93e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldPlanEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldApplyEnum.java @@ -8,14 +8,14 @@ import org.springblade.core.tool.utils.StringPool; import java.util.Arrays; /** - * 烧结模具计划枚举 + * 枚举 烧结模具计划 - 申报 * * @author lqk * @date 2025-12-19 9:25 */ @Getter @AllArgsConstructor -public enum MoldPlanEnum { +public enum MoldApplyEnum { EMPTY(StringPool.EMPTY, -1), /** @@ -62,12 +62,12 @@ public enum MoldPlanEnum { * @param name 名称 * @return BladeUserEnum */ - public static MoldPlanEnum of(String name) { - return Arrays.stream(MoldPlanEnum.values()) + public static MoldApplyEnum of(String name) { + return Arrays.stream(MoldApplyEnum.values()) .filter(userEnum -> userEnum.getName().equalsIgnoreCase(name != null ? name : "web")) .findFirst() // 在没有找到匹配项时返回默认值 - .orElse(MoldPlanEnum.EMPTY); + .orElse(MoldApplyEnum.EMPTY); } /** @@ -77,7 +77,7 @@ public enum MoldPlanEnum { * @return */ public static String getName(int category) { - MoldPlanEnum item = Arrays.stream(MoldPlanEnum.values()) + MoldApplyEnum item = Arrays.stream(MoldApplyEnum.values()) .filter(enumItem -> enumItem.getCode() == category) .findFirst() .orElse(null); diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java new file mode 100644 index 000000000..ae99f507b --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/enums/MoldDemandEnum.java @@ -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(); + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/MoldPlanSave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/MoldPlanSave.java deleted file mode 100644 index 8bcba9bc2..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/request/MoldPlanSave.java +++ /dev/null @@ -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 orderList; - - /** - * 关联工装明细 - */ - private List toolList; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java deleted file mode 100644 index d4459a0fd..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/AssayContentDetailVo.java +++ /dev/null @@ -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; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldApplyVo.java similarity index 76% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldApplyVo.java index 2be472732..075dc0c64 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldApplyVo.java @@ -3,7 +3,7 @@ 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.MoldPlan; +import org.springblade.desk.order.pojo.entity.MoldApply; import java.io.Serial; @@ -13,7 +13,7 @@ import java.io.Serial; * @author lqk */ @Data -public class MoldPlanVo extends MoldPlan { +public class MoldApplyVo extends MoldApply { @Serial private static final long serialVersionUID = 1L; @@ -42,4 +42,14 @@ public class MoldPlanVo extends MoldPlan { * 类型名称 */ String mafTypeName; + + /** + * 保管员 + */ + String keeperName; + + /** + * 下达人 + */ + String releaserName; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java similarity index 72% rename from blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanDetailVo.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java index 82640eb7a..6f2dab8cb 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanDetailVo.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldDemandVo.java @@ -3,10 +3,11 @@ 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.MoldPlan; +import org.springblade.desk.order.pojo.entity.MoldDemand; import java.io.Serial; import java.util.List; +import java.util.Objects; /** * 烧结模具计划-视图类 @@ -14,7 +15,7 @@ import java.util.List; * @author lqk */ @Data -public class MoldPlanDetailVo extends MoldPlan { +public class MoldDemandVo extends MoldDemand { @Serial private static final long serialVersionUID = 1L; @@ -45,17 +46,17 @@ public class MoldPlanDetailVo extends MoldPlan { String mafTypeName; /** - * 库存信息 + * 工装占用列表 */ - List stockList; + List toolUseList; /** - * 工装信息 + * 关联订单 */ - List toolList; + List linkOrderList; /** - * 关联订单 + * 申报记录 */ - List orderList; + List nearlyApplyList; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java deleted file mode 100644 index a3d50a926..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanOrderVo.java +++ /dev/null @@ -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; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java deleted file mode 100644 index 344600acd..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/MoldPlanToolVo.java +++ /dev/null @@ -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; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java deleted file mode 100644 index 0b0bc980c..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsApplyDetailVo.java +++ /dev/null @@ -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; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java deleted file mode 100644 index 214a8884b..000000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/order/pojo/vo/PlateGoodsRecordDetailVo.java +++ /dev/null @@ -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; - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java index fd00d6f48..f9130419c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/AssayContentController.java @@ -32,7 +32,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/order/assayContent") -@Tag(name = "化验含量", description = "接口") +@Tag(name = "镀层物料-化验含量", description = "接口") public class AssayContentController extends BladeController { private final IAssayContentService assayContentService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldApplyController.java new file mode 100644 index 000000000..7ff06a54e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldApplyController.java @@ -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> page(@Parameter(hidden = true) MoldApply entity, Query query) { + IPage 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> pageNearlyMonth(@Parameter(hidden = true) MoldApply entity, Query query) { + IPage page = moldApplyService.pageNearlyMonth(Condition.getPage(query), entity); + return R.data(MoldApplyWrapper.build().pageVO(page)); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @Operation(summary = "详情", description = "") + public R 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 applylist) { + moldApplyService.save(applylist); + return R.status(true); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java new file mode 100644 index 000000000..4cf4c5bbf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldDemandController.java @@ -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> page(@Parameter(hidden = true) MoldDemand entity, Query query) { + IPage page = moldDemandService.selectPage(Condition.getPage(query), entity); + return R.data(MoldDemandWrapper.build().pageVO(page)); + } + + /** + * 详情 + */ + @GetMapping("/detail") + @Operation(summary = "详情", description = "") + public R 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); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java deleted file mode 100644 index 9e8f23fd7..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/MoldPlanController.java +++ /dev/null @@ -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> page(@Parameter(hidden = true) MoldPlan entity, Query query) { - IPage 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> pageApply(@Parameter(hidden = true) MoldPlan entity, Query query) { - IPage page = moldPlanService.selectPageApply(Condition.getPage(query), entity); - return R.data(MoldPlanWrapper.build().pageVO(page)); - } - - /** - * 分页-近一月的模具计划 - */ - @GetMapping("/pageNearlyMonth") - @Operation(summary = "分页-近一月的模具计划", description = "") - public R> pageNearlyMonth(@Parameter(hidden = true) MoldPlan entity, Query query) { - IPage page = moldPlanService.pageNearlyMonth(Condition.getPage(query), entity); - return R.data(MoldPlanWrapper.build().pageVO(page)); - } - - /** - * 详情 - */ - @GetMapping("/detail") - @Operation(summary = "详情", description = "") - public R detail(String id) { - MoldPlan detail = moldPlanService.getById(id); - return R.data(detail); - } - - /** - * 新增 - */ - @PostMapping("/save") - @Operation(summary = "新增", description = "") - public R save(@Valid @RequestBody List 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 orderList = saveData.getOrderList(); - List 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); - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java index bef06f208..fe39806e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsApplyController.java @@ -32,7 +32,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/order/plateGoodsApply") -@Tag(name = "镀层物料添加量申报", description = "接口") +@Tag(name = "镀层物料-添加申报", description = "接口") public class PlateGoodsApplyController extends BladeController { private final IPlateGoodsApplyService plateGoodsApplyService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java index 40ab2e4d2..eebdb8130 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/PlateGoodsRecordController.java @@ -36,7 +36,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/order/plateGoodsRecord") -@Tag(name = "镀层物料需求申报", description = "接口") +@Tag(name = "镀层物料-需求申报", description = "接口") public class PlateGoodsRecordController extends BladeController { private final IPlateGoodsRecordService goodsRecordService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java similarity index 62% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java index 2e3592b2b..8e4b1fa69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.java @@ -2,7 +2,7 @@ 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.MoldPlan; +import org.springblade.desk.order.pojo.entity.MoldApply; import java.util.List; @@ -10,9 +10,9 @@ 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.MoldPlan + * @Entity org.springblade.desk.order.pojo.entity.MoldApply */ -public interface MoldPlanMapper extends BaseMapper { +public interface MoldApplyMapper extends BaseMapper { /** * 自定义分页 @@ -21,7 +21,7 @@ public interface MoldPlanMapper extends BaseMapper { * @param entity * @return */ - List selectPage(IPage page, MoldPlan entity); + List selectPage(IPage page, MoldApply entity); /** * 自定义分页 - 近一月的模具计划 @@ -30,5 +30,5 @@ public interface MoldPlanMapper extends BaseMapper { * @param entity * @return */ - List pageNearlyMonth(IPage page, MoldPlan entity); + List pageNearlyMonth(IPage page, MoldApply entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml new file mode 100644 index 000000000..5b19fd76d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldApplyMapper.xml @@ -0,0 +1,36 @@ + + + + + + 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 + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.java similarity index 69% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.java index ff2872721..284e06626 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.java @@ -2,7 +2,7 @@ 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.MoldPlanOrder; +import org.springblade.desk.order.pojo.entity.MoldDemandDetail; import java.util.List; @@ -12,7 +12,7 @@ import java.util.List; * @createDate 2025-11-24 11:41:58 * @Entity org.springblade.desk.order.pojo.entity.MoldPlanOrder */ -public interface MoldPlanOrderMapper extends BaseMapper { +public interface MoldDemandDetailMapper extends BaseMapper { /** * 自定义分页 @@ -21,5 +21,5 @@ public interface MoldPlanOrderMapper extends BaseMapper { * @param entity * @return */ - List selectPage(IPage page, MoldPlanOrder entity); + List selectPage(IPage page, MoldDemandDetail entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.xml similarity index 68% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml rename to blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.xml index 3f8b66332..f858f10ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandDetailMapper.xml @@ -2,8 +2,8 @@ - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java new file mode 100644 index 000000000..e8364ec5e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.java @@ -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 { + + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + List selectPage(IPage page, MoldDemand entity); + + /** + * 自定义分页 - 近一月的模具计划 + * + * @param page + * @param entity + * @return + */ + List pageNearlyMonth(IPage page, MoldDemand entity); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml new file mode 100644 index 000000000..ac3675f1d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldDemandMapper.xml @@ -0,0 +1,35 @@ + + + + + + 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 + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml deleted file mode 100644 index f9223756f..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml deleted file mode 100644 index d4c47d7ad..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanOrderMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java deleted file mode 100644 index ef0381f19..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/MoldPlanToolMapper.java +++ /dev/null @@ -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 { - - /** - * 自定义分页 - * - * @param page - * @param entity - * @return - */ - List selectPage(IPage page, MoldPlanTool entity); -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml index e31fd5660..e2b5459e2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/mapper/YieldOrderMapper.xml @@ -12,7 +12,7 @@ MANUAL_INCREASE, YIELD_TYPE, FATHER_YO_ID, NEW_LEV_FLAG, PRODUCE_BOOL, USE_DEPT_CODE, YP_PRODUCT_LINE, YP_MEMO, SJ_MOLD_PREPARATION, SJ_KIT_PREPARATION, PK_USERNAME, PK_DATE, KIT_PREPARATION_MAN, KIT_PREPARATION_TIME, PRIORITY_APS, PRIORITY_ERP, VALIDATION_RESULT, VALIDATION_MOMO, VALIDATION_TIME, VALIDATION_USER, RECEIVE_STATUS, WORK_CENTER_ID, - ERROR_INFO, RECEIVE_USER, RECEIVE_TIME + ERROR_INFO, RECEIVE_USER, RECEIVE_TIME, GOODS_DEMAND FROM MES_YIELD_ORDER WHERE IS_DELETED = 0 @@ -61,7 +61,7 @@ MANUAL_INCREASE, YIELD_TYPE, FATHER_YO_ID, NEW_LEV_FLAG, PRODUCE_BOOL, USE_DEPT_CODE, YP_PRODUCT_LINE, YP_MEMO, SJ_MOLD_PREPARATION, SJ_KIT_PREPARATION, PK_USERNAME, PK_DATE, KIT_PREPARATION_MAN, KIT_PREPARATION_TIME, PRIORITY_APS, PRIORITY_ERP, VALIDATION_RESULT, VALIDATION_MOMO, VALIDATION_TIME, VALIDATION_USER, RECEIVE_STATUS, WORK_CENTER_ID, - ERROR_INFO, RECEIVE_USER, RECEIVE_TIME + ERROR_INFO, RECEIVE_USER, RECEIVE_TIME, GOODS_DEMAND FROM MES_YIELD_ORDER yo LEFT JOIN MES_PLATE_GOODS_RECORD_DETAIL grd ON yo.id = grd.YO_ID WHERE yo.IS_DELETED = 0 AND grd.ID IS NULL diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java new file mode 100644 index 000000000..2ae4e697c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldApplyService.java @@ -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 { + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + IPage selectPage(IPage page, MoldApply entity); + + + /** + * 自定义分页 - 近一月的模具计划 + * + * @param page + * @param entity + * @return + */ + IPage pageNearlyMonth(IPage page, MoldApply entity); + + /** + * 保存 + * + * @param applyList + * @return + */ + boolean save(List applyList); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandDetailService.java new file mode 100644 index 000000000..cf334b3d3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandDetailService.java @@ -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 { + /** + * 根据需求id查询明细列表 + * + * @param demandId + * @return + */ + List listByDemandId(Long demandId); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java new file mode 100644 index 000000000..1e8d1a618 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldDemandService.java @@ -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 { + /** + * 自定义分页 + * + * @param page + * @param entity + * @return + */ + IPage selectPage(IPage page, MoldDemand entity); + + + /** + * 保存 + * + * @param planList + * @return + */ + boolean save(List planList); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java deleted file mode 100644 index 1c9772f52..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanOrderService.java +++ /dev/null @@ -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 { - /** - * 自定义分页 - * - * @param page - * @param entity - * @return - */ - IPage selectPage(IPage page, MoldPlanOrder entity); -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java deleted file mode 100644 index 6e8fb0c7e..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanService.java +++ /dev/null @@ -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 { - /** - * 自定义分页 - * - * @param page - * @param entity - * @return - */ - IPage selectPage(IPage page, MoldPlan entity); - - /** - * 自定义分页 - 人工申报的 - * - * @param page - * @param entity - * @return - */ - IPage selectPageApply(IPage page, MoldPlan entity); - - /** - * 自定义分页 - 近一月的模具计划 - * - * @param page - * @param entity - * @return - */ - IPage pageNearlyMonth(IPage page, MoldPlan entity); - - /** - * 保存 - * - * @param planList - * @return - */ - boolean save(List planList); - - /** - * 保存 - * - * @param entity - * @param orderList - * @param toolList - * @return - */ - boolean save(MoldPlan entity, List orderList, List toolList); - - /** - * 修改 - * - * @param entity - * @param orderList - * @param toolList - * @return - */ - boolean update(MoldPlan entity, List orderList, List toolList); -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java deleted file mode 100644 index 6c98ce6bf..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IMoldPlanToolService.java +++ /dev/null @@ -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 { - /** - * 自定义分页 - * - * @param page - * @param entity - * @return - */ - IPage selectPage(IPage page, MoldPlanTool entity); -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java new file mode 100644 index 000000000..ffbe757c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldApplyServiceImpl.java @@ -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 implements IMoldApplyService { + + @Override + public IPage selectPage(IPage page, MoldApply entity) { + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public IPage pageNearlyMonth(IPage page, MoldApply entity) { + List dataList = baseMapper.pageNearlyMonth(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean save(List applyList) { + return false; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandDetailServiceImpl.java new file mode 100644 index 000000000..674a2bc7f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandDetailServiceImpl.java @@ -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 implements IMoldDemandDetailService { + + @Override + public List listByDemandId(Long demandId) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MoldDemandDetail.class) + .eq(MoldDemandDetail::getMdId, demandId); + List dataList = baseMapper.selectList(wrapper); + return dataList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java new file mode 100644 index 000000000..9b6db346e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldDemandServiceImpl.java @@ -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 implements IMoldDemandService { + + private final IDsPartService dsPartService; + + @Override + public IPage selectPage(IPage page, MoldDemand entity) { + List dataList = baseMapper.selectPage(page, entity); + return page.setRecords(dataList); + } + + @Override + public boolean save(List 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); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java deleted file mode 100644 index b60d29e1a..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanOrderServiceImpl.java +++ /dev/null @@ -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 implements IMoldPlanOrderService { - - @Override - public IPage selectPage(IPage page, MoldPlanOrder entity) { - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java deleted file mode 100644 index a878ad9f9..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanServiceImpl.java +++ /dev/null @@ -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 implements IMoldPlanService { - - private final IMoldPlanOrderService orderService; - - private final IMoldPlanToolService toolService; - - private final IDsPartService dsPartService; - - @Override - public IPage selectPage(IPage page, MoldPlan entity) { - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } - - @Override - public IPage selectPageApply(IPage page, MoldPlan entity) { - entity.setSource(MoldPlanEnum.SOURCE_USER.getCode()); - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } - - @Override - public IPage pageNearlyMonth(IPage page, MoldPlan entity) { - List dataList = baseMapper.pageNearlyMonth(page, entity); - return page.setRecords(dataList); - } - - @Override - public boolean save(List 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 orderList, List 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 orderList, List toolList) { - if (this.save(entity)) { - orderService.saveBatch(orderList); - toolService.saveBatch(toolList); - return true; - } - return false; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java deleted file mode 100644 index 80674cb86..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/MoldPlanToolServiceImpl.java +++ /dev/null @@ -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 implements IMoldPlanToolService { - - @Override - public IPage selectPage(IPage page, MoldPlanTool entity) { - List dataList = baseMapper.selectPage(page, entity); - return page.setRecords(dataList); - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java deleted file mode 100644 index 3076f005f..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/AssayContentDetailWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldApplyWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldApplyWrapper.java new file mode 100644 index 000000000..a45090fcd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldApplyWrapper.java @@ -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 { + + 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; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java new file mode 100644 index 000000000..02ff673a9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldDemandWrapper.java @@ -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 { + + 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; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java deleted file mode 100644 index 91d00fb36..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanOrderWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java deleted file mode 100644 index ec23599c9..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanToolWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java deleted file mode 100644 index 0db4c3207..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/MoldPlanWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java deleted file mode 100644 index e385ed24d..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsApplyDetailWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java deleted file mode 100644 index bdd8fb093..000000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/wrapper/PlateGoodsRecordDetailWrapper.java +++ /dev/null @@ -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 { - - 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; - } -} diff --git a/doc/sql/mes/increase-260120.sql b/doc/sql/mes/increase-260120.sql index 3254dd87f..ecc072b91 100644 --- a/doc/sql/mes/increase-260120.sql +++ b/doc/sql/mes/increase-260120.sql @@ -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 '验证完工数时间';