金蝶更新

meta/ap/CustDemandVerDetail.meta.go

@@ -35,6 +35,7 @@ var CustDemandVerDetail_CtrlTime2 = grmi.NewField("CtrlTime2", "[AP_CustDemandVe
 var CustDemandVerDetail_LastModify = grmi.NewField("LastModify", "[AP_CustDemandVerDetail].LastModify", "lastmodify", grmi.TypeDateTime)
 var CustDemandVerDetail_LastUser = grmi.NewField("LastUser", "[AP_CustDemandVerDetail].LastUser", "lastuser", grmi.TypeString)
 var CustDemandVerDetail_CreateTime = grmi.NewField("CreateTime", "[AP_CustDemandVerDetail].CreateTime", "createtime", grmi.TypeDateTime)
+var CustDemandVerDetail_FUseOrgNo = grmi.NewField("FUseOrgNo", "[AP_CustDemandVerDetail].FUseOrgNo", "fuseorgno", grmi.TypeString)
 
 /******************************************************************************
  *
@@ -68,6 +69,7 @@ var CustDemandVerDetail = grmi.NewEntity(
 		CustDemandVerDetail_LastModify.Name:  CustDemandVerDetail_LastModify,
 		CustDemandVerDetail_LastUser.Name:    CustDemandVerDetail_LastUser,
 		CustDemandVerDetail_CreateTime.Name:  CustDemandVerDetail_CreateTime,
+		CustDemandVerDetail_FUseOrgNo.Name:   CustDemandVerDetail_FUseOrgNo,
 	},
 	[]string{"PlantNr"},
-	[]string{"Status", "DemandYear", "DemandWeek", "DemandMonth", "DemandQty", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"Status", "DemandYear", "DemandWeek", "DemandMonth", "DemandQty", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser", "FUseOrgNo"})

meta/base/Article.meta.go

@@ -62,6 +62,7 @@ var Article_LastModify = grmi.NewField("LastModify", "[Article].LastModify", "la
 var Article_LastUser = grmi.NewField("LastUser", "[Article].LastUser", "lastuser", grmi.TypeString)
 var Article_CreateTime = grmi.NewField("CreateTime", "[Article].CreateTime", "createtime", grmi.TypeDateTime)
 var Article_FMaterialId = grmi.NewField("FMaterialId", "[Article].FMaterialId", "fmaterialid", grmi.TypeInt)
+var Article_Planner = grmi.NewField("Planner", "[Article].Planner", "planner", grmi.TypeString)
 
 /******************************************************************************
  *
@@ -122,6 +123,7 @@ var Article = grmi.NewEntity(
 		Article_LastUser.Name:             Article_LastUser,
 		Article_CreateTime.Name:           Article_CreateTime,
 		Article_FMaterialId.Name:          Article_FMaterialId,
+		Article_Planner.Name:              Article_Planner,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustArtId", "AlternativeArtId", "PlanResourceGroupId", "PlanResourceId", "UsedResourceId", "UomId", "PlanScrapRate", "RatePerHourToggle", "TimePerItemToggle", "TimePerBatchToggle", "BatchTimeFieldToggle", "OpTimePerItem", "BatchTime", "QuantityPerHour", "MidBatchQuantity", "MidBatchTime", "EffectiveOpTime", "BatchingMethod", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "DefaultInspectPlanId", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "LastUser", "FMaterialId"})
+	[]string{"Descr1", "Descr2", "ArtTypeId", "ProjectId", "CustArtId", "AlternativeArtId", "PlanResourceGroupId", "PlanResourceId", "UsedResourceId", "UomId", "PlanScrapRate", "RatePerHourToggle", "TimePerItemToggle", "TimePerBatchToggle", "BatchTimeFieldToggle", "OpTimePerItem", "BatchTime", "QuantityPerHour", "MidBatchQuantity", "MidBatchTime", "EffectiveOpTime", "BatchingMethod", "DeliveryBuffer", "Icon", "DisplayColor", "Document", "DefaultRoute", "DefaultInspectPlanId", "LotSize", "ABCClass", "ArtSize1", "ArtSize2", "ArtSize3", "ArtSize4", "ArtSize5", "ArtSpec1", "ArtSpec2", "ArtSpec3", "ArtSpec4", "ArtSpec5", "LastUser", "FMaterialId", "Planner"})

models/ap/CustDemandVerDetail.model.go

@@ -20,27 +20,27 @@ import (
  *
  ******************************************************************************/
 type CustDemandVerDetail struct {
-	PlantNr     int           `xorm:"pk int 'PlantNr'" json:"AP_CustDemandVerDetail-PlantNr"`
-	CustomerId  string        `xorm:"pk nvarchar(40) 'CustomerId'" json:"AP_CustDemandVerDetail-CustomerId"`
-	VersionId   string        `xorm:"pk nvarchar(40) 'VersionId'" json:"AP_CustDemandVerDetail-VersionId"`
-	ArtId       string        `xorm:"pk nvarchar(40) 'ArtId'" json:"AP_CustDemandVerDetail-ArtId"`
-	DemandDate  grmi.Date     `xorm:"pk date 'DemandDate'" json:"AP_CustDemandVerDetail-DemandDate"`
-	Status      int           `xorm:"int 'Status' not null" json:"AP_CustDemandVerDetail-Status"`
-	DemandWeek  int           `xorm:"int 'DemandWeek' not null" json:"AP_CustDemandVerDetail-DemandWeek"`
-	DemandMonth int           `xorm:"int 'DemandMonth' not null" json:"AP_CustDemandVerDetail-DemandMonth"`
-	DemandYear  int           `xorm:"int 'DemandYear' not null" json:"AP_CustDemandVerDetail-DemandYear"`
-	DemandQty   float64       `xorm:"float 'DemandQty'" json:"AP_CustDemandVerDetail-DemandQty"`
-	CtrlPara1   int           `xorm:"int 'CtrlPara1' not null" json:"AP_CustDemandVerDetail-CtrlPara1"`
-	CtrlPara2   int           `xorm:"int 'CtrlPara2' not null" json:"AP_CustDemandVerDetail-CtrlPara2"`
-	CtrlStr1    string        `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"AP_CustDemandVerDetail-CtrlStr1"`
-	CtrlStr2    string        `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"AP_CustDemandVerDetail-CtrlStr2"`
-	CtrlTime1   grmi.DateTime `xorm:"datetime 'CtrlTime1' not null created" json:"AP_CustDemandVerDetail-CtrlTime1"`
-	CtrlTime2   grmi.DateTime `xorm:"datetime 'CtrlTime2' not null created" json:"AP_CustDemandVerDetail-CtrlTime2"`
-	LastModify  grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"AP_CustDemandVerDetail-LastModify"`
-	LastUser    string        `xorm:"nvarchar(20) 'LastUser' not null" json:"AP_CustDemandVerDetail-LastUser"`
-	CreateTime  grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_CustDemandVerDetail-CreateTime"`
-
-	DemandQtyMath float64 `xorm:"-"`
+	PlantNr       int           `xorm:"pk int 'PlantNr'" json:"AP_CustDemandVerDetail-PlantNr"`
+	CustomerId    string        `xorm:"pk nvarchar(40) 'CustomerId'" json:"AP_CustDemandVerDetail-CustomerId"`
+	VersionId     string        `xorm:"pk nvarchar(40) 'VersionId'" json:"AP_CustDemandVerDetail-VersionId"`
+	ArtId         string        `xorm:"pk nvarchar(40) 'ArtId'" json:"AP_CustDemandVerDetail-ArtId"`
+	DemandDate    grmi.Date     `xorm:"pk date 'DemandDate'" json:"AP_CustDemandVerDetail-DemandDate"`
+	Status        int           `xorm:"int 'Status' not null" json:"AP_CustDemandVerDetail-Status"`
+	DemandWeek    int           `xorm:"int 'DemandWeek' not null" json:"AP_CustDemandVerDetail-DemandWeek"`
+	DemandMonth   int           `xorm:"int 'DemandMonth' not null" json:"AP_CustDemandVerDetail-DemandMonth"`
+	DemandYear    int           `xorm:"int 'DemandYear' not null" json:"AP_CustDemandVerDetail-DemandYear"`
+	DemandQty     float64       `xorm:"float 'DemandQty'" json:"AP_CustDemandVerDetail-DemandQty"`
+	CtrlPara1     int           `xorm:"int 'CtrlPara1' not null" json:"AP_CustDemandVerDetail-CtrlPara1"`
+	CtrlPara2     int           `xorm:"int 'CtrlPara2' not null" json:"AP_CustDemandVerDetail-CtrlPara2"`
+	CtrlStr1      string        `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"AP_CustDemandVerDetail-CtrlStr1"`
+	CtrlStr2      string        `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"AP_CustDemandVerDetail-CtrlStr2"`
+	CtrlTime1     grmi.DateTime `xorm:"datetime 'CtrlTime1' not null created" json:"AP_CustDemandVerDetail-CtrlTime1"`
+	CtrlTime2     grmi.DateTime `xorm:"datetime 'CtrlTime2' not null created" json:"AP_CustDemandVerDetail-CtrlTime2"`
+	LastModify    grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"AP_CustDemandVerDetail-LastModify"`
+	LastUser      string        `xorm:"nvarchar(20) 'LastUser' not null" json:"AP_CustDemandVerDetail-LastUser"`
+	CreateTime    grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"AP_CustDemandVerDetail-CreateTime"`
+	FUseOrgNo     string        `xorm:"nvarchar(255) 'FUseOrgNo'" json:"AP_CustDemandVerDetail-FUseOrgNo"`
+	DemandQtyMath float64       `xorm:"-"`
 }
 
 /******************************************************************************
@@ -60,4 +60,3 @@ type CustDemandVerDetail struct {
 func (self *CustDemandVerDetail) GetKey() core.PK {
 	return core.PK{self.PlantNr, self.CustomerId, self.VersionId, self.ArtId, self.DemandDate.ToString()}
 }
-

models/base/Article.model.go

@@ -66,6 +66,7 @@ type Article struct {
 	LastUser             string        `xorm:"nvarchar(20) 'LastUser' not null" json:"Article-LastUser"`
 	CreateTime           grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"Article-CreateTime"`
 	FMaterialId          int           `xorm:"int 'FMaterialId'" json:"Article-FMaterialId"`
+	Planner              string        `xorm:"nvarchar(255) 'Planner'" json:"Article-Planner"`
 }
 
 /******************************************************************************

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

@@ -505,6 +505,10 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 			}
 			for demandDate, qty := range detail.Item {
 				val, ok := detail.CustDemandVerDetail[demandDate]
+				fUseOrgNo := val.FUseOrgNo
+				if fUseOrgNo == "" {
+					fUseOrgNo = utils.K3Obj.FUseOrgNo
+				}
 				if ok {
 					one := model.CustDemandVerDetail{}
 					one.ArtId = detail.ArtId
@@ -515,6 +519,7 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 					one.DemandDate = val.DemandDate
 					one.DemandWeek = val.DemandWeek
 					one.DemandMonth = val.DemandMonth
+					one.FUseOrgNo = fUseOrgNo
 					CustDemandVerDetail = append(CustDemandVerDetail, one)
 				}
 			}
@@ -533,6 +538,10 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 			}
 			for demandWeek, qty := range detail.Item {
 				val, ok := detail.CustDemandVerDetail[demandWeek]
+				fUseOrgNo := val.FUseOrgNo
+				if fUseOrgNo == "" {
+					fUseOrgNo = utils.K3Obj.FUseOrgNo
+				}
 				if ok {
 					one := model.CustDemandVerDetail{}
 					one.ArtId = detail.ArtId
@@ -543,6 +552,7 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 					one.DemandDate = val.DemandDate
 					one.DemandWeek = val.DemandWeek
 					one.DemandMonth = val.DemandMonth
+					one.FUseOrgNo = fUseOrgNo
 					CustDemandVerDetail = append(CustDemandVerDetail, one)
 				}
 			}
@@ -562,6 +572,10 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 			}
 			for demandMonth, qty := range detail.Item {
 				val, ok := detail.CustDemandVerDetail[demandMonth]
+				fUseOrgNo := val.FUseOrgNo
+				if fUseOrgNo == "" {
+					fUseOrgNo = utils.K3Obj.FUseOrgNo
+				}
 				if ok {
 					one := model.CustDemandVerDetail{}
 					one.ArtId = detail.ArtId
@@ -572,6 +586,7 @@ func (impl *CustDemandVerHeadServiceImplement) UpdateOne(user *global.User, enti
 					one.DemandDate = val.DemandDate
 					one.DemandWeek = val.DemandWeek
 					one.DemandMonth = val.DemandMonth
+					one.FUseOrgNo = fUseOrgNo
 					CustDemandVerDetail = append(CustDemandVerDetail, one)
 				}
 			}

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

@@ -5,12 +5,14 @@ package implments
 import (
 	dalAp "leit.com/LAPP_CHEERSSON_BACKEND/dao/ap"
 	dal "leit.com/LAPP_CHEERSSON_BACKEND/dao/base"
+	dalMe "leit.com/LAPP_CHEERSSON_BACKEND/dao/me"
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
 	"leit.com/LAPP_CHEERSSON_BACKEND/global"
 	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
 	meta "leit.com/LAPP_CHEERSSON_BACKEND/meta/base"
 	modelAp "leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
+	modelMe "leit.com/LAPP_CHEERSSON_BACKEND/models/me"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils"
 )
 
@@ -70,6 +72,7 @@ var DefaultConditionOfArticle = grmi.NewCondition(
 		meta.Article_LastUser.UrlParameterName:             grmi.NewConditionItem(meta.Article_LastUser, grmi.Equal, false),
 		meta.Article_CreateTime.UrlParameterName:           grmi.NewConditionItem(meta.Article_CreateTime, grmi.Approximate, false),
 		meta.Article_FMaterialId.UrlParameterName:          grmi.NewConditionItem(meta.Article_FMaterialId, grmi.Equal, false),
+		meta.Article_Planner.UrlParameterName:              grmi.NewConditionItem(meta.Article_Planner, grmi.Equal, false),
 	},
 	nil,
 )
@@ -235,52 +238,65 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}) {
 	var stockLevelData []modelAp.ArticleStockLevel
 	var articleResourceData []modelAp.ArticleResource
 	articleMap := make(map[string]int)
-	uomDao := dal.NewUomDAO(session, model.PlantNr, "System")
-	uomMap := make(map[int]model.Uom)
+
+	var projectData []modelMe.Project
+	projectMap := make(map[string]int)
+	projectDao := dalMe.NewProjectDAO(session, model.PlantNr, "System")
 	for _, v := range _list {
 		if _, ok := articleMap[utils.ValueToString(v[3], "")]; ok {
 			continue
 		} else {
 			articleMap[utils.ValueToString(v[3], "")] = 1
 		}
-		_stockLevel, _ := stockLevelDao.SelectOne(utils.ValueToString(v[3], ""))
-		if _stockLevel == nil {
-			stockLevelData = append(stockLevelData, modelAp.ArticleStockLevel{
-				PlantNr: model.PlantNr,
-				ArtId:   utils.ValueToString(v[3], ""),
-			})
-		}
+
 		//如果没有找到准缺类型不导入
 		if utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)) == "" {
 			continue
 		}
-		//如果没有找到单位不导入
-		_uom := model.Uom{}
-		if _info, ok := uomMap[utils.ValueToInt(v[5], 0)]; ok {
-			_uom = _info
-		} else {
-			//查询
-			_info, err := uomDao.Get(utils.ValueToInt(v[5], 0))
-			if err != nil {
-				continue
+		if utils.ValueToString(v[3], "") == model.ART_TYPE_FINISHED {
+			_articleResourceDao, _ := articleResourceDao.SelectOne(utils.ValueToString(v[3], ""))
+			if _articleResourceDao == nil {
+				articleResourceData = append(articleResourceData, modelAp.ArticleResource{
+					PlantNr: model.PlantNr,
+					ArtId:   utils.ValueToString(v[3], ""),
+				})
+			}
+			_stockLevel, _ := stockLevelDao.SelectOne(utils.ValueToString(v[3], ""))
+			if _stockLevel == nil {
+				stockLevelData = append(stockLevelData, modelAp.ArticleStockLevel{
+					PlantNr: model.PlantNr,
+					ArtId:   utils.ValueToString(v[3], ""),
+				})
 			}
-			_uom = *_info
-			uomMap[utils.ValueToInt(v[5], 0)] = _uom
-		}
-		_articleResourceDao, _ := articleResourceDao.SelectOne(utils.ValueToString(v[3], ""))
-		if _articleResourceDao == nil {
-			articleResourceData = append(articleResourceData, modelAp.ArticleResource{
-				PlantNr: model.PlantNr,
-				ArtId:   utils.ValueToString(v[3], ""),
-			})
 		}
-
 		isUp := false
 		//查询物料
 		_info, err := dao.SelectOne(utils.ValueToString(v[3], ""))
 		if err != nil {
 			continue
 		}
+		//查询项目
+		if utils.ValueToString(v[13], "") != "" {
+			if _, ok := projectMap[utils.ValueToString(v[13], "")]; !ok {
+				//
+				projectInfo, err := projectDao.SelectOne(utils.ValueToString(v[13], ""))
+				if err != nil {
+					continue
+				}
+				if projectInfo == nil {
+					projectData = append(projectData, modelMe.Project{
+						ProjectId: utils.ValueToString(v[13], ""),
+						Descr:     utils.ValueToString(v[14], ""),
+					})
+				} else {
+					if projectInfo.Descr != utils.ValueToString(v[14], "") {
+						projectInfo.Descr = utils.ValueToString(v[14], "")
+						_ = projectDao.UpdateOne(projectInfo)
+					}
+				}
+				projectMap[utils.ValueToString(v[13], "")] = 1
+			}
+		}
 		if _info != nil {
 			//修改物料
 			if _info.Descr1 != utils.ValueToString(v[2], "") {
@@ -308,14 +324,22 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}) {
 				_info.ArtSpec5 = utils.GetMaterialMap(utils.ValueToString(v[8], ""))
 				isUp = true
 			}
-			if _info.UomId != _uom.UomId {
-				_info.UomId = _uom.UomId
+			if _info.UomId != utils.ValueToString(v[15], "") {
+				_info.UomId = utils.ValueToString(v[15], "")
 				isUp = true
 			}
 			if _info.FMaterialId != utils.ValueToInt(v[0], 0) {
 				_info.FMaterialId = utils.ValueToInt(v[0], 0)
 				isUp = true
 			}
+			if _info.ProjectId != utils.ValueToString(v[13], "") {
+				_info.ProjectId = utils.ValueToString(v[13], "")
+				isUp = true
+			}
+			if _info.Planner != utils.ValueToString(v[16], "") {
+				_info.Planner = utils.ValueToString(v[16], "")
+				isUp = true
+			}
 			if isUp {
 				_ = dao.UpdateOne(_info)
 			}
@@ -331,77 +355,101 @@ func (impl *ArticleServiceImplement) ImportArticle(_list [][]interface{}) {
 			ArtSpec4:    utils.ValueToString(v[4], ""),
 			ArtSpec5:    utils.GetMaterialMap(utils.ValueToString(v[8], "")),
 			ArtTypeId:   utils.GetMaterialgroupMap(utils.ValueToInt(v[7], 0)),
-			UomId:       _uom.UomId,
+			UomId:       utils.ValueToString(v[15], ""),
 			FMaterialId: utils.ValueToInt(v[0], 0),
+			ProjectId:   utils.ValueToString(v[13], ""),
+			Planner:     utils.ValueToString(v[16], ""),
 		})
 	}
-	if data == nil {
-		return
-	}
 	_ = session.Begin()
-	if len(data) > 20 {
-		var _detail []model.Article
-		for k, v := range data {
-			_detail = append(_detail, v)
-			if (k > 0 && k%20 == 0) || k+1 == len(data) {
-				err := dao.Insert(&_detail)
-				if err != nil {
-					_ = session.Rollback()
-					panic(err.Error())
+	if data != nil {
+		if len(data) > 20 {
+			var _detail []model.Article
+			for k, v := range data {
+				_detail = append(_detail, v)
+				if (k > 0 && k%20 == 0) || k+1 == len(data) {
+					err := dao.Insert(&_detail)
+					if err != nil {
+						_ = session.Rollback()
+						panic(err.Error())
+					}
+					_detail = []model.Article{}
 				}
-				_detail = []model.Article{}
 			}
-		}
-	} else {
-		err := dao.Insert(&data)
-		if err != nil {
-			_ = session.Rollback()
-			panic(err.Error())
+		} else {
+			err := dao.Insert(&data)
+			if err != nil {
+				_ = session.Rollback()
+				panic(err.Error())
+			}
 		}
 	}
-
-	if len(stockLevelData) > 20 {
-		var _detail []modelAp.ArticleStockLevel
-		for k, v := range stockLevelData {
-			_detail = append(_detail, v)
-			if (k > 0 && k%20 == 0) || k+1 == len(stockLevelData) {
-				err := stockLevelDao.Insert(&_detail)
-				if err != nil {
-					_ = session.Rollback()
-					panic(err.Error())
+	if stockLevelData != nil {
+		if len(stockLevelData) > 20 {
+			var _detail []modelAp.ArticleStockLevel
+			for k, v := range stockLevelData {
+				_detail = append(_detail, v)
+				if (k > 0 && k%20 == 0) || k+1 == len(stockLevelData) {
+					err := stockLevelDao.Insert(&_detail)
+					if err != nil {
+						_ = session.Rollback()
+						panic(err.Error())
+					}
+					_detail = []modelAp.ArticleStockLevel{}
 				}
-				_detail = []modelAp.ArticleStockLevel{}
 			}
-		}
-	} else {
-		err := stockLevelDao.Insert(&stockLevelData)
-		if err != nil {
-			_ = session.Rollback()
-			panic(err.Error())
+		} else {
+			err := stockLevelDao.Insert(&stockLevelData)
+			if err != nil {
+				_ = session.Rollback()
+				panic(err.Error())
+			}
 		}
 	}
-
-	if len(articleResourceData) > 20 {
-		var _detail []modelAp.ArticleResource
-		for k, v := range articleResourceData {
-			_detail = append(_detail, v)
-			if (k > 0 && k%20 == 0) || k+1 == len(articleResourceData) {
-				err := articleResourceDao.Insert(&_detail)
-				if err != nil {
-					_ = session.Rollback()
-					panic(err.Error())
+	if articleResourceData != nil {
+		if len(articleResourceData) > 20 {
+			var _detail []modelAp.ArticleResource
+			for k, v := range articleResourceData {
+				_detail = append(_detail, v)
+				if (k > 0 && k%20 == 0) || k+1 == len(articleResourceData) {
+					err := articleResourceDao.Insert(&_detail)
+					if err != nil {
+						_ = session.Rollback()
+						panic(err.Error())
+					}
+					_detail = []modelAp.ArticleResource{}
 				}
-				_detail = []modelAp.ArticleResource{}
+			}
+		} else {
+			err := articleResourceDao.Insert(&articleResourceData)
+			if err != nil {
+				_ = session.Rollback()
+				panic(err.Error())
 			}
 		}
-	} else {
-		err := articleResourceDao.Insert(&articleResourceData)
-		if err != nil {
-			_ = session.Rollback()
-			panic(err.Error())
+	}
+	if projectData != nil {
+		if len(projectData) > 20 {
+			var _detail []modelMe.Project
+			for k, v := range projectData {
+				_detail = append(_detail, v)
+				if (k > 0 && k%20 == 0) || k+1 == len(projectData) {
+					err := projectDao.Insert(&_detail)
+					if err != nil {
+						_ = session.Rollback()
+						panic(err.Error())
+					}
+					_detail = []modelMe.Project{}
+				}
+			}
+		} else {
+			err := projectDao.Insert(&projectData)
+			if err != nil {
+				_ = session.Rollback()
+				panic(err.Error())
+			}
 		}
 	}
-
 	_ = session.Commit()
 }
 

task/k3cloud.go

@@ -35,7 +35,7 @@ func TaskInit() {
 		for {
 			select {
 			case <-timer.C:
-				erp.PublishPlan(100,"admin")
+				erp.PublishPlan(100, "admin")
 			}
 		}
 	}()
@@ -58,13 +58,13 @@ func oneTask(_date time.Time) {
 	//if DaysBetweenDates(lastTime.OneTime, _date) >= 1 {
 
 	//go func() {
-	ImportMaterial()
-	ImportMaterialGroupSearch()
-	ImportArticle()
-	ImportBomList()
-	ImportCustomer()
+	//ImportMaterial()
+	//ImportMaterialGroupSearch()
+	//ImportArticle()
+	//ImportBomList()
+	//ImportCustomer()
 	//ImportSaleOrder()
-	ImportCustomerMaterialSearch()
+	//ImportCustomerMaterialSearch()
 	//ImportProjectSearch()
 	//}()
 	//ImportUnit()
@@ -173,6 +173,24 @@ func ImportUnit() {
 	serviceOfUom.ImportUom(response)
 }
 
+//查询组织
+func ImportOrg() []OrgType {
+	response := utilService.OrganizationsServiceInit().OrganizationsSearch("", "")
+	var data []OrgType
+	for _, v := range response {
+		data = append(data, OrgType{
+			FNumber: utils.ValueToString(v[0], ""),
+			FName:   utils.ValueToString(v[1], ""),
+		})
+	}
+	return data
+}
+
+type OrgType struct {
+	FNumber string `json:"FNumber"`
+	FName   string `json:"FName"`
+}
+
 //DaysBetweenDates 返回前后两个日期共包含多少天
 func DaysBetweenDates(startDate, endDate time.Time) int {
 	return int(math.Floor(math.Abs(endDate.Sub(startDate).Hours()/24))) + 1

utils/k3cloud/service/bd_material.go

@@ -16,7 +16,7 @@ func BdMAterialServiceInit() *BdMAterialService {
 	cust := &BdMAterialService{
 		K3config:   utils.K3Obj,
 		FormID:     "BD_MATERIAL",
-		FieldKeys:  "FMasterId,FAccuLeadTime,FName,FNumber,FSpecification,FBaseUnitId,FDocumentStatus,FMaterialGroup,F_RDPB_Material,F_RDPB_bigcode,F_RDPB_middlecode,F_RDPB_smallcode",
+		FieldKeys:  "FMasterId,FAccuLeadTime,FName,FNumber,FSpecification,FBaseUnitId,FDocumentStatus,FMaterialGroup,F_RDPB_Material,F_RDPB_bigcode,F_RDPB_middlecode,F_RDPB_smallcode,F_QCCQ_Programcode,F_QCCQ_Programcode.FCode,F_QCCQ_Programcode.FName,FBaseUnitId.FNumber,FPlanerID.FName,FPlanerID.FNumber,FPlanerID",
 		FUseOrgKey: "FUseOrgId1=" + utils.K3Obj.FUseOrgId,
 	}
 	return cust

utils/k3cloud/service/org_organizations.go

@@ -0,0 +1,57 @@
+package service
+
+import (
+	"leit.com/LAPP_CHEERSSON_BACKEND/utils"
+	request2 "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/struct/request"
+)
+
+type OrganizationsService struct {
+	*utils.K3config
+	FormID     string
+	FieldKeys  string
+	FUseOrgKey string
+}
+
+func OrganizationsServiceInit() *OrganizationsService {
+	cust := &OrganizationsService{
+		K3config:   utils.K3Obj,
+		FormID:     "ORG_Organizations",
+		FieldKeys:  "FNumber,FName",
+		FUseOrgKey: "",
+	}
+	return cust
+}
+
+func (_this *OrganizationsService) OrganizationsSearch(FilterString, OrderString string) [][]interface{} {
+	var data [][]interface{}
+	if FilterString != "" {
+		FilterString = _this.FUseOrgKey + " And " + FilterString
+	} else {
+		FilterString = _this.FUseOrgKey
+	}
+	request := request2.SearchRequest{
+		Formid:       _this.FormID,
+		FieldKeys:    _this.FieldKeys,
+		FilterString: FilterString,
+		OrderString:  OrderString,
+		TopRowCount:  0,
+		StartRow:     0,
+		Limit:        1000,
+	}
+
+	for true {
+		response, err := _this.SearchApi(_this.FormID, request)
+		if err != nil {
+			return data
+		}
+		for _, v := range response {
+			data = append(data, v)
+		}
+		if len(response) == request.Limit {
+			request.StartRow = request.StartRow + request.Limit
+		} else {
+			break
+		}
+	}
+	return data
+}

web/controllers/common/CommonUploadPic.rest.go

@@ -7,12 +7,25 @@ import (
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/core/router"
 	"leit.com/LAPP_CHEERSSON_BACKEND/global"
+	"leit.com/LAPP_CHEERSSON_BACKEND/task"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils"
 	"leit.com/LAPP_CHEERSSON_BACKEND/web/middleware/jwts"
 	"leit.com/LAPP_CHEERSSON_BACKEND/web/supports"
 	"strings"
 )
 
+func RegisterOrg(party router.Party, path string) {
+	party.Handle("GET", path, func(ctx iris.Context) {
+		_, ok := jwts.ParseToken(ctx)
+		if !ok {
+			supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil)
+			return
+		}
+		data := task.ImportOrg()
+		supports.Ok(ctx, supports.OptionSuccess, data)
+	})
+}
+
 /******************************************************************************
  *
  * @Function Name            : RegisterUploadMustPic

web/controllers/common/common.go

@@ -27,6 +27,9 @@ func RegisterRoutes() {
 		var serviceOfUploadPic = svr.NewUploadPicService()
 		// uploadpic上传多张张图片
 		RegisterUploadPic(upload, "/uploadmustpic", serviceOfUploadPic.UploadMustPic)
+		// 组织列表
+		org := party.Party("/org")
+		RegisterOrg(org, "/list")
 	})
 }