金蝶更新

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

@@ -493,7 +493,7 @@ func (impl *CustArtlstServiceImplement) CustArtStocklst(user *global.User, urlPa
 	}
 	custArtlst := result.Records.([]model.CustArtlst)
 	var artList []interface{}
-	for _, custInfo := range custArtlst{
+	for _, custInfo := range custArtlst {
 		artList = append(artList, custInfo.ArtId)
 		//custList = append(custList, custInfo.CustomerId)
 	}
@@ -505,14 +505,14 @@ func (impl *CustArtlstServiceImplement) CustArtStocklst(user *global.User, urlPa
 	}
 
 	data := make([]model.CustArtStockInfo, 0, 10)
-	for _, custArtInfo := range custArtlst{
-		for _, artStockInfo := range artStockList{
-			if artStockInfo.ArtId == custArtInfo.ArtId{
+	for _, custArtInfo := range custArtlst {
+		for _, artStockInfo := range artStockList {
+			if artStockInfo.ArtId == custArtInfo.ArtId {
 				custArtStockInfo := model.CustArtStockInfo{
 					//CustomerId: custArtInfo.CustomerId,
-					ArtId   : custArtInfo.ArtId,
-					Descr1     : custArtInfo.Descr1,
-					Descr2     : custArtInfo.Descr2,
+					ArtId:  custArtInfo.ArtId,
+					Descr1: custArtInfo.Descr1,
+					Descr2: custArtInfo.Descr2,
 				}
 				switch artStockInfo.StockType {
 				case "FG":
@@ -546,13 +546,13 @@ func (impl *CustArtlstServiceImplement) CustArtStockErp(user *global.User, urlPa
 
 	erp.GetWeiWaiQty(user.PlantNr, user.UserId, &alldata_Article)
 
-
-	result, err := impl.CustArtStocklst(user,urlParameters)
+	result, err := impl.CustArtStocklst(user, urlParameters)
 	return result, err
 }
 
 var alldata_CustArtlstDemo []model.CustArtlstDemo
 var alldata_CustArtlst []model.CustArtlst
+
 /******************************************************************************
  *
  * @Reference leit.com/LAPP_CHEERSSON_BACKEND/services/ap/CustDemandVerHeadService.ImportCustArtlst
@@ -617,7 +617,7 @@ func (impl *CustArtlstServiceImplement) ImportCustArtlst(FieldKeysStr string, li
 				return err
 			}
 			if artInfo == nil {
-				return errors.New("物料信息不存在!")
+				continue
 			}
 			oneData := new(model.CustArtlst)
 			oneData.PlantNr = model_base.PlantNr

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

@@ -1089,7 +1089,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 		} else {
 			//查询
 			_info, err := articleDao.SelectOne(v.ArtId)
-			if err != nil {
+			if err != nil || _info == nil {
 				continue
 			}
 			_article = *_info
@@ -1132,7 +1132,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 	//发布对应版本
 	response, err := utilService.PlnForecastInit().SaveForecast(pln_forecast.PlnForecastSave{
 		FForeOrgID: _struct.FNumber{
-			FNumber: utils.K3Obj.FUseOrgId,
+			FNumber: utils.K3Obj.FUseOrgNo,
 		},
 		FBillTypeID: _struct.FNumber{
 			FNumber: "YCD01_SYS",

services/base/implments/Uom.service.impl.go

@@ -334,6 +334,7 @@ func (impl *UomServiceImplement) ImportUom(_list [][]interface{}) {
 				FunitId: utils.ValueToInt(v[2], 0),
 				UomId:   utils.ValueToString(v[0], ""),
 				UomName: utils.ValueToString(v[1], ""),
+				UomType: "SIZE",
 			})
 		}
 	}

services/me/implments/BomLst.service.impl.go

@@ -123,6 +123,8 @@ func (impl *BomLstServiceImplement) ImportBomList(response map[int][][]interface
 	_ = session.Begin()
 	var dataArr []model.BomLst
 	var headArr []model.BomHead
+	uomDao := baseDal.NewUomDAO(session, baseModel.PlantNr, "System")
+	uomMap := make(map[int]baseModel.Uom)
 	for k, v := range response {
 		//查询物料
 		if _, ok := articleMap[k]; !ok {
@@ -174,6 +176,30 @@ func (impl *BomLstServiceImplement) ImportBomList(response map[int][][]interface
 					_sonArticel = article[0]
 				}
 				sonArticleMap[utils.ValueToInt(_v[3], 0)] = _sonArticel
+				fmatUom := baseModel.Uom{}
+				cmatUom := baseModel.Uom{}
+				if _info, ok := uomMap[utils.ValueToInt(_v[5], 0)]; ok {
+					fmatUom = _info
+				} else {
+					//查询
+					_info, err := uomDao.Get(utils.ValueToInt(_v[5], 0))
+					if err != nil {
+						continue
+					}
+					fmatUom = *_info
+					uomMap[utils.ValueToInt(_v[5], 0)] = fmatUom
+				}
+				if _info, ok := uomMap[utils.ValueToInt(_v[8], 0)]; ok {
+					cmatUom = _info
+				} else {
+					//查询
+					_info, err := uomDao.Get(utils.ValueToInt(_v[8], 0))
+					if err != nil {
+						continue
+					}
+					cmatUom = *_info
+					uomMap[utils.ValueToInt(_v[8], 0)] = cmatUom
+				}
 				//插入
 				dataArr = append(dataArr, model.BomLst{
 					PlantNr:   baseModel.PlantNr,
@@ -182,11 +208,11 @@ func (impl *BomLstServiceImplement) ImportBomList(response map[int][][]interface
 					FmatName:  _article.Descr1,
 					FmatSpec:  _article.ArtSpec2,
 					FmatQty:   1,
-					FmatUom:   utils.ValueToString(utils.ValueToInt(_v[5], 0), ""),
+					FmatUom:   fmatUom.UomId,
 					CmatNr:    _sonArticel.ArtId,
 					CmatName:  _sonArticel.Descr1,
 					CmatQty:   utils.ValueToFloat(_v[6], 0) / utils.ValueToFloat(_v[7], 0),
-					CmatUom:   utils.ValueToString(utils.ValueToInt(_v[8], 0), ""),
+					CmatUom:   cmatUom.UomId,
 					CmatType:  utils.ValueToString(_v[9], ""),
 					Position:  utils.ValueToInt(_v[12], 0),
 					TimeUom:   utils.ValueToString(_v[10], ""),