Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om

models/log/log.go

@@ -235,7 +235,6 @@ type SyncArtDemandLst struct {
 	CreateTime         grmi.DateTime `xorm:"datetime 'CreateTime' not null" json:"LOG_ArtDemandLst-CreateTime"`
 }
 
-
 /******************************************************************************
  *
  * @Struct Name              : SyncArtDemandHeadCache
@@ -364,7 +363,8 @@ type SyncArtDemandLstCache struct {
  *
  ******************************************************************************/
 type CreatePackOrderInfo struct {
-	InfoType string         `json:"InfoType"`
-	Message  string         `json:"Message"`
-	Items    []PackTemplate `json:"Items"`
+	InfoType    string         `json:"InfoType"`
+	PackOrderId string         `json:"PackOrderId"`
+	Message     string         `json:"Message"`
+	Items       []PackTemplate `json:"Items"`
 }

services/log/implments/PackOrder.service.impl.go

@@ -918,6 +918,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 		}
 		packsession.Commit()
 		result := new(model.CreatePackOrderInfo)
+		result.PackOrderId = packOrderId
 		result.InfoType = model.PackOrder_Success
 		result.Message = "成功创建包装单!"
 		return result, nil
@@ -1038,6 +1039,7 @@ func (self *PackOrderServiceImplement) SelectTemplates(user *models.Usertab, ord
 		packsession.Commit()
 		result := new(model.CreatePackOrderInfo)
 		result.InfoType = model.PackOrder_Success
+		result.PackOrderId = packOrderId
 		result.Message = "成功创建包装单!"
 		result.Items = packTemplants
 		return result, nil