Merge pull request '修改bug' (#234) from feature_mps_2 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/234

services/ap/implments/Balance.service.impl.go

@@ -80,7 +80,7 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User,
 	//dao_ArticleStockLevel := dal.NewArticleStockLevelDAO(session, user.PlantNr, user.UserId)
 	//artResourceDao := dal.NewArticleResourceDAO(session, user.PlantNr, user.UserId)
 	//dao_CustDemandModel := dal.NewCustDemandModelDAO(session, user.PlantNr, user.UserId)
-	dao_Customer := dal_base.NewCustomerDAO(session, user.PlantNr, user.UserId)
+	//dao_Customer := dal_base.NewCustomerDAO(session, user.PlantNr, user.UserId)
 	//dao_MpsSetting := dal.NewMpsSettingDAO(session, user.PlantNr, user.UserId)
 	//dao_plant := dal_base.NewPlantDAO(session, user.UserId)
 	//
@@ -120,14 +120,20 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User,
 	var custArtlst1, custArtlst2, custArtlst3 []string
 	var CustomerList []interface{}
 	if CustomerId != "" {
-		customerInfo, err := dao_Customer.SelectOne(CustomerId)
-		if err != nil {
-			return nil, grmi.NewDataBaseError(err)
-		}
-		if customerInfo == nil {
-			return nil, grmi.NewBusinessError("未找到该用户数据")
+		//customerInfo, err := dao_Customer.SelectOne(CustomerId)
+		//if err != nil {
+		//	return nil, grmi.NewDataBaseError(err)
+		//}
+		//if customerInfo == nil {
+		//	return nil, grmi.NewBusinessError("未找到该用户数据")
+		//}
+		//CustomerList = append(CustomerList, CustomerId)
+		//
+		for _, customer := range alldata_Customer{
+			if strings.Contains(customer.CustomerId, CustomerId){
+				CustomerList = append(CustomerList, CustomerId)
+			}
 		}
-		CustomerList = append(CustomerList, CustomerId)
 
 		for _, custArtInfo := range alldata_CustArtlst{
 			for _, customerId := range CustomerList{
@@ -150,7 +156,11 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User,
 		//if err != nil {
 		//	return nil, grmi.NewDataBaseError(err)
 		//}
-		custArtlst2 = append(custArtlst2, ArtId)
+		for _, artId := range alldata_Article{
+			if strings.Contains(artId.ArtId, ArtId){
+				custArtlst2 = append(custArtlst2, artId.ArtId)
+			}
+		}
 	} else {
 		custArtlst2 = artList
 	}

services/ap/implments/PlanOrderVersion.service.impl.go

@@ -142,6 +142,10 @@ func (impl *PlanOrderVersionServiceImplement) Publish(info utils.ChannelsInfo) (
 	if !ok || entity.PlanOrderId == "" {
 		panic("消息体类型错误跳过消息")
 	}
+
+	alldata_ArticleDemand = make([]model.ArticleDemand, 0)
+	session.Table("AP_ArticleDemand").Find(&alldata_ArticleDemand)
+
 	dao := dal.NewPlanOrderVersionDAO(session, entity.PlantNr, "system")
 	entity.Status = 40
 	_ = dao.UpdateOne(&entity)
@@ -161,7 +165,7 @@ func (impl *PlanOrderVersionServiceImplement) Publish(info utils.ChannelsInfo) (
 	ids := ""
 	_init := utilService.PLN_PLANORDER_Init()
 	for _, v := range detailList {
-		_ids, err := _init.Save(v.PlantNr, "system", &v)
+		_ids, err := _init.Save(v.PlantNr, "system", &v,&alldata_Article)
 		if err != nil || _ids == "" {
 			//删除计划订单 并停止程序将状态修改为100  并且删除之前创建订单
 			if ids != "" {

utils/k3cloud/service/PLN_PLANORDER.go

@@ -7,6 +7,7 @@ import (
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
 	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
+	model_base "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
 	utils2 "leit.com/LAPP_CHEERSSON_BACKEND/utils"
 	_struct "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct/PLN_PLANORDER"
@@ -72,7 +73,7 @@ func (_this *PLN_PLANORDER_Service) Search(FilterString, OrderString string) [][
 	return data
 }
 
-func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDemand *model.PlanOrder) (string, error) {
+func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDemand *model.PlanOrder,alldata_Article *[]model_base.Article) (string, error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
@@ -90,6 +91,28 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 		articleDemand.PlanDate = grmi.Date(time.Now())
 	}
 	saturday := grmi.Date(utils2.WeekDaySundayZeroTs(articleDemand.PlanDate.Restore()))
+
+	FBillTypeID := ""
+	FReleaseType := ""
+
+	for _, article := range *alldata_Article{
+		if article.ArtId == articleDemand.ArtId{
+			if article.ArtSize1 == "1"{
+				FBillTypeID = "CGSQD01_SYS"
+				FReleaseType = "3"
+			}
+			if article.ArtSize1 == "3"{
+				FBillTypeID = "WWDD01_SYS"
+				FReleaseType = "2"
+			}
+			if article.ArtSize1 == "2"{
+				FBillTypeID = "SCDD05_SYS"
+				FReleaseType = "1"
+			}
+			break
+		}
+	}
+
 	request := request2.SaveRequest{
 		IsDeleteEntry:         true,
 		IsVerifyBaseDataField: false,
@@ -101,7 +124,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 			FReleaseStatus: "0", //计划
 			//FID: 0,
 			FBillTypeID: _struct.FNumber{
-				FNumber: "JHDD01_SYS",
+				FNumber: FBillTypeID,
 			},
 			FSupplyOrgID: _struct.FNumber{
 				FNumber: utils2.K3Obj.FUseOrgNo,
@@ -112,7 +135,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 			FMaterialID: _struct.FNumber{
 				FNumber: article.ArtId,
 			},
-			FReleaseType: "",
+			FReleaseType: FReleaseType,
 			FSupplyMaterialID: _struct.FNumber{
 				FNumber: article.ArtId,
 			},
@@ -139,7 +162,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 			FIsMRP:       false,
 			FSubEntity: PLN_PLANORDER.FSubEntity{
 				FReleaseBillType: _struct.FNumber{
-					FNumber: "SCDD05_SYS",
+					FNumber:FBillTypeID,
 				},
 				FYieldRate:    100,
 				FBaseYieldQty: int(articleDemand.PlanQty),