leo
/
LAPP_CHEERSSON_BACKEND
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request 'feature_jindie' (#291) from feature_jindie into develop 

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/291
pull/293/head
徐腾飞 3 years ago
parent
7a00746c3a 882d4d1dee
commit
cb62b0c68b
4 changed files with 39 additions and 27 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +13
    -0
      conf/htm_log_config.yaml
  2. +4
    -4
      services/ap/implments/CustDemandVerHead.service.impl.go
  3. +21
    -22
      services/erp/erp.go
  4. +1
    -1
      utils/k3cloud/service/bd_customer.go

+ 13
- 0
conf/htm_log_config.yaml View File

@ -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"


+ 4
- 4
services/ap/implments/CustDemandVerHead.service.impl.go View File

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


+ 21
- 22
services/erp/erp.go View File

@ -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,20 +546,20 @@ 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], "")+"]"]
}
OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
Time := utils.WeekDayMondayZeroTs(OriginTime)
OrderId := "DD"+"_"+billNoOrigin+"_"+rowId
OrderId := "DD" + "_" + billNoOrigin + "_" + rowId
//fmt.Println(OrderId)
Time = utils.WeekDayMondayZeroTs(Time)
SalesOrder := model.SalesOrder{
@ -570,9 +569,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 {
@ -650,7 +649,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 {
@ -682,7 +681,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)
OriginTime, _ := time.ParseInLocation("2006-01-02T15:04:05", utils.ValueToString(info[2], ""), utils.TimezoneLocation)
@ -690,7 +689,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{
@ -700,9 +699,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 {
@ -730,7 +729,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)
@ -763,7 +762,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)
@ -771,7 +770,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{
@ -781,9 +780,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 {


+ 1
- 1
utils/k3cloud/service/bd_customer.go View File

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


Write Preview
Loading…
Cancel
Save