liuqingkun
3 months ago
parent
ab2c3d0c0c
commit
aef29b5a2b
38 changed files with 599 additions and 196 deletions
@ -0,0 +1,61 @@ |
||||
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 java.io.Serial; |
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 烧结模具计划-视图类 |
||||
* |
||||
* @author lqk |
||||
*/ |
||||
@Data |
||||
public class MoldPlanDetailVo extends MoldPlan { |
||||
@Serial |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** |
||||
* 主键ID |
||||
*/ |
||||
@JsonSerialize(using = ToStringSerializer.class) |
||||
private Long id; |
||||
|
||||
/** |
||||
* 创建人 |
||||
*/ |
||||
String createUserName; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String statusName; |
||||
|
||||
/** |
||||
* 状态名称 |
||||
*/ |
||||
String mafStatusName; |
||||
|
||||
/** |
||||
* 类型名称 |
||||
*/ |
||||
String mafTypeName; |
||||
|
||||
/** |
||||
* 库存信息 |
||||
*/ |
||||
List<Object> stockList; |
||||
|
||||
/** |
||||
* 工装信息 |
||||
*/ |
||||
List<Object> toolList; |
||||
|
||||
/** |
||||
* 关联订单 |
||||
*/ |
||||
List<Object> orderList; |
||||
} |
||||
@ -1,46 +0,0 @@ |
||||
package org.springblade.desk.order.task; |
||||
|
||||
import lombok.RequiredArgsConstructor; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
import org.springblade.desk.order.service.IYieldOrderService; |
||||
import org.springframework.beans.factory.annotation.Value; |
||||
import org.springframework.scheduling.annotation.Scheduled; |
||||
import org.springframework.stereotype.Component; |
||||
|
||||
import java.util.List; |
||||
|
||||
/** |
||||
* 排产定时任务 |
||||
* |
||||
* @author Chill |
||||
*/ |
||||
@Slf4j |
||||
@Component |
||||
@RequiredArgsConstructor |
||||
public class OrderApsJob { |
||||
private final IYieldOrderService yieldOrderService; |
||||
|
||||
@Value("${business.oldMes.jobEnable}") |
||||
private String jobEnable; |
||||
|
||||
/** |
||||
* 同步生产订单定时任务 |
||||
* TODO 以后需要交由PowerJob服务统一管理 |
||||
*/ |
||||
@Scheduled(cron = "0 0/3 * * * ?") |
||||
public void syncOrderFromOldMes() { |
||||
log.info("开始同步生产订单..."); |
||||
|
||||
if ("false".equals(jobEnable)) { |
||||
log.info("同步生产订单已关闭..."); |
||||
return; |
||||
} |
||||
|
||||
// 同步生产订单
|
||||
List<String> cardNoList = yieldOrderService.syncYieldOrderFromOldMes(); |
||||
|
||||
// 推送同步结果，避免重复同步
|
||||
yieldOrderService.syncYieldOrderResultToOldMes(cardNoList); |
||||
log.info("同步生产订单已完成..."); |
||||
} |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
-- 化验明细添加槽号对应名称字段 |
||||
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_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 NOT_ADD_VAL NUMBER(20,10) NULL; |
||||
COMMENT ON COLUMN MES_PLATE_GOODS_RECORD.NOT_ADD_VAL IS '本次剩余单号余量'; |
||||
|
||||
Loading…
Reference in new issue