预测发布时间修改

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{}

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
 }