From 310247047aa76591935cf6e95a70c303b41aef52 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 21 Feb 2023 13:45:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mesnac/dispatch/service/ShopOrderReleaseService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
index 14020cb4..d77d79d6 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/ShopOrderReleaseService.java
@@ -74,7 +74,7 @@ public interface ShopOrderReleaseService {
* @param user
* @param shopOrderRelease
*/
- Boolean shopOrderRelease(String site, String user,StringBuffer message, ShopOrderRelease shopOrderRelease) throws IOException;
+ Boolean shopOrderRelease(String site, String user,StringBuffer message, ShopOrderRelease shopOrderRelease ) throws IOException;
/**
* 工单整理- 刷新派工单
From 063678a9fd48f59cb011740457898f8fa536637b Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 21 Feb 2023 13:52:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/common.iml | 1 +
.../ShopOrderReleaseController.java | 1 +
.../impl/ShopOrderReleaseServiceImpl.java | 19 +++++++------------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/common/common.iml b/common/common.iml
index 07c82ac7..8d65438d 100644
--- a/common/common.iml
+++ b/common/common.iml
@@ -229,5 +229,6 @@
+
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
index 7da9a6dc..240b382c 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/ShopOrderReleaseController.java
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.websocket.server.PathParam;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.*;
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
index 0a87db51..b51bd6de 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/ShopOrderReleaseServiceImpl.java
@@ -297,7 +297,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
Sfc sfcModel = new Sfc();
sfcModel.setSfc(releasedSfc.getSfc());
sfcModel.setQty(releasedSfc.getQuantity().doubleValue());
- sfcDispatch(site, user, shopOrderModel, sfcModel, routerList, "false");
+ sfcDispatch(site, user, shopOrderModel, sfcModel, routerList,"false");
}
return flag;
}
@@ -306,7 +306,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
//------------------------------------------------------------------------------------------------------------------
/**派工--按工序**/
@Override
- public void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List routerList, String isSplitSfc) throws IOException {
+ public void sfcDispatch(String site, String user, ShopOrder shopOrderModel, Sfc sfcModel, List routerList,String isSplitSfc) throws IOException {
LocalDateTime nowDate = LocalDateTime.now();
String router = routerList.get(0).getRouter();
@@ -334,11 +334,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
String routerStepBo = entryRouterStepBo;
//首工序计划开始时间为工单计划开始时间
- LocalDateTime plannedStartDate = shopOrderModel.getPlannedStartDate();
- if (plannedStartDate == null){
- plannedStartDate = nowDate;
- }
- LocalDateTime plannedCompleteDate;
+ //LocalDateTime plannedStartDate = shopOrderModel.getPlannedStartDate();
+ //LocalDateTime plannedCompleteDate = shopOrderModel.getPlannedStartDate();
//前置步骤&工序
String prepositionStepId = null;
@@ -369,7 +366,7 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
Double prodHours = new Double(this.prodHoursCl(operation, routerDTO.getProdHours()));
//计算完成时间
- plannedCompleteDate = plannedStartDate.plusMinutes(prodHours.longValue());
+ //plannedCompleteDate = plannedStartDate.plusMinutes(prodHours.longValue());
//查询工序所属车间
String workCenter = null;
@@ -406,10 +403,8 @@ public class ShopOrderReleaseServiceImpl implements ShopOrderReleaseService {
sfcDispatchModel.setDispatchQty(sfcModel.getQty());
sfcDispatchModel.setProdHours(prodHours);
sfcDispatchModel.setTurnOperation("false");
- if (operation.equals("WX_6106GX")) {
- sfcDispatchModel.setPlannedStartDate(plannedStartDate);
- sfcDispatchModel.setPlannedCompDate(plannedCompleteDate);
- }
+ //sfcDispatchModel.setPlannedStartDate(plannedStartDate);
+ //sfcDispatchModel.setPlannedCompleteDate(plannedCompleteDate);
sfcDispatchModel.setSoReleasedDate(nowDate);
sfcDispatchModel.setIsDispatch(Constants.BOOL_FALSE);
sfcDispatchModel.setIsImport(Constants.BOOL_FALSE);