mes/nalinv-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
彭枝刚 2024-11-25 15:58:45 +08:00
commit fa9b4f4996
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
mes-core/src/main/java/com/foreverwin/iep/wip/service/impl/OperationOutServiceImpl.java
View File

@ -15,6 +15,7 @@ import com.foreverwin.iep.common.model.CustomValue;
import com.foreverwin.iep.prd.domain.ReleaseShopOrderResponse;
import com.foreverwin.iep.prd.dto.ShopOrderDTO;
import com.foreverwin.iep.prd.entity.*;
import com.foreverwin.iep.prd.mapper.CustomFieldsMapper;
import com.foreverwin.iep.prd.mapper.ItemMapper;
import com.foreverwin.iep.prd.mapper.UserWorkShiftMapper;
import com.foreverwin.iep.prd.service.*;
@ -22,7 +23,6 @@ import com.foreverwin.iep.smd.entity.FabBasis;
import com.foreverwin.iep.smd.entity.Resrce;
import com.foreverwin.iep.smd.entity.WorkCenter;
import com.foreverwin.iep.smd.mapper.ResrceMapper;
import com.foreverwin.iep.smd.service.WorkCenterService;
import com.foreverwin.iep.wip.domain.CompleteRequest;
import com.foreverwin.iep.wip.domain.SpecifyReleaseLotInfo;
import com.foreverwin.iep.wip.domain.StartRequest;
@ -35,10 +35,13 @@ import com.foreverwin.iep.wms.entity.WmsStorageLocation;
import com.foreverwin.iep.wms.mapper.EqpFeedingMapper;
import com.foreverwin.iep.wms.mapper.WmsStorageLocationMapper;
import com.foreverwin.iep.wms.service.EqpFeedingService;
import com.foreverwin.mom.common.core.constant.SecurityConstants;
import com.foreverwin.mom.common.core.exception.BusinessException;
import com.foreverwin.mom.common.security.util.SecurityUtils;
import com.foreverwin.mom.wms.api.feign.RemoteWmsInventoryService;
import com.foreverwin.mom.wms.entity.Inventory;
import com.foreverwin.nlv.print.dto.OperationPrintRequest;
import com.foreverwin.nlv.print.feign.RemotePrintService;
import io.seata.spring.annotation.GlobalTransactional;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
@ -90,12 +93,14 @@ public class OperationOutServiceImpl extends ServiceImpl<OperationOutMapper, Ope
private final ItemMapper itemMapper;
private final WorkCenterService workCenterService;
private final CustomFieldsMapper customFieldsMapper;
private final NlvWipCommonService nlvWipCommonService;
private final ResrceMapper resrceMapper;
private final RemotePrintService remotePrintService;
private final ZLotMaterialCompleteTransactionService zLotMaterialCompleteTransactionService;
private final ZLotMaterialConsumptionTransactionService zLotMaterialConsumptionTransactionService;
private final ZShoporderStatisticsTransactionService zShoporderStatisticsTransactionService;
@ -349,24 +354,6 @@ public class OperationOutServiceImpl extends ServiceImpl<OperationOutMapper, Ope
completeRequest.setResource(resrce);
processService.complete(completeRequest);
// 打印标签（工序自定义字段判断）
/*CustomFields customFields = customFieldsMapper.selectOne(Wrappers.<CustomFields>lambdaQuery()
.eq(CustomFields::getHandle, operationBo)
.eq(CustomFields::getSite, site)
.eq(CustomFields::getTableName, "OPERATION")
.eq(CustomFields::getFieldName, "IS_PRINT")
);
if (customFields != null && "Y".equals(customFields.getFieldValue())) {
// 调用打印
PrintPortDTO printPortDTO = new PrintPortDTO();
printPortDTO.setSite(site);
printPortDTO.setBatchNumber(lotNo);
printPortDTO.setUserName(user);
printPortDTO.setPrintName("");
printPortDTO.setTenantId(site);
remotePrintService.remotePrint(printPortDTO, SecurityConstants.FROM_IN);
}*/
// 末工序需要报工
if ("E".equals(jsonObject.get("endOp"))) {
this.bgStorage(group, resultZLotMaterialCompleteTransaction, site, shopOrderObj, resrce, operationOutDTO.getRollType(), shopOrder, operationOutDTO.getUserWorkShift());
@ -378,6 +365,29 @@ public class OperationOutServiceImpl extends ServiceImpl<OperationOutMapper, Ope
// 需要自动完成的工序
this.autoOperation(site, operationOutDTO, shopOrderObj, operationBo, lotNoList, resultZLotMaterialCompleteTransaction, group, shopOrder);
// 打印标签（工序自定义字段判断）
CustomFields customFields = customFieldsMapper.selectOne(Wrappers.<CustomFields>lambdaQuery()
.eq(CustomFields::getHandle, operationBo)
.eq(CustomFields::getSite, site)
.eq(CustomFields::getTableName, "OPERATION")
.eq(CustomFields::getFieldName, "IS_PRINT")
);
if (customFields != null && "Y".equals(customFields.getFieldValue())) {
// 调用打印
for (String lotNo : lotNoList) {
OperationPrintRequest operationPrintRequest = new OperationPrintRequest();
operationPrintRequest.setSite(site);
operationPrintRequest.setUser(user);
operationPrintRequest.setFabNo(resultZLotMaterialCompleteTransaction.getFabNo());
operationPrintRequest.setWorkCenter(resultZLotMaterialCompleteTransaction.getWorkCenter());
operationPrintRequest.setOperation(operation);
operationPrintRequest.setResource(resrce);
operationPrintRequest.setLotNo(lotNo);
operationPrintRequest.setShopOrder(shopOrder);
remotePrintService.remoteDoOperationPrint(operationPrintRequest, SecurityConstants.FROM_IN);
}
}
// 合并条码列表
resultLotNoList.addAll(lotNoList);
});