Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND into feature_mps_2

conf/htm_log_config.yaml

@@ -21,6 +21,19 @@ config:
     #    支持文件的最大个数
     MaxAge: 30
     info: "<table><tr><td class=\"t_title\">时间：</td><td class=\"time-val\">[time]</td><td class=\"t_title\">错误提示：</td><td class=\"val\">[info]</td></tr><tr><td>Request：</td><td class=\"info\" colspan=\"3\">[request]</td></tr><tr><td>Response:</td><td class=\"info\" colspan=\"3\">[response]</td></tr></table><hr></hr>"
+    replace:
+      - "time"
+      - "info"
+      - "request"
+      - "response"
+  forecast:
+    #    文件location
+    filename: ./log/forecast
+    filetype: html
+    default: "<style>.hr{width:100%;}table{width:100%;border:1;background:#FF9966;}table td{word-break: break-all;background-color:#fff;}.t_title{width:15%;}.time-val{width:30%;}.val{width:40%;font-weight: 700;}.info{width:75%;}</style>"
+    #    支持文件的最大个数
+    MaxAge: 30
+    info: "<table><tr><td class=\"t_title\">时间：</td><td class=\"time-val\">[time]</td><td class=\"t_title\">错误提示：</td><td class=\"val\">[info]</td></tr><tr><td>Request：</td><td class=\"info\" colspan=\"3\">[request]</td></tr><tr><td>Response:</td><td class=\"info\" colspan=\"3\">[response]</td></tr></table><hr></hr>"
     replace:
       - "time"
       - "info"

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

@@ -1205,9 +1205,9 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalVersion(user *global.U
 		if _week == 0 {
 			_week = 7
 		}
-		startDate = startDate.AddDate(0, 0, 0-int(_week))
+		startDate = startDate.AddDate(0, 0, 0-int(_week)+1)
 		_startDate := grmi.Date(startDate)
-		endDate := startDate.AddDate(0, 0, 7)
+		endDate := startDate.AddDate(0, 0, 6)
 		_endDate := grmi.Date(endDate)
 		//查询物料
 		_article := baseModel.Article{}
@@ -3488,9 +3488,9 @@ func (impl *CustDemandVerHeadServiceImplement) IssueGlobalAllVersion(user *globa
 			if _week == 0 {
 				_week = 7
 			}
-			startDate = startDate.AddDate(0, 0, 0-int(_week))
+			startDate = startDate.AddDate(0, 0, 0-int(_week)+1)
 			_startDate := grmi.Date(startDate)
-			endDate := startDate.AddDate(0, 0, 7)
+			endDate := startDate.AddDate(0, 0, 6)
 			_endDate := grmi.Date(endDate)
 			//查询物料
 			_article := baseModel.Article{}

services/erp/erp.go

@@ -420,8 +420,7 @@ 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_ProductType.NewPredicate(grmi.Equal,"DD")})
-
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "DD")})
 
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
 	//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
@@ -463,7 +462,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 				changeMap[number] = 0
 			}
 		}
-		billMap[billNoOrigin+"["+utils.ValueToString(v[6], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap
+		billMap[billNoOrigin+"["+utils.ValueToString(v[7], "")+"]"+"["+utils.ValueToString(v[0], "")+"]"] = changeMap
 	}
 
 	type Bill struct {
@@ -547,14 +546,14 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 	//	}
 	//}
 
-	for _, info := range dataList{
+	for _, info := range dataList {
 		ArtId := info[0].(string)
 		Qty := info[1].(float64)
 		billNoOrigin := info[3].(string)
 		rowId := info[7].(string)
-		_, isIn2 := finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
+		_, isIn2 := finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[7], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
 		if isIn2 {
-			Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[6], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
+			Qty = finalBillQtyMap[billNoOrigin+"["+utils.ValueToString(info[7], "")+"]"+"["+utils.ValueToString(info[0], "")+"]"]
 		}
 		if Qty == 0{
 			continue
@@ -563,7 +562,7 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 
 		Time := utils.WeekDayMondayZeroTs(OriginTime)
 
-		OrderId := "DD"+"_"+billNoOrigin+"_"+rowId
+		OrderId := "DD" + "_" + billNoOrigin + "_" + rowId
 		//fmt.Println(OrderId)
 		Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
@@ -573,9 +572,9 @@ func GetOrderQty(PlantNr int, UserId string, allData *[]model.Article) (err erro
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
 			ExpectedDeliveryDate: grmi.Date(OriginTime),
-			RecieveTime: grmi.DateTime(Time),
-			PlanQty:    Qty,
-			ProductType: "DD",
+			RecieveTime:          grmi.DateTime(Time),
+			PlanQty:              Qty,
+			ProductType:          "DD",
 		}
 		dao_SalesOrder.InsertOne(&SalesOrder)
 		//if err != nil {
@@ -653,7 +652,7 @@ 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_ProductType.NewPredicate(grmi.Equal,"DL")})
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "DL")})
 
 	//articleDemandList, err := dao_ArticleDemand.Select([]grmi.Predicate{}, nil)
 	//if err != nil {
@@ -685,7 +684,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 	//}
 
 	//fmt.Println("独立")
-	for _, info := range dataList{
+	for _, info := range dataList {
 		ArtId := info[0].(string)
 		Qty := info[1].(float64)
 		if Qty == 0{
@@ -696,7 +695,7 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 		billNoOrigin := info[3].(string)
 		rowId := info[4].(string)
 
-		OrderId := "DL"+"_"+billNoOrigin+"_"+rowId
+		OrderId := "DL" + "_" + billNoOrigin + "_" + rowId
 		//fmt.Println(OrderId)
 		//Time = utils.WeekDayMondayZeroTs(Time)
 		SalesOrder := model.SalesOrder{
@@ -706,9 +705,9 @@ func GetDuliQty(PlantNr int, UserId string, allData *[]model.Article) (err error
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
 			ExpectedDeliveryDate: grmi.Date(OriginTime),
-			RecieveTime: grmi.DateTime(Time),
-			PlanQty:    Qty,
-			ProductType: "DL",
+			RecieveTime:          grmi.DateTime(Time),
+			PlanQty:              Qty,
+			ProductType:          "DL",
 		}
 		dao_SalesOrder.InsertOne(&SalesOrder)
 		//if err != nil {
@@ -736,7 +735,7 @@ 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_ProductType.NewPredicate(grmi.Equal,"ZZ")})
+	dao_SalesOrder.DeleteWhere([]grmi.Predicate{meta.SalesOrder_ProductType.NewPredicate(grmi.Equal, "ZZ")})
 
 	//dao_ArticleStock := dal_base.NewArticleStockDAO(session, PlantNr, UserId)
 	//dao_ArticleDemand := dal.NewArticleDemandDAO(session, PlantNr, UserId)
@@ -769,7 +768,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 	//	}
 	//}
 	//fmt.Println("在制")
-	for _, info := range dataList{
+	for _, info := range dataList {
 		//fmt.Println(info)
 		ArtId := info[0].(string)
 		Qty := info[1].(float64)
@@ -780,7 +779,7 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 		billNoOrigin := info[3].(string)
 		rowId := info[4].(string)
 
-		OrderId := "ZZ"+"_"+billNoOrigin+"_"+rowId
+		OrderId := "ZZ" + "_" + billNoOrigin + "_" + rowId
 		//fmt.Println(OrderId)
 		Time := utils.WeekDayMondayZeroTs(OriginTime)
 		SalesOrder := model.SalesOrder{
@@ -790,9 +789,9 @@ func GetZhaizhiWeekQty(PlantNr int, UserId string, allData *[]model.Article) (er
 			//Descr:   articleInfo.Descr1,
 			//FMaterialId: FMaterialId,
 			ExpectedDeliveryDate: grmi.Date(OriginTime),
-			RecieveTime: grmi.DateTime(Time),
-			PlanQty:    Qty,
-			ProductType: "ZZ",
+			RecieveTime:          grmi.DateTime(Time),
+			PlanQty:              Qty,
+			ProductType:          "ZZ",
 		}
 		err := dao_SalesOrder.InsertOne(&SalesOrder)
 		if err != nil {

utils/k3cloud/service/bd_customer.go

@@ -17,7 +17,7 @@ func CustomerInit() *CustomerService {
 		K3config:   utils.K3Obj,
 		FormID:     "BD_Customer",
 		FieldKeys:  "FCUSTID,FNumber,FName,FSUPPLIERID,FZIP,FTEL,FFAX,FTRANSLEADTIME,FEMail,FUseOrgId,F_PAHE_Czhuanyuan.FNumber",
-		FUseOrgKey: "FUseOrgId=" + utils.K3Obj.FUseOrgId,
+		FUseOrgKey: "FUseOrgId IN (" + utils.K3Obj.FUseOrgId + ")",
 	}
 	return cust
 }