修改 bug

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

@@ -357,7 +357,7 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m
 	session := engine.NewSession()
 	defer session.Close()
 	dao := dal.NewArticleStockDAO(session, user.PlantNr, user.UserId)
-	dao.DeleteWhere([]grmi.Predicate{})
+	dao.DeleteWhere([]grmi.Predicate{meta.ArticleStock_PlantNr.NewPredicate(grmi.Equal, user.PlantNr)})
 
 	impl_Balance := implments.NewBalanceServiceImplement()
 	//刷新数据
@@ -371,9 +371,11 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m
 	erp.GetQiChuQty(model.PlantNr, "system", &alldata_Article)
 	// 在制需求
 	erp.GetZhaizhiQty(model.PlantNr, "system", &alldata_Article)
+
+	// 在制周
 	erp.GetZhaizhiWeekQty(model.PlantNr, "system", &alldata_Article)
 
-	erp.GetChaigouQty(model.PlantNr, "system", &alldata_Article)
+	//erp.GetChaigouQty(model.PlantNr, "system", &alldata_Article)
 	//// 期初库存
 	//err := erp.GetArticleDemandErpQty(user.PlantNr, user.UserId, &alldata_Article)
 	//if err != nil {
@@ -388,8 +390,6 @@ func (impl *ArticleStockServiceImplement) Erp(user *global.User, urlParameters m
 	// 独立需求
 	erp.GetDuliQty(model.PlantNr, "system", &alldata_Article)
 
-
-
 	//erp.GetWeiWaiQty(user.PlantNr, user.UserId, &alldata_Article)
 
 	predicates, err := condition.BuildPredicates(urlParameters)

services/erp/erp.go

@@ -7,6 +7,7 @@ import (
 	dal_base "leit.com/LAPP_CHEERSSON_BACKEND/dao/base"
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
 	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
+	meta "leit.com/LAPP_CHEERSSON_BACKEND/meta/base"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
 	"leit.com/LAPP_CHEERSSON_BACKEND/utils"
 	utilService "leit.com/LAPP_CHEERSSON_BACKEND/utils/k3cloud/service"
@@ -79,6 +80,7 @@ func GetQiChuQty(PlantNr int, UserId string, alldata_Article *[]model.Article) {
 
 	//var ArticleStockList []model_base.ArticleStock
 	dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
+
 	//查询可用状态
 	_stockStatus := utilService.StockStatusInit().StockStatusSearch("", "")
 	_stockStatusIds := ""
@@ -420,6 +422,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 	}
 
 	dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"DD")})
+
+
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
 	//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
 	//if err != nil {
@@ -645,6 +650,8 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
 	//dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
 	dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"DL")})
+
 	//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
 	//if err != nil {
 	//	_ = session.Rollback()
@@ -719,6 +726,8 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 	}
 
 	dao_SalesOrder := dal_base.NewSalesOrderDAO(session, PlantNr, UserId)
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_SalesOrderId.NewPredicate(grmi.Equal,"ZZ")})
+
 	//dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
 	//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)

task/importBalance/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.ImportBalance()
+	fmt.Println("OK")
+	return
+}

task/k3cloud.go

@@ -3,7 +3,10 @@ package task
 import (
 	"fmt"
 	"github.com/go-xorm/xorm"
+	dal "leit.com/LAPP_CHEERSSON_BACKEND/dao/base"
 	"leit.com/LAPP_CHEERSSON_BACKEND/db"
+	"leit.com/LAPP_CHEERSSON_BACKEND/grmi"
+	meta "leit.com/LAPP_CHEERSSON_BACKEND/meta/base"
 	model "leit.com/LAPP_CHEERSSON_BACKEND/models/base"
 	svrAp "leit.com/LAPP_CHEERSSON_BACKEND/services/ap"
 	"leit.com/LAPP_CHEERSSON_BACKEND/services/ap/implments"
@@ -262,10 +265,16 @@ 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)
+	engine := db.Eloquent.Master()
+	session := engine.NewSession()
+	defer session.Close()
+	dao := dal.NewArticleStockDAO(session,model.PlantNr, "system")
+	dao.DeleteWhere([]grmi.Predicate{meta.ArticleStock_PlantNr.NewPredicate(grmi.Equal, model.PlantNr)})
+
+	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)
 }