diff --git a/conf/htm_log_config.yaml b/conf/htm_log_config.yaml index 9c8c281..e6fc31b 100644 --- a/conf/htm_log_config.yaml +++ b/conf/htm_log_config.yaml @@ -21,6 +21,19 @@ config: # 支持文件的最大个数 MaxAge: 30 info: "
时间:[time]错误提示:[info]
Request:[request]
Response:[response]

" + replace: + - "time" + - "info" + - "request" + - "response" + forecast: + # 文件location + filename: ./log/forecast + filetype: html + default: "" + # 支持文件的最大个数 + MaxAge: 30 + info: "
时间:[time]错误提示:[info]
Request:[request]
Response:[response]

" replace: - "time" - "info" diff --git a/services/ap/implments/CustDemandVerHead.service.impl.go b/services/ap/implments/CustDemandVerHead.service.impl.go index 5dd20ae..812cab2 100644 --- a/services/ap/implments/CustDemandVerHead.service.impl.go +++ b/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{} diff --git a/utils/k3cloud/service/bd_customer.go b/utils/k3cloud/service/bd_customer.go index 9370cf1..f24b343 100644 --- a/utils/k3cloud/service/bd_customer.go +++ b/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 }