Merge pull request '批量导入，不同版本不能上传' (#174) from fix_importcheck into develop

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

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

@@ -1420,7 +1420,7 @@ func (impl *CustDemandVerHeadServiceImplement) ImportFile(user *global.User, cus
 					one.ArtId = ArtId
 					one.CustomerId = customerId
 					one.VersionId = versionId
-					one.Status = 0
+					one.Status = baseModel.STATUS_INT_NO
 					one.FUseOrgNo = FUseOrgNo
 					one.DemandQty = float64(utils.ValueToInt(vvv, 0))
 					one.DemandWeek = week
@@ -1514,6 +1514,8 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 	//定义一个数组，记录日期,并且与k关联起来
 	tem := make(map[int]string)
 	headMap := make(map[string]model.CustDemandVerHead)
+	//记录版本信息
+	var headVersionId string
 	for k, row := range rows {
 		if k == 0 {
 			//记录日期,并且与k关联起来
@@ -1634,7 +1636,7 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 				one.ArtId = ArtId
 				one.CustomerId = customerId
 				one.VersionId = versionId
-				one.Status = 0
+				one.Status = baseModel.STATUS_INT_NO
 				one.FUseOrgNo = FUseOrgNo
 				one.DemandQty = 0
 				one.DemandWeek = week
@@ -1657,7 +1659,7 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 				session.Rollback()
 				return errors.New("版本信息格式错误")
 			}
-
+			headVersionId = versionId
 			//删除对应的版本信息
 			err = dao.DeleteOne(customerId, versionId)
 			if err != nil {
@@ -1678,6 +1680,7 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 			oneInfo.PlantNr = user.PlantNr
 			oneInfo.CustomerId = customerId
 			oneInfo.VersionId = versionId
+			oneInfo.Status = baseModel.STATUS_NO
 			oneInfo.CreateMode = custInfo.DemandModelId
 			oneInfo.PlanReleaseTime = grmi.DateTime(nowDate)
 			oneInfo.ActualReleaseTime = grmi.DateTime(time.Now())
@@ -1692,6 +1695,10 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		}
 		//插入对应的版本
 		for _, oneDetail := range detail {
+			if headVersionId != versionId{
+				session.Rollback()
+				return grmi.NewBusinessError(fmt.Sprintf("版本头部不一致!%s,%s", headVersionId,versionId))
+			}
 			err = detailDao.InsertOne(&oneDetail)
 			if err != nil {
 				session.Rollback()