diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java index d24d012a..d16a0b35 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/dashboard/pojo/entity/BsCraftAbilityEntity.java @@ -25,13 +25,12 @@ */ package org.springblade.desk.dashboard.pojo.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; + import java.io.Serial; /** @@ -65,4 +64,10 @@ public class BsCraftAbilityEntity extends BaseEntity { @Schema(description = "备注") private String remarks; + /** + * 厂内应分比例 + */ + @Schema(description = "厂内应分比例") + private Double inFactoryPercent; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java index ca96158b..842fcc19 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderCraftServiceImpl.java @@ -17,6 +17,7 @@ import org.springblade.desk.basic.service.IBsAssignService; import org.springblade.desk.basic.service.IOemCraftAbilityService; import org.springblade.desk.basic.service.IOemService; import org.springblade.desk.basic.service.IWorkCenterService; +import org.springblade.desk.dashboard.pojo.entity.BsCraftAbilityEntity; import org.springblade.desk.dashboard.pojo.entity.BsWorkCenterEntity; import org.springblade.desk.dashboard.service.IBsCraftAbilityService; import org.springblade.desk.order.mapper.YieldOrderCraftMapper; @@ -82,6 +83,7 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl craftKeys = craftAbilityMap.keySet(); //获取到认定的主工艺能力(默认第一个工艺能力为主工艺能力) Long hostAbilityId = craftKeys.iterator().next(); + BsCraftAbilityEntity craftAbility = craftAbilityService.getById(hostAbilityId); //获取可以做此主工艺能力的作业中心集合 Map workCenterMap = workCenterService.selectByAbility(hostAbilityId, yieldOrder.getYpQty(), yieldOrder.getYpArea(), yieldOrder.getPartCode(), yieldOrder.getPrimaryCraft(), yieldOrder.getYieldType(), rxlSpace); //获取可以做此主工艺能力的外协商集合 @@ -217,28 +219,19 @@ public class YieldOrderCraftServiceImpl extends BaseServiceImpl 0) { return; } - //外协 -// log.info("{}自动分派按照比例分派给外协:{},分派比例:{} 应分比例:{}", yieldOrder.getCardNo(), -// oemCustomer.getOcName(), rate, dispatch.getdValue()); + // 外协 dispatchCraftList = this.bindOem(oemCustomer, hostAbilityId, craftAbilityMap, craftKeys, yieldOrder, null); } } else { diff --git a/doc/sql/mes/increase-20690321.sql b/doc/sql/mes/increase-20690321.sql index fb4ae265..f527d86a 100644 --- a/doc/sql/mes/increase-20690321.sql +++ b/doc/sql/mes/increase-20690321.sql @@ -77,3 +77,6 @@ COMMENT ON COLUMN "MES_YIELD_ORDER_ASSIGN_STEER"."WEEK_ASSIGN" IS '周累计分 COMMENT ON COLUMN "MES_YIELD_ORDER_ASSIGN_STEER"."ASSIGN_SCALE" IS '分派比例'; COMMENT ON COLUMN "MES_YIELD_ORDER_ASSIGN_STEER"."FACTOR" IS '比例偏差因子'; COMMENT ON TABLE "MES_YIELD_ORDER_ASSIGN_STEER" IS '生产订单分派控制, 主要针对外协'; + +ALTER TABLE BS_CRAFT_ABILITY ADD IN_FACTORY_PERCENT NUMBER(10,2) NULL; +COMMENT ON COLUMN BS_CRAFT_ABILITY.IN_FACTORY_PERCENT IS '厂内应分比例';