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

@@ -1522,7 +1522,7 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		if k == 0 {
 			//记录日期,并且与k关联起来
 			for kk, vv := range row {
-				if kk >= 6 {
+				if kk >= 5 {
 					tem[kk] = utils.ValueToString(vv, "")
 				}
 			}
@@ -1530,19 +1530,23 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		}
 
 		//判断客户是否存在
-		customerId := utils.ValueToString(row[3], "")
+		customerId := utils.ValueToString(row[2], "")
 		if utils.ValueIsEmpty(strings.TrimSpace(customerId)) {
 			return grmi.NewBusinessError("Excel客户信息缺失!")
 		}
-		ArtId := strings.TrimSpace(utils.ValueToString(row[5], ""))
+		ArtId := strings.TrimSpace(utils.ValueToString(row[4], ""))
 		if utils.ValueIsEmpty(strings.TrimSpace(ArtId)) {
 			return grmi.NewBusinessError("Excel物料主数据没有维护!")
 		}
 		FUseOrgNo := utils.K3Obj.FUseOrgNo
-		versionId := strings.TrimSpace(utils.ValueToString(row[0], ""))
-		if utils.ValueIsEmpty(strings.TrimSpace(versionId)) {
-			return grmi.NewBusinessError("Excel缺少版本信息!")
+		dateTime := strings.TrimSpace(utils.ValueToString(row[0], ""))
+		if utils.ValueIsEmpty(strings.TrimSpace(dateTime)) {
+			return grmi.NewBusinessError("Excel缺少Date信息!")
 		}
+		weekDate, err := time.Parse("20060102", dateTime)
+		week, year, _ := utils.WeekByDate(weekDate)
+		versionId := utils.ValueToString(year, "") + "." + utils.ValueToString(week, "")
+
 		custInfo, err := custDao.SelectOne(customerId)
 		if err != nil {
 			return err
@@ -1583,8 +1587,8 @@ func (impl *CustDemandVerHeadServiceImplement) BulkImportFile(user *global.User,
 		temLen := 0
 		var temDemandDate time.Time
 		for kkk, vvv := range row {
-			//当列>=6开始记录零件
-			if kkk >= 6 {
+			//当列>=5开始记录零件
+			if kkk >= 5 {
 				//根据k的数值，映射数据
 				val, ok := tem[kkk]
 				//判断值是否存在
@@ -2640,10 +2644,10 @@ func (impl *CustDemandVerHeadServiceImplement) ExportDeviationAnalysisArtList(us
 			value, ok := val.Item[key]
 			if ok {
 				cell = row.AddCell()
-				cell.Value = utils.ValueToString(value,"")
+				cell.Value = utils.ValueToString(value, "")
 			} else {
 				cell = row.AddCell()
-				cell.Value = utils.ValueToString(value,"")
+				cell.Value = utils.ValueToString(value, "")
 			}
 		}
 	}
@@ -3004,7 +3008,7 @@ func (impl *CustDemandVerHeadServiceImplement) SelectOneByCust(user *global.User
 	for j := 0; j < lenData; j++ {
 		temDate := firstWeek.AddDate(0, 0, (j * 7))
 		nowWeek, year, month = utils.WeekByDate(temDate)
-		key := utils.ValueToString(temDate.Year(), "") + "." + utils.ValueToString(nowWeek, "")
+		key := utils.ValueToString(year, "") + "." + utils.ValueToString(nowWeek, "")
 		one := model.CustDemandVerDetail{}
 		one.VersionId = versionId
 		one.CustomerId = customerId