Merge pull request '完成发布计划功能' (#190) from fix_mps into develop

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

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

@@ -2705,7 +2705,6 @@ func (impl *BalanceServiceImplement) PublishMpsPlan(user *global.User, version s
 
 	// 查找当前周MDS发布的版本数据
 	mdsVersion := fmt.Sprintf("%d.%02d", year, week)
-	fmt.Println("mdsVersion:", mdsVersion)
 	demandHeadList, err := dao_CustDemandVerHead.Select([]grmi.Predicate{meta.CustDemandVerHead_VersionId.NewPredicate(grmi.Equal, mdsVersion)}, nil)
 	if err != nil {
 		return grmi.NewBusinessError("查询全局发布需求数据失败, error:" + err.Error())
@@ -2816,10 +2815,10 @@ func (impl *BalanceServiceImplement) PublishMpsPlan(user *global.User, version s
 				_ = session.Rollback()
 				return grmi.NewBusinessError("取消前一个发布计划失败, 错误:" + err.Error())
 			}
-			//utils.EmailSendStruct["planOrderVersion_cancel"].SeyChannels(utils.ChannelsInfo{
-			//	Key:  utils.ValueToString(prePlanOrderVersion.PlanOrderId, ""),
-			//	Info: *prePlanOrderVersion,
-			//})
+			utils.EmailSendStruct["planOrderVersion_cancel"].SeyChannels(utils.ChannelsInfo{
+				Key:  utils.ValueToString(prePlanOrderVersion.PlanOrderId, ""),
+				Info: *prePlanOrderVersion,
+			})
 		}  else {
 			log, _ := logger.NewLogger(user.UserId, "Balance")
 			log.Error("前一半发布计划已取消, 前一半计划ID:" + prePlanOrderVersion.PlanOrderId)
@@ -2960,10 +2959,10 @@ func (impl *BalanceServiceImplement) PublishMpsPlan(user *global.User, version s
 		return grmi.NewBusinessError("写入外购需求数据失败, 错误:" + err.Error())
 	}
 
-	//utils.EmailSendStruct["planOrderVersion_publish"].SeyChannels(utils.ChannelsInfo{
-	//	Key:  utils.ValueToString(data_PlanOrderVersion.PlanOrderId, ""),
-	//	Info: data_PlanOrderVersion,
-	//})
+	utils.EmailSendStruct["planOrderVersion_publish"].SeyChannels(utils.ChannelsInfo{
+		Key:  utils.ValueToString(data_PlanOrderVersion.PlanOrderId, ""),
+		Info: data_PlanOrderVersion,
+	})
 
 	// 已经发布
 	for index, _ := range demandHeadList {

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

@@ -198,11 +198,15 @@ func (impl *PlanOrderVersionServiceImplement) Cancel(info utils.ChannelsInfo) (b
 	if !ok || entity.PlanOrderId == "" {
 		panic("消息体类型错误跳过消息")
 	}
+	dao := dal.NewPlanOrderVersionDAO(session, entity.PlantNr, "system")
+
 	if entity.Operator == "" {
+		entity.Status = 98
+		_ = dao.UpdateOne(&entity)
+		_ = session.Commit()
 		return false, info
 	}
 	//关闭 调用erp接口
-	dao := dal.NewPlanOrderVersionDAO(session, entity.PlantNr, "system")
 	entity.Status = 97
 	_ = dao.UpdateOne(&entity)
 	_ = session.Commit()

utils/k3cloud/service/PLN_PLANORDER.go

@@ -5,12 +5,14 @@ import (
 	dal "leit.com/LAPP_CHEERSSON_BACKEND/dao/ap"
 	dal_base "leit.com/LAPP_CHEERSSON_BACKEND/dao/base"
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
+	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
 	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"
 	request2 "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct/request"
 	"strconv"
+	"time"
 )
 
 /**
@@ -81,7 +83,9 @@ func (_this *PLN_PLANORDER_Service) Save(PlantNr int, UserId string, articleDema
 	if err != nil || article == nil {
 		return "", err
 	}
-
+	if articleDemand.PlanDate.Restore().Before(time.Now()) {
+		articleDemand.PlanDate = grmi.Date(time.Now())
+	}
 	request := request2.SaveRequest{
 		IsDeleteEntry:         true,
 		IsVerifyBaseDataField: false,