diff --git a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingIssueServiceImpl.java b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingIssueServiceImpl.java index e17b645..28e97a7 100644 --- a/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingIssueServiceImpl.java +++ b/src/main/java/com/gaotao/modules/outsourcing/service/impl/OutsourcingIssueServiceImpl.java @@ -18,6 +18,7 @@ import com.gaotao.modules.trans.entity.TransCommonSubDto; import com.gaotao.modules.trans.entity.TransDetail; import com.gaotao.modules.trans.service.TransHeaderService; import com.gaotao.modules.trans.service.ValidateInventoryPartInStockService; +import com.gaotao.modules.warehouse.service.WmsAvailabilityControlIdService; import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +42,8 @@ public class OutsourcingIssueServiceImpl implements OutsourcingIssueService { private TransHeaderService transHeaderService; @Autowired private ValidateInventoryPartInStockService validateInventoryPartInStockService; + @Autowired + private WmsAvailabilityControlIdService wmsAvailabilityControlIdService; @Autowired private CountModeChecker countModeChecker; @@ -70,6 +73,9 @@ public class OutsourcingIssueServiceImpl implements OutsourcingIssueService { @Override public MaterialLabelInfo scanOutsourcingMaterialLabel(String scannedLabel, String site, String componentPartNo) throws Exception { + if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(site,scannedLabel,"part_order_issue_control")){ + throw new RuntimeException("本标签的 availability control id 不允许委外发料!"); + } HandlingUnit label = outsourcingIssueMapper.scanMaterialLabel(scannedLabel, site,componentPartNo); if(label!=null){ diff --git a/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java index ab08c37..5e6c2a4 100644 --- a/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java +++ b/src/main/java/com/gaotao/modules/production/service/impl/ProductionIssueServiceImpl.java @@ -33,6 +33,7 @@ import com.gaotao.modules.trans.service.TransNoControlService; import com.gaotao.modules.handlingunit.service.HandlingUnitService; import com.gaotao.modules.trans.service.ValidateInventoryPartInStockService; import com.gaotao.modules.warehouse.service.InventoryStockService; +import com.gaotao.modules.warehouse.service.WmsAvailabilityControlIdService; import io.jsonwebtoken.lang.Maps; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -70,7 +71,8 @@ public class ProductionIssueServiceImpl implements ProductionIssueService { private ValidateInventoryPartInStockService validateInventoryPartInStockService; @Autowired private CountModeChecker countModeChecker; - + @Autowired + private WmsAvailabilityControlIdService wmsAvailabilityControlIdService; @Override public IPage getIssureNotifyByNo(SOIssueNotifyHeaderData data) { @@ -482,6 +484,9 @@ public class ProductionIssueServiceImpl implements ProductionIssueService { @Override public MaterialLabelInfo scanMaterialLabel(String labelCode, String site, String partNo) { + if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(site,labelCode,"part_order_issue_control")){ + throw new RuntimeException("本标签的 availability control id 不允许发料!"); + } HandlingUnit label = productionIssueMapper.scanMaterialLabel(labelCode, site,partNo); if(label!=null){ @@ -502,6 +507,9 @@ public class ProductionIssueServiceImpl implements ProductionIssueService { @Override public MaterialLabelInfo scanMaterialLabelNoPartNo(String labelCode, String site) { + if(!wmsAvailabilityControlIdService.checkPartOperationAllowed(site,labelCode,"part_order_issue_control")){ + throw new RuntimeException("本标签的 availability control id 不允许发料!"); + } HandlingUnit label = productionIssueMapper.scanMaterialLabelNoPartNo(labelCode, site); if(label!=null){