From 13879f780c6124db20d1d3ad25d182dc06ddf257 Mon Sep 17 00:00:00 2001
From: zhangxin <xin.zhang@le-it.com.cn>
Date: Fri, 19 Aug 2022 17:51:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../om/implments/SerialOrder.Logic.impl.go    | 33 +++++++++++--------
 .../implments/CustOrder.CrossPlant.impl.go    |  3 +-
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/services/om/implments/SerialOrder.Logic.impl.go b/services/om/implments/SerialOrder.Logic.impl.go
index 14be3a4..e7c3d4c 100644
--- a/services/om/implments/SerialOrder.Logic.impl.go
+++ b/services/om/implments/SerialOrder.Logic.impl.go
@@ -706,7 +706,7 @@ func (impl *SerialOrderServiceImplement) ExtractArchiveData(user *global.User, s
 	orderDao := dal.NewSerialOrderDAO(session, user.PlantNr, user.UserId)
 	slaveOrderDao := dal.NewSerialOrderDAO(slaveSession, user.PlantNr, user.UserId)
 	statusDao := dal.NewSerialOrderStatusDAO(session, user.PlantNr, user.UserId)
-	slaveStatusDao := dal.NewSerialOrderStatusDAO(slaveSession, user.PlantNr, user.UserId)
+	//slaveStatusDao := dal.NewSerialOrderStatusDAO(slaveSession, user.PlantNr, user.UserId)
 	poDao := dal.NewSerialOrderPOLstDAO(session, user.PlantNr, user.UserId)
 	slavePoDao := dal.NewSerialOrderPOLstDAO(slaveSession, user.PlantNr, user.UserId)
 	stepDao := dal.NewSerialOrderStepLstDAO(session, user.PlantNr, user.UserId)
@@ -738,17 +738,22 @@ func (impl *SerialOrderServiceImplement) ExtractArchiveData(user *global.User, s
 	}
 	recoverSerialOrderLi := append(serialOrderLi, *serialOrder)
 	serialOrderIdLi := make([]interface{}, 0, len(recoverSerialOrderLi))
+	statusLi := make([]model.SerialOrderStatus, 0, len(recoverSerialOrderLi))
 	for index, order := range recoverSerialOrderLi {
 		order.ShipBackFlush = false
 		recoverSerialOrderLi[index] = order
 		serialOrderIdLi = append(serialOrderIdLi, order.SerialOrderId)
-	}
-	statusLi, err := slaveStatusDao.Select([]grmi.Predicate{
-		meta.SerialOrderStatus_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
-	}, nil)
-	if err != nil {
-		return grmi.NewBusinessError("查询工单状态失败, 错误:" + err.Error())
-	}
+		statusLi = append(statusLi, model.SerialOrderStatus{
+			SerialOrderId: order.SerialOrderId,
+			Status: baseModel.WO_STATUS_FINISHED,
+		})
+	}
+	//statusLi, err := slaveStatusDao.Select([]grmi.Predicate{
+	//	meta.SerialOrderStatus_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
+	//}, nil)
+	//if err != nil {
+	//	return grmi.NewBusinessError("查询工单状态失败, 错误:" + err.Error())
+	//}
 	poLi, err := slavePoDao.Select([]grmi.Predicate{
 		meta.SerialOrderPOLst_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
 	}, nil)
@@ -817,12 +822,12 @@ func (impl *SerialOrderServiceImplement) ExtractArchiveData(user *global.User, s
 	if err != nil {
 		return grmi.NewBusinessError("删除备份库数据失败， 错误:" + err.Error())
 	}
-	err = slaveStatusDao.DeleteWhere([]grmi.Predicate{
-		meta.SerialOrderStatus_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
-	})
-	if err != nil {
-		return grmi.NewBusinessError("删除备份库数据失败， 错误:" + err.Error())
-	}
+	//err = slaveStatusDao.DeleteWhere([]grmi.Predicate{
+	//	meta.SerialOrderStatus_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
+	//})
+	//if err != nil {
+	//	return grmi.NewBusinessError("删除备份库数据失败， 错误:" + err.Error())
+	//}
 	err = slavePoDao.DeleteWhere([]grmi.Predicate{
 		meta.SerialOrderPOLst_SerialOrderId.NewPredicate(grmi.Include, serialOrderIdLi...),
 	})
diff --git a/services/pln/implments/CustOrder.CrossPlant.impl.go b/services/pln/implments/CustOrder.CrossPlant.impl.go
index c72f783..dc7564a 100644
--- a/services/pln/implments/CustOrder.CrossPlant.impl.go
+++ b/services/pln/implments/CustOrder.CrossPlant.impl.go
@@ -36,7 +36,7 @@ func (impl *CustOrderServiceImplement) GenerateCrossPlantTaskData(task baseModel
 
 	// 根据任务的物料 获取是哪个CarSet
 	// 根据物料id排序 生成key
-	productFamilyRelateLi, err := productFamilyRelateDao.Select([]grmi.Predicate{
+	productFamilyRelateLi, err := productFamilyRelateDao.Select([]grmi.Predicate{meMeta.ProductFamilyRelate_ProjectId.NewPredicate(grmi.Equal, task.ProjectId),
 	}, []grmi.Field{meMeta.ProductFamilyRelate_ProductFamilyId, meMeta.ProductFamilyRelate_ProductId})
 	if err != nil {
 		return grmi.NewBusinessError("查询派生总成关联关系失败")
@@ -74,6 +74,7 @@ func (impl *CustOrderServiceImplement) GenerateCrossPlantTaskData(task baseModel
 	}
 	productFamilyLi, err := productFamilyDao.Select([]grmi.Predicate{
 		meMeta.ProductFamily_ProductFamilyId.NewPredicate(grmi.Include, productFamilyIdLi...),
+		meMeta.ProductFamily_ProjectId.NewPredicate(grmi.Equal, task.ProjectId),
 		meMeta.ProductFamily_Enable.NewPredicate(grmi.Equal, true),
 		meMeta.ProductFamily_MultiWorkLineToggle.NewPredicate(grmi.Equal, false),
 	}, []grmi.Field{meMeta.ProductFamily_ProductFamilyId})