From 03cf8f27122be9a738b8814533e52550638fcda7 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期五, 03 一月 2025 19:40:23 +0800
Subject: [PATCH] 工单bom下发接口
---
.vscode/settings.json | 3
billion-admin/pom.xml | 4 +
billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java | 31 +++++++--
billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java | 22 ++++++
billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java | 19 +++++
billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java | 8 +-
billion-main/src/main/java/com/billion/main/api/service/impl/WorkOrdersInfoServiceImpl.java | 48 ++++++---------
7 files changed, 90 insertions(+), 45 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index c5f3f6b..b84f89c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "java.configuration.updateBuildConfiguration": "interactive"
+ "java.configuration.updateBuildConfiguration": "interactive",
+ "java.compile.nullAnalysis.mode": "automatic"
}
\ No newline at end of file
diff --git a/billion-admin/pom.xml b/billion-admin/pom.xml
index 4acf3de..b8b9551 100644
--- a/billion-admin/pom.xml
+++ b/billion-admin/pom.xml
@@ -65,6 +65,10 @@
<groupId>com.billion</groupId>
<artifactId>billion-main</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
</dependencies>
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 dd5be53..72d0b29 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,20 +1,18 @@
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;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.service.IOmProductionOrderInfoService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
/**
* 鐗╂枡閲囬泦Service涓氬姟灞傚鐞�
@@ -23,7 +21,6 @@
* @date 2024-11-22
*/
@Service
-@Component
public class WorkOrdersInfoServiceImpl implements IWorkOrdersInfoService
{
@Autowired
@@ -40,14 +37,11 @@
try {
BsBomInfo bsBomInfo = new BsBomInfo();
- Long l = 1002L;
- bsBomInfo.setId(l);
bsBomInfo.setBomCode(workOrdersInfo.getBomName());
bsBomInfo.setBomName(workOrdersInfo.getBomName());
bsBomInfo.setProductCode(workOrdersInfo.getMaterialNumber());
bsBomInfo.setProductName(workOrdersInfo.getMaterialNumber());
- bsBomInfoService.insertBsBomInfo(bsBomInfo);
-
+ bsBomInfoService.save(bsBomInfo);
OmProductionOrderInfo omProductionOrderInfo = new OmProductionOrderInfo();
omProductionOrderInfo.setWorkOrderNo(workOrdersInfo.getOrderNumber());
@@ -55,29 +49,27 @@
omProductionOrderInfo.setProductCode(workOrdersInfo.getMaterialNumber());
omProductionOrderInfo.setEngineType(workOrdersInfo.getEngineType());
omProductionOrderInfo.setEngineName(workOrdersInfo.getEngineName());
-// omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
- omProductionOrderInfo.setPlanStartTime(workOrdersInfo.getStartTime());
+ omProductionOrderInfo.setPlanQty(Long.valueOf(workOrdersInfo.getProductionPlan()));
+ omProductionOrderInfo.setPlanStartTime(workOrdersInfo.getStartTime()));
omProductionOrderInfo.setRemarks(workOrdersInfo.getDescription());
omProductionOrderInfo.setOrderStatus(workOrdersInfo.getState());
omProductionOrderInfo.setFlag(workOrdersInfo.getFLAG());
- omProductionOrderInfoService.insertOmProductionOrderInfo(omProductionOrderInfo);
+ 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);
- }
+// 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);
diff --git a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
index 59b1766..c6a4121 100644
--- a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
+++ b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
@@ -1,10 +1,11 @@
package com.billion.main.bs.domain;
import com.billion.common.annotation.Excel;
-import com.billion.main.common.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍩虹BOM瀛愪俊鎭璞� bs_bom_child_info
@@ -13,7 +14,7 @@
* @date 2024-11-25
*/
@Data
-public class BsBomChildInfo extends BaseEntity
+public class BsBomChildInfo
{
private static final long serialVersionUID = 1L;
@@ -67,6 +68,20 @@
@Excel(name = "鏄惁鎵归噺鎵弿")
private String checked;
+ /** 鍒涘缓鑰� */
+ private String createBy;
+
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
+ private String updateBy;
+
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
public void setCostQty(String count) {
diff --git a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java
index 18d6bac..4da6f86 100644
--- a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java
+++ b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomInfo.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.billion.common.annotation.Excel;
-import com.billion.main.common.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+
+import java.util.Date;
/**
* 鍩虹BOM瀵硅薄 bs_bom_info
@@ -12,7 +14,7 @@
* @date 2024-11-25
*/
@Data
-public class BsBomInfo extends BaseEntity
+public class BsBomInfo
{
private static final long serialVersionUID = 1L;
@@ -57,5 +59,21 @@
private String delFlag;
+ /** 鍒涘缓鑰� */
+ private String createBy;
+
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
+ private String updateBy;
+
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+
+
}
diff --git a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
index fc8076d..2358d59 100644
--- a/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
+++ b/billion-main/src/main/java/com/billion/main/om/domain/OmProductionOrderInfo.java
@@ -1,7 +1,7 @@
package com.billion.main.om.domain;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.billion.common.annotation.Excel;
-import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@@ -14,8 +14,12 @@
* @date 2024-11-20
*/
@Data
-public class OmProductionOrderInfo extends BaseEntity
+public class OmProductionOrderInfo
{
+ @TableId
+ /** 涓婚敭id */
+ private Long id;
+
/** 宸ュ崟缂栧彿 */
@Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
@@ -37,13 +41,13 @@
private Long planQty;
/** 璁″垝寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planStartTime;
/** 璁″垝缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndTime;
/** 宸ュ崟鐘舵�侊紙1鏈紑濮�2鐢熶骇涓�3宸插畬鎴�4宸插叧闂級 */
@@ -65,7 +69,18 @@
/** 璁㈠崟鐘舵�� */
@Excel(name = "璁㈠崟鐘舵��")
private String flag;
+ /** 鍒涘缓鑰� */
+ private String createBy;
- public void setPlanStartTime(String startTime) {
- }
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /** 鏇存柊鑰� */
+ private String updateBy;
+
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
}
diff --git a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
index c9a60a2..ab8d6cf 100644
--- a/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
+++ b/billion-main/src/main/java/com/billion/main/om/service/impl/OmProductionOrderInfoServiceImpl.java
@@ -7,15 +7,14 @@
import com.billion.common.core.domain.model.LoginUser;
import com.billion.common.exception.ServiceException;
import com.billion.common.utils.SecurityUtils;
-import com.billion.main.common.BaseEntity;
import com.billion.main.om.domain.OmProductionOrderInfo;
import com.billion.main.om.mapper.OmProductionOrderInfoMapper;
import com.billion.main.om.service.IOmProductionOrderInfoService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+
/**
* 鐢熶骇宸ュ崟Service涓氬姟灞傚鐞�
*
@@ -85,9 +84,10 @@
@Override
public int updateOmProductionOrderInfo(OmProductionOrderInfo omProductionOrderInfo)
{
+ Collection<Long> omProductionOrderInfoIds = Collections.emptyList();
List<OmProductionOrderInfo> checkList = this.list(new LambdaQueryWrapper<OmProductionOrderInfo>()
.eq(OmProductionOrderInfo::getWorkOrderNo, omProductionOrderInfo.getWorkOrderNo())
- .notIn(BaseEntity::getId,omProductionOrderInfo.getId()));
+ .notIn(OmProductionOrderInfo::getId, omProductionOrderInfoIds));
// .stream().filter(x -> !x.getId().equals(omProductionOrderInfo.getId()))
// .collect(Collectors.toList());
if (CollUtil.isNotEmpty(checkList)){
--
Gitblit v1.9.3