From 53cced5d293ea7ea48055deb18c5962442f86585 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 03 一月 2025 20:10:02 +0800
Subject: [PATCH] 工单bom下发接口
---
billion-main/src/main/java/com/billion/main/api/RestfulAPI.java | 1 -
billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java | 57 +++++++++++++++++++++++++++++++--------------------------
2 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
index 2be3455..cf2e03c 100644
--- a/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
+++ b/billion-main/src/main/java/com/billion/main/api/RestfulAPI.java
@@ -32,7 +32,6 @@
try {
// 璋冪敤service灞備繚瀛樻暟鎹�
boolean saveResult = iWorkOrdersInfoService.saveWorkOrders(workOrdersInfo);
-
// 鏋勫缓鍝嶅簲鏁版嵁
ApiResponse response = new ApiResponse();
List<ApiResponse.ResponseData> dataList = new ArrayList<>();
diff --git a/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
index 72d0b29..80d8a6e 100644
--- a/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java
@@ -1,7 +1,9 @@
package com.billion.main.api.service.impl;
import com.billion.main.api.domain.WorkOrdersInfo;
+import com.billion.main.api.domain.WorkOrdersInfoChild;
import com.billion.main.api.service.IWorkOrdersInfoService;
+import com.billion.main.bs.domain.BsBomChildInfo;
import com.billion.main.bs.domain.BsBomInfo;
import com.billion.main.bs.service.IBsBomChildInfoService;
import com.billion.main.bs.service.IBsBomInfoService;
@@ -11,8 +13,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
/**
* 鐗╂枡閲囬泦Service涓氬姟灞傚鐞�
@@ -35,14 +38,7 @@
@Override
public boolean saveWorkOrders(WorkOrdersInfo workOrdersInfo) {
try {
-
- BsBomInfo bsBomInfo = new BsBomInfo();
- bsBomInfo.setBomCode(workOrdersInfo.getBomName());
- bsBomInfo.setBomName(workOrdersInfo.getBomName());
- bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
- bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
- bsBomInfoService.save(bsBomInfo);
-
+ //淇濆瓨宸ュ崟淇℃伅
OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
omProductionOrderInfo.setSalesOrderCode(workOrdersInfo.getBatchNumber());
@@ -50,26 +46,35 @@
omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
- omProductionOrderInfo.setPlanStartTime(workOrdersInfo.getStartTime()));
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date startTime = sdf.parse(workOrdersInfo.getStartTime());
+ omProductionOrderInfo.setPlanStartTime(startTime);
omProductionOrderInfo.setRemarks(workOrdersInfo.getDescription());
omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
omProductionOrderInfoService.save(omProductionOrderInfo);
-
-// List<WorkOrdersInfoChild> childList = workOrdersInfo.getData();
-// for (WorkOrdersInfoChild child : childList) {
-// BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
-// bsBomChildInfo.setProductCode(workOrdersInfo.getMaterialNumber());
-// bsBomChildInfo.setProductName(workOrdersInfo.getMaterialNumber());
-// bsBomChildInfo.setBomCode(workOrdersInfo.getBomName());
-// bsBomChildInfo.setLocationCode(child.getStationName());
-// bsBomChildInfo.setLocationName(child.getStationName());
-// bsBomChildInfo.setMaterialCode(child.getMaterial());
-// bsBomChildInfo.setCostQty(child.getCount());
-// bsBomChildInfo.setChecked(child.getChecked());
-// bsBomChildInfo.setMaterialName(child.getMaterialName());
-// bsBomChildInfoService.save(bsBomChildInfo);
-// }
+ //淇濆瓨BOM涓昏〃淇℃伅
+ BsBomInfo bsBomInfo = new BsBomInfo();
+ bsBomInfo.setBomCode(workOrdersInfo.getBomName());
+ bsBomInfo.setBomName(workOrdersInfo.getBomName());
+ bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
+ bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
+ bsBomInfoService.save(bsBomInfo);
+ //淇濆瓨BOM瀛愯〃淇℃伅
+ List<WorkOrdersInfoChild> childList = workOrdersInfo.getData();
+ for (WorkOrdersInfoChild child : childList) {
+ BsBomChildInfo bsBomChildInfo = new BsBomChildInfo();
+ bsBomChildInfo.setProductCode(workOrdersInfo.getMaterialNumber());
+ bsBomChildInfo.setProductName(workOrdersInfo.getMaterialNumber());
+ bsBomChildInfo.setBomCode(workOrdersInfo.getBomName());
+ bsBomChildInfo.setLocationCode(child.getStationName());
+ bsBomChildInfo.setLocationName(child.getStationName());
+ bsBomChildInfo.setMaterialCode(child.getMaterial());
+ bsBomChildInfo.setCostQty(child.getCount());
+ bsBomChildInfo.setChecked(child.getChecked());
+ bsBomChildInfo.setMaterialName(child.getMaterialName());
+ bsBomChildInfoService.save(bsBomChildInfo);
+ }
return true;
} catch (Exception e) {
throw new RuntimeException("淇濆瓨宸ュ崟淇℃伅澶辫触", e);
--
Gitblit v1.9.3