From 8b43954926db6b4df6a61ab6e04d6cb11189069d Mon Sep 17 00:00:00 2001
From: 吴健 <14790700720@163.com>
Date: 星期二, 15 四月 2025 08:54:08 +0800
Subject: [PATCH] add-415
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 81efeb7..5be6644 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -17,6 +17,7 @@
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.webservice.service.ReceivingServices;
+import com.kangaroohy.milo.model.ReadWriteEntity;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -25,6 +26,7 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -58,6 +60,15 @@
public TableDataInfo list(OmProductionOrdeInfo omProductionOrdeInfo)
{
startPage();
+ if (StrUtil.isNotBlank(omProductionOrdeInfo.getEngineNo())){
+ BsOrderScheduling bsOrderScheduling = bsOrderSchedulingService.selectBsOrderSchedulingSNCode(omProductionOrdeInfo.getEngineNo());
+ if (ObjectUtil.isNotEmpty(bsOrderScheduling)){
+ String orderNo = bsOrderScheduling.getOrderNo();
+ if (StrUtil.isNotBlank(orderNo)){
+ omProductionOrdeInfo.setWorkOrderNo(orderNo);
+ }
+ }
+ }
List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
return getDataTable(list);
}
@@ -255,8 +266,11 @@
if (StrUtil.isBlank(factory)){
throw new ServiceException("璇烽�夋嫨宸ュ巶缂栧彿");
}
- List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
- if(omProductionOrdeInfos.size() == 0){
+ OmProductionOrdeInfo queryProductOrder = new OmProductionOrdeInfo();
+ queryProductOrder.setWorkshopCode(factory);
+ queryProductOrder.setProductionNotice(productionNotice);
+ List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(queryProductOrder);
+ if(CollUtil.isEmpty(omProductionOrdeInfos)){
try {
logger.info("鎺ユ敹宸ュ崟鍙凤細,{}",productionNotice);
ReceivingServices.insertWebserviceData(factory,productionNotice);
--
Gitblit v1.9.3