更新(当前正式环境)

conf/app.go

@@ -8,9 +8,9 @@ import (
 	"leit.com/LAPP_CHEERSSON_BACKEND/web/supports"
 )
 
-var ExampleFile = "http://localhost:9003/public/uploadxlsx/example.xlsx"
+var ExampleFile = "http://localhost:9001/public/uploadxlsx/example.xlsx"
 
-var Baseurl = "http://localhost:9003"
+var Baseurl = "http://localhost:9001"
 
 type AppConf struct {
 	DisablePathCorrection             bool

main.go

@@ -137,6 +137,6 @@ func imain() {
 	// 开启自动创建功能
 	go createVersion.CreateVersionTask()
 	//启动监听端口
-	app.Run(iris.Addr(":9003"), iris.WithConfiguration(conf.C))
+	app.Run(iris.Addr(":9001"), iris.WithConfiguration(conf.C))
 
 }

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

@@ -3514,7 +3514,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 			//查询零件销售订单 当周销售数量
 			orderList, _ := sealesOrderDao.SelectSumPlanQty(v.ArtId, utils.ValueToString(v.DemandYear, "")+"."+utils.ValueToString(v.DemandWeek, ""), v.CustomerId)
 			_qty := v.DemandQty
-			if orderList != nil && len(orderList) > 1 {
+			if orderList != nil && len(orderList) > 0 {
 				qty := utils.ValueToFloat(string(orderList[0][baseMeta.SalesOrder_PlanQty.Name]), 0)
 				if qty > _qty {
 					_qty = qty
@@ -3539,7 +3539,7 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 				FBaseUnitID: _struct.FNumber{
 					FNumber: _article.UomId,
 				},
-				FBaseQty:    v.DemandQty,
+				FBaseQty:    _qty,
 				FAVERATYPE:  "W",
 				FAveraCycle: 1,
 				FStockOrgID: _struct.FNumber{

services/erp/erp.go

@@ -285,8 +285,9 @@ func GetWeiWaiQty(PlantNr int, UserId string, alldata_Article *[]model.Article)
 
 	//var ArticleStockList []model_base.ArticleStock
 	dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
-
-	dataList := utilService.PRD_MO_Init_Weiwai().Search("", "")
+	FilerString := ""
+	FilerString += "FDocumentStatus = 'C' and FCancelStatus='A'"
+	dataList := utilService.SUB_SUBREQORDERInit().Search(FilerString, "")
 
 	articlestockMap := make(map[string]float64)
 	for _, info := range dataList {

task/k3cloud.go

@@ -130,6 +130,7 @@ func ImportWeiWai() {
 	impl := implments.NewBalanceServiceImplement()
 	alldata_Article := impl.GetGlobalArticleData()
 	erp.GetWeiWaiWeekQty(model.PlantNr, "system", &alldata_Article)
+	erp.GetWeiWaiQty(model.PlantNr, "system", &alldata_Article)
 }
 
 func ImportZhaizhi() {

utils/k3cloud.go

@@ -45,14 +45,14 @@ func K3configTestInit() {
 }
 
 //UAT新
-const k3url = "http://10.11.12.24/K3Cloud/"
-const accID = "61cff33d2cf273"
-const username = "aps001"
-const password = "aps202101"
-const OrgId1 = "100729"
-const OrgId2 = "100726"
-const NoId1 = "9999"
-const NoId2 = "9897"
+//const k3url = "http://10.11.12.24/K3Cloud/"
+//const accID = "61cff33d2cf273"
+//const username = "aps001"
+//const password = "aps202101"
+//const OrgId1 = "100729"
+//const OrgId2 = "100726"
+//const NoId1 = "9999"
+//const NoId2 = "9897"
 
 //瑞玛测试服UAT
 //const k3url = "http://10.11.12.24/K3Cloud/"
@@ -92,14 +92,14 @@ func K3configInit() {
 }
 
 //瑞玛正式
-//const k3url = "http://10.11.12.24/K3Cloud/"
-//const accID = "6178dbe238ea56"
-//const username = "aps001"
-//const password = "aps202101"
-//const OrgId1 = "100729"
-//const OrgId2 = "100726"
-//const NoId1 = "9999"
-//const NoId2 = "9897"
+const k3url = "http://10.11.12.24/K3Cloud/"
+const accID = "6178dbe238ea56"
+const username = "aps001"
+const password = "aps202101"
+const OrgId1 = "100729"
+const OrgId2 = "100726"
+const NoId1 = "9999"
+const NoId2 = "9897"
 
 /**
 K3cloud 登录

web/controllers/common/CommonUploadPic.rest.go

@@ -49,6 +49,14 @@ func RegisterReadLog(party router.Party, path string) {
 	})
 }
 
+//同步采购
+func RegisterCaiGou(party router.Party, path string) {
+	party.Get(path, func(ctx iris.Context) {
+		task.ImportChaigou()
+		supports.Ok(ctx, supports.OptionSuccess, nil)
+	})
+}
+
 /******************************************************************************
  *
  * @Function Name            : RegisterUploadMustPic

web/controllers/common/common.go

@@ -34,6 +34,10 @@ func RegisterRoutes() {
 		RegisterEmpinfo(empinfo, "/list")
 		log := party.Party("/log")
 		RegisterReadLog(log, "/read")
+
+		//同步库存
+		task := party.Party("/task")
+		RegisterCaiGou(task, "/caigou")
 	})
 
 }