From 1036f6d81177acbaf740f8a9983431b6b6d23580 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期六, 15 十月 2022 16:02:39 +0800
Subject: [PATCH] 物料属性和产品bom属性更新
---
src/main/java/com/whyc/service/ProductService.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/ProductService.java b/src/main/java/com/whyc/service/ProductService.java
index 52b76f7..8d64a02 100644
--- a/src/main/java/com/whyc/service/ProductService.java
+++ b/src/main/java/com/whyc/service/ProductService.java
@@ -464,6 +464,12 @@
bomHistory.setProductId(his.getId());
bomHistory.setMaterialId(bom.getMaterialId());
bomHistory.setQuantity(bom.getQuantity());
+ bomHistory.setCategory(bom.getCategory());
+ bomHistory.setMaterial(bom.getMaterial());
+ bomHistory.setNotes(bom.getNotes());
+ bomHistory.setProducer(bom.getProducer());
+ bomHistory.setSurfaceDetail(bom.getSurfaceDetail());
+ bomHistory.setThickness(bom.getThickness());
bomHistory.setSubSVersion(1);
bomHistory.setSubEVersion(1);
bomHistoryList.add(bomHistory);
@@ -587,21 +593,15 @@
bomList.forEach(bom -> {
if (!subCodeList.contains(bom.getSubCode()+"/"+bom.getSubModel())) {
Material material = new Material();
- material.setCategory(bom.getCategory());
material.setCreateDate(date);
material.setDwgUrl(bom.getDwgUrl());
material.setFileUrl(bom.getFileUrl());
- material.setMaterial(bom.getMaterial());
- material.setNotes(bom.getNotes());
material.setPictureUrl(bom.getPictureUrl());
- material.setProducer(bom.getProducer());
// TODO 鏄惁瑕佹洿鏂板悓鐗╂枡缂栫爜鐨勮�佺墿鏂欑姸鎬佷负0?
material.setStatus(1);
material.setSubCode(bom.getSubCode());
material.setSubModel(bom.getSubModel());
material.setSubName(bom.getSubName());
- material.setSurfaceDetail(bom.getSurfaceDetail());
- material.setThickness(bom.getThickness());
material.setType(bom.getType());
material.setUnit(bom.getUnit());
@@ -654,6 +654,12 @@
bom.setProductId(product.getId());
bom.setMaterialId(bomMaterial.getId());
bom.setQuantity(bomMaterial.getQuantity());
+ bom.setCategory(bomMaterial.getCategory());
+ bom.setMaterial(bomMaterial.getMaterial());
+ bom.setNotes(bomMaterial.getNotes());
+ bom.setProducer(bomMaterial.getProducer());
+ bom.setSurfaceDetail(bomMaterial.getSurfaceDetail());
+ bom.setThickness(bomMaterial.getThickness());
bom.setSubVersion(1);
bom.setCreateDate(date);
@@ -667,6 +673,12 @@
bomHistory.setProductId(productHistory.getId());
bomHistory.setMaterialId(bomMaterial.getId());
bomHistory.setQuantity(bomMaterial.getQuantity());
+ bomHistory.setCategory(bomMaterial.getCategory());
+ bomHistory.setMaterial(bomMaterial.getMaterial());
+ bomHistory.setNotes(bomMaterial.getNotes());
+ bomHistory.setProducer(bomMaterial.getProducer());
+ bomHistory.setSurfaceDetail(bomMaterial.getSurfaceDetail());
+ bomHistory.setThickness(bomMaterial.getThickness());
bomHistory.setSubSVersion(1);
bomHistory.setSubEVersion(1);
bomHistory.setCreateDate(date);
--
Gitblit v1.9.1