From 091a1a661d2e1adf033f1c53e7b66f60a25f3311 Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Fri, 8 Nov 2024 08:42:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BD=A6=E9=97=B4=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machinprocedure/entity/MachinProcedureFarm.java | 4 ++++ .../service/impl/MachinProcedureFarmServiceImpl.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/entity/MachinProcedureFarm.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/entity/MachinProcedureFarm.java index 56ae2e01..77f92363 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/entity/MachinProcedureFarm.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/entity/MachinProcedureFarm.java @@ -36,6 +36,10 @@ public class MachinProcedureFarm extends OperatorUserInfo { @ApiModelProperty(value = "主键id。为空时新增，不为空时编辑") private String id; + @TableField(value = "odd_number", updateStrategy = FieldStrategy.NEVER) + @Property(value = "单据编号", fuzzyLike = true) + private String oddNumber; + @TableField(value = "machin_id", updateStrategy = FieldStrategy.NEVER) @ApiModelProperty(value = "加工单id") private String machinId; diff --git a/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/service/impl/MachinProcedureFarmServiceImpl.java b/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/service/impl/MachinProcedureFarmServiceImpl.java index 6aadebba..5f506893 100644 --- a/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/service/impl/MachinProcedureFarmServiceImpl.java +++ b/skyeye-erp/erp-pro/src/main/java/com/skyeye/machinprocedure/service/impl/MachinProcedureFarmServiceImpl.java @@ -4,6 +4,7 @@ package com.skyeye.machinprocedure.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; @@ -97,6 +98,13 @@ public class MachinProcedureFarmServiceImpl extends SkyeyeBusinessServiceImpl business = BeanUtil.beanToMap(entity); + String oddNumber = iCodeRuleService.getNextCodeByClassName(this.getClass().getName(), business); + entity.setOddNumber(oddNumber); + } + @Override public MachinProcedureFarm selectById(String id) { MachinProcedureFarm machinProcedureFarm = super.selectById(id);