From 6bea3964153447a90cba4d73622fc0c9d3fe8c54 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sun, 24 Dec 2023 11:44:28 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E8=87=AA=E5=8A=A8=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E7=94=9F=E4=BA=A7BOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/base/BaseMaterialinfoMapper.xml       |  1 +
 .../com/aucma/production/domain/BaseBomInfo.java | 16 ++++++++++++++++
 .../service/impl/BaseBomInfoServiceImpl.java     | 16 +++++++++++++++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
index 2a2165e..1718988 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseMaterialinfoMapper.xml
@@ -70,6 +70,7 @@
             <if test="updatedBy != null  and updatedBy != ''"> and ml.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null "> and ml.updated_time = #{updatedTime}</if>
         </where>
+        order by ml.material_subclass, ml.increment_date desc
     </select>
 
     <select id="selectBaseMaterialInfoByObjId" parameterType="Long" resultMap="BaseMaterialInfoResult">
diff --git a/aucma-production/src/main/java/com/aucma/production/domain/BaseBomInfo.java b/aucma-production/src/main/java/com/aucma/production/domain/BaseBomInfo.java
index cfdc6d9..bd6c8e0 100644
--- a/aucma-production/src/main/java/com/aucma/production/domain/BaseBomInfo.java
+++ b/aucma-production/src/main/java/com/aucma/production/domain/BaseBomInfo.java
@@ -127,6 +127,22 @@ public class BaseBomInfo extends TreeStringEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+
+    /**
+     * 祖级编号(成品)
+     */
+    private String ancestors;
+
+    @Override
+    public String getAncestors() {
+        return ancestors;
+    }
+
+    @Override
+    public void setAncestors(String ancestors) {
+        this.ancestors = ancestors;
+    }
+
     @Override
     public String getParentName() {
         return parentName;
diff --git a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
index 8e2c272..c7af42b 100644
--- a/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
+++ b/aucma-production/src/main/java/com/aucma/production/service/impl/BaseBomInfoServiceImpl.java
@@ -230,6 +230,7 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
                 info.setStandardAmount(new BigDecimal(1));
                 info.setPlantCode(baseMaterialInfo.getPlantCode());
                 info.setCreatedTime(DateUtils.getNowDate());
+                info.setAncestors(baseMaterialInfo.getMaterialCode());
                 try {
                     this.insertBaseBomInfo(info);
                 } catch (Exception e) {
@@ -247,6 +248,7 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
             }
             //根据成品产品BOM存箱体、门体
             for (OrderBomInfo orderBomInfo : orderBomInfos) {
+                orderBomInfo.setAncestors(baseMaterialInfo.getMaterialCode());
                 //箱体
                 if (orderBomInfo.getMaterialType().equals(MaterialConstants.BOX_MATERIAL_TYPE)) {
                     this.saveBaseBomInfoByMaterialType(orderBomInfo, MaterialConstants.BOX_MATERIAL_TYPE);
@@ -266,8 +268,18 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
             OrderBomInfo selectBomInfo = new OrderBomInfo();
             selectBomInfo.setParentId(boxBomInfo.getMaterialCode());
             List<OrderBomInfo> bomInfoList = orderBomInfoService.selectOrderBomInfoList(selectBomInfo);
-            //Boolean flag = false; // 判断BOM是否含有预装箱体
+            /*  Boolean isYZXTFlag = false; // 判断BOM是否含有预装箱体
             for (OrderBomInfo orderBomInfo : bomInfoList) {
+                if (orderBomInfo.getMaterialName().contains("预装箱体")){
+                    isYZXTFlag = true;//此BOM有预装箱体
+                    //围板
+                    if (orderBomInfo.getMaterialType().equals(MaterialConstants.COAMING_MATERIAL_TYPE)) {
+                        this.saveBaseBomInfoByMaterialType(orderBomInfo, MaterialConstants.COAMING_MATERIAL_TYPE);
+                    }
+                }
+            }*/
+            for (OrderBomInfo orderBomInfo : bomInfoList) {
+                orderBomInfo.setAncestors(boxBomInfo.getAncestors());
                 //内胆
                 if (orderBomInfo.getMaterialType().equals(MaterialConstants.LINER_MATERIAL_TYPE)) {
                     this.saveBaseBomInfoByMaterialType(orderBomInfo, MaterialConstants.LINER_MATERIAL_TYPE);
@@ -288,6 +300,7 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
             selectBomInfo.setParentId(boxBomInfo.getMaterialCode());
             List<OrderBomInfo> bomInfoList = orderBomInfoService.selectOrderBomInfoList(selectBomInfo);
             for (OrderBomInfo orderBomInfo : bomInfoList) {
+                orderBomInfo.setAncestors(boxBomInfo.getAncestors());
                 //前板
                 if (orderBomInfo.getMaterialType().equals(MaterialConstants.FORMER_MATERIAL_TYPE)) {
                     this.saveBaseBomInfoByMaterialType(orderBomInfo, MaterialConstants.FORMER_MATERIAL_TYPE);
@@ -323,6 +336,7 @@ public class BaseBomInfoServiceImpl implements IBaseBomInfoService {
         info.setParentId(orderBomInfo.getParentId());
         info.setStandardAmount(orderBomInfo.getStandardAmount());
         info.setPlantCode(orderBomInfo.getFactoryCode());
+        info.setAncestors(orderBomInfo.getAncestors());
         try {
             info.setCreatedTime(DateUtils.getNowDate());
             baseBomInfoMapper.insertBaseBomInfo(info);