金蝶更新

dao/ap/implments/CustDemandVerHead.dao.impl.go

@@ -345,7 +345,7 @@ func (impl *CustDemandVerHeadDAOImplement) IssueVersion(entity *model.CustDemand
 func (impl *CustDemandVerHeadDAOImplement) IssueGlobalVersion(entity *model.CustDemandVerHead) error {
 	entity.PlantNr = impl.plantNr
 	entity.LastUser = impl.userid
-	_, err := impl.session.Table(impl.meta.TableName).Cols("GlobalPublish,PublishId,PublishNumber").ID(entity.GetKey()).Update(entity)
+	_, err := impl.session.Table(impl.meta.TableName).Cols("GlobalPublish,PublishId,PublishNumber,PublishStatus").ID(entity.GetKey()).Update(entity)
 	if err != nil {
 		return grmi.NewDataBaseError(err)
 	}
@@ -439,7 +439,7 @@ func (impl *CustDemandVerHeadDAOImplement) SelectDataCount(customerId string, ve
 		}
 
 		data := new(model.CustomerCount)
-		count,err := session.Count(data)
+		count, err := session.Count(data)
 		if err != nil {
 			return 0, grmi.NewDataBaseError(err)
 		}
@@ -461,7 +461,7 @@ func (impl *CustDemandVerHeadDAOImplement) SelectDataCount(customerId string, ve
 		}
 
 		data := new(model.CustomerCount)
-		count,err := session.Count(data)
+		count, err := session.Count(data)
 		if err != nil {
 			return 0, grmi.NewDataBaseError(err)
 		}

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

@@ -1141,14 +1141,20 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 	if IssueInfo.GlobalPublish == baseModel.STATUS_INT_YES {
 		return errors.New("该版本已经全局发布!")
 	}
+	plnForecastSdk := utilService.PlnForecastInit()
 	//查询未关闭预测版本 未找到
-	//_list, err := dao.Select([]grmi.Predicate{
-	//	meta.CustDemandVerHead_CustomerId.NewPredicate(grmi.Equal, entity.CustomerId),
-	//	meta.CustDemandVerHead_PublishStatus.NewPredicate(grmi.Equal, baseModel.STATUS_INT_YES),
-	//}, nil)
-	//for _, v := range _list {
-	//
-	//}
+	_list, err := dao.Select([]grmi.Predicate{
+		meta.CustDemandVerHead_CustomerId.NewPredicate(grmi.Equal, entity.CustomerId),
+		meta.CustDemandVerHead_PublishStatus.NewPredicate(grmi.Equal, baseModel.STATUS_INT_YES),
+	}, nil)
+	closeId := ""
+	for k, v := range _list {
+		if k > 0 {
+			closeId += ","
+		}
+		closeId += v.PublishId
+	}
+	_ = plnForecastSdk.CloseForecast(closeId)
 	entity.GlobalPublish = baseModel.STATUS_INT_YES
 	err = detailDao.IssueVersion(entity.CustomerId, entity.VersionId)
 	if err != nil {
@@ -1244,7 +1250,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 	ResultId := ""
 	ResultNumber := ""
 	for k, v := range request {
-		response, err := utilService.PlnForecastInit().SaveForecast(pln_forecast.PlnForecastSave{
+		response, err := plnForecastSdk.SaveForecast(pln_forecast.PlnForecastSave{
 			FForeOrgID: _struct.FNumber{
 				FNumber: k,
 			},

utils/k3cloud/service/PLN_PLANORDER.go

@@ -77,7 +77,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 	dao_Article := dal_base.NewArticleDAO(session, PlantNr, UserId)
 	dao_PlanOrder := dal.NewPlanOrderDAO(session, PlantNr, UserId)
 	article, err := dao_Article.SelectOne(articleDemand.ArtId)
-	if err != nil || article == nil{
+	if err != nil || article == nil {
 		return err
 	}
 
@@ -88,8 +88,8 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 		ValidateFlag:          true,
 		NumberSearch:          true,
 		Model: PLN_PLANORDER.PLN_PLANORDER_SAVE{
-			F_RDPB_MPSVNO: articleDemand.DemandKey+"_"+ strconv.Itoa(articleDemand.VersionNr),
-			FReleaseStatus:"0",//计划
+			F_RDPB_MPSVNO:  articleDemand.DemandKey + "_" + strconv.Itoa(articleDemand.VersionNr),
+			FReleaseStatus: "0", //计划
 			//FID: 0,
 			FBillTypeID: _struct.FNumber{
 				FNumber: "JHDD01_SYS",
@@ -141,7 +141,7 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 
 	response, err := _this.SaveApi(_this.FormID, request)
 
-	if err == nil && response.Result.ResponseStatus.IsSuccess == true{
+	if err == nil && response.Result.ResponseStatus.IsSuccess == true {
 		articleDemand.Operator = strconv.Itoa(response.Result.ID)
 		dao_PlanOrder.UpdateOne(articleDemand)
 	}
@@ -150,15 +150,10 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 }
 
 func (_this *PLN_PLANORDER_Service) Close(PlantNr int, UserId string, articleDemand *model.PlanOrder) error {
-	engine := db.Eloquent.Master()
-	session := engine.NewSession()
-	defer session.Close()
-
 	request := request2.CloseRequest{
-		Ids:articleDemand.Operator,
+		Ids: articleDemand.Operator,
 	}
 
 	_, err := _this.BillCloseApi(_this.FormID, request)
 	return err
 }
-

utils/k3cloud/service/pln_forecast.go

@@ -29,3 +29,12 @@ func (_this *PlnForecastService) SaveForecast(_request pln_forecast.PlnForecastS
 	response, err = _this.SaveApi(_this.FormID, request)
 	return
 }
+
+func (_this *PlnForecastService) CloseForecast(ids string) error {
+	request := request2.CloseRequest{
+		Ids: ids,
+	}
+
+	_, err := _this.BillCloseApi(_this.FormID, request)
+	return err
+}