Merge pull request '根据数据表的修改修改供应商门户处接收处理的数据' (#173) from feature_log into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/173
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

models/log/log.go

@@ -18,7 +18,7 @@ const (
  *
  ******************************************************************************/
 type ArtDemandLstStatusChange struct {
-	ArtId string `json:"artId"`
+	DemandId string `json:"demandId"`
 	Pos   int `json:"pos"`
 }
 

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

@@ -774,7 +774,7 @@ func (impl *ArtDemandHeadServiceImplement) ChangeArtDemandHeadStatus(user *model
 	// 校验每个ArtDemandHead的状态 再修改status
 	for _, record := range records {
 
-		artDemandHead, err := dao.SelectOne(record.DemandId, record.ArtId)
+		artDemandHead, err := dao.SelectOne(record.ArtId, record.DemandId)
 		if err != nil {
 			return err
 		}

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

@@ -766,29 +766,29 @@ func (impl *ArtDemandLstServiceImplement) ChangeArtDemandLstStatus(user *models.
 	artDemandLstList := make([]model.ArtDemandLst, len(records))
 	// 校验每个ArtDemandLst的状态 再修改status
 	for index, record := range records {
-		artDemandLst, err := dao.SelectOne(record.ArtId, record.Pos)
+		artDemandLst, err := dao.SelectOne(record.DemandId, record.Pos)
 		if err != nil {
 			return err
 		}
 		if artDemandLst == nil {
-			return grmi.NewBusinessError(fmt.Sprintf("该条数据不存在, artId: %s, Pos: %d", record.ArtId, record.Pos))
+			return grmi.NewBusinessError(fmt.Sprintf("该条数据不存在, demandId: %s, Pos: %d", record.DemandId, record.Pos))
 		}
 		switch operateType {
 		case "receive":
 			if artDemandLst.Status != model.WaitReceivingStatus {
-				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, artId: %s, Pos: %d", record.ArtId, record.Pos))
+				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, demandId: %s, Pos: %d", record.DemandId, record.Pos))
 			}
 			artDemandLst.Status = model.ReceivedStatus
 			artDemandLst.DemandRecieveTime = grmi.DateTime(time.Now())
 		case "confirm":
 			if artDemandLst.Status != model.ReceivedStatus {
-				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, artId: %s, Pos: %d", record.ArtId, record.Pos))
+				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, demandId: %s, Pos: %d", record.DemandId, record.Pos))
 			}
 			artDemandLst.Status = model.ConfirmedStatus
 			artDemandLst.DemandConfirmTime = grmi.DateTime(time.Now())
 		case "accomplish":
 			if artDemandLst.Status != model.ConfirmedStatus {
-				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, artId: %s, Pos: %d", record.ArtId, record.Pos))
+				return grmi.NewBusinessError(fmt.Sprintf("计划明细状态与您的操作不相符, demandId: %s, Pos: %d", record.DemandId, record.Pos))
 			}
 			artDemandLst.Status = model.AccomplishedStatus
 			artDemandLst.DemandCloseTime = grmi.DateTime(time.Now())