etl新增

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

@@ -14,7 +14,6 @@ import (
 	meta_base "leit.com/LAPP_CHEERSSON_BACKEND/meta/base"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
 	model_base "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
-	"leit.com/LAPP_CHEERSSON_BACKEND/services/erp"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils"
 	"strings"
 )
@@ -539,9 +538,9 @@ func (impl *CustArtlstServiceImplement) CustArtStocklst(user *global.User, urlPa
 
 func (impl *CustArtlstServiceImplement) CustArtStockErp(user *global.User, urlParameters map[string]string) (grmi.PagingResult, error) {
 
-	erp.GetQiChuQty(user.PlantNr, user.UserId, &alldata_Article)
-
-	erp.GetZhaizhiQty(user.PlantNr, user.UserId, &alldata_Article)
+	//erp.GetQiChuQty(user.PlantNr, user.UserId, &alldata_Article)
+	//
+	//erp.GetZhaizhiQty(user.PlantNr, user.UserId, &alldata_Article)
 
 	//erp.GetChaigouiQty(user.PlantNr, user.UserId, &alldata_Article)
 

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

@@ -368,13 +368,12 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m
 	//// 订单需求
 	//erp.GetOrderQty(user.PlantNr, user.UserId, &alldata_Article)
 
-
 	erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article)
-
+	// 在制需求
 	erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article)
+	erp.GetZhaizhiWeekQty(model.PlantNr, "system", &alldata_Article)
 
-	erp.GetChaigouiQty(model.PlantNr, "system", &alldata_Article)
-
+	erp.GetChaigouQty(model.PlantNr, "system", &alldata_Article)
 	//// 期初库存
 	//err := erp.GetArticleDemandErpQty(user.PlantNr, user.UserId, &alldata_Article)
 	//if err != nil {
@@ -389,8 +388,7 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m
 	// 独立需求
 	erp.GetDuliQty(model.PlantNr, "system", &alldata_Article)
 
-	// 在制需求
-	erp.GetZhaizhiWeekQty(model.PlantNr, "system", &alldata_Article)
+
 
 	//erp.GetWeiWaiQty(user.PlantNr, user.UserId, &alldata_Article)
 

services/erp/erp.go

@@ -221,7 +221,7 @@ func GetZhaizhiQty(PlantNr int, UserId string, alldata_Article *[]model.Article)
 }
 
 //采购量
-func GetChaigouiQty(PlantNr int, UserId string, alldata_Article *[]model.Article) {
+func GetChaigouQty(PlantNr int, UserId string, alldata_Article *[]model.Article) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()

task/importBalance/main.go → task/importChaigou/main.go

@@ -11,7 +11,7 @@ func main() {
 		fmt.Println(err)
 		return
 	}
-	task.ImportBalance()
+	task.ImportChaigou()
 	fmt.Println("OK")
 	return
 }

task/importDuli/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+	"leit.com/LAPP_CHEERSSON_BACKEND/task"
+)
+
+func main() {
+	err := task.EtlTaskInit()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	task.ImportDuli()
+	fmt.Println("OK")
+	return
+}

task/importQichu/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+	"leit.com/LAPP_CHEERSSON_BACKEND/task"
+)
+
+func main() {
+	err := task.EtlTaskInit()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	task.ImportQichu()
+	fmt.Println("OK")
+	return
+}

task/importZhaizhi/main.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"fmt"
+	"leit.com/LAPP_CHEERSSON_BACKEND/task"
+)
+
+func main() {
+	err := task.EtlTaskInit()
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+	task.ImportZhaizhi()
+	fmt.Println("OK")
+	return
+}

task/k3cloud.go

@@ -103,12 +103,40 @@ func ImportCustomer() {
 	serviceOfCustomer.ImportCustomer(response)
 }
 
+func ImportQichu(){
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetQiChuQty(model.PlantNr,"system", &alldata_Article)
+}
+
+func ImportZhaizhi(){
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetZhaizhiQty(model.PlantNr,"system", &alldata_Article)
+	erp.GetZhaizhiWeekQty(model.PlantNr,"system", &alldata_Article)
+}
+
+func ImportChaigou(){
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetChaigouQty(model.PlantNr,"system", &alldata_Article)
+}
+
 //销售订单
 func ImportSaleOrder() {
-	response := utilService.SaleOrderInit().SaleOrderSearch("", "")
-	serviceOfSaleOrder.ImportSalesOrder(response)
+	//response := utilService.SaleOrderInit().SaleOrderSearch("", "")
+	//serviceOfSaleOrder.ImportSalesOrder(response)
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetOrderQty(model.PlantNr,"system", &alldata_Article)
 }
 
+func ImportDuli(){
+	// 独立需求
+	impl := implments.NewBalanceServiceImplement()
+	alldata_Article := impl.GetGlobalArticleData()
+	erp.GetDuliQty(model.PlantNr, "system", &alldata_Article)
+}
 //物料分组
 func ImportMaterialGroupSearch() string {
 	response := utilService.MaterialGroupInit().MaterialGroupSearch("", "")
@@ -234,11 +262,11 @@ func ImportEmpinfo() []Empinfo {
 
 //导入库存
 func ImportBalance() {
-	impl_Balance := implments.NewBalanceServiceImplement()
-	alldata_Article := impl_Balance.GetGlobalArticleDataNew()
-	erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article)
-	erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article)
-	erp.GetChaigouiQty(model.PlantNr, "system", &alldata_Article)
+	//impl_Balance := implments.NewBalanceServiceImplement()
+	//alldata_Article := impl_Balance.GetGlobalArticleDataNew()
+	//erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article)
+	//erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article)
+	//erp.GetChaigouiQty(model.PlantNr, "system", &alldata_Article)
 }
 
 type Empinfo struct {