models/base/ArticleStock.model.go

@@ -45,11 +45,11 @@ type ArticleStock struct {
 	CreateTime                 grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ArticleStock-CreateTime"`
 
 	FMaterialId 				 int           `xorm:"int 'FMaterialId'" json:"ArticleStock-FMaterialId"`
-	FGQty                  	float64       `xorm:"float 'FGQty'" json:"ArticleStock-FGQty"`
-	SFGQty                  float64       `xorm:"float 'SFGQty'" json:"ArticleStock-SFGQty"`
-	WIPQty                  float64       `xorm:"float 'WIPQty'" json:"ArticleStock-WIPQty"`
-	PUCQty                  float64       `xorm:"float 'PUCQty'" json:"ArticleStock-PUCQty"`
-	OSCQty                  float64       `xorm:"float 'OSCQty'" json:"ArticleStock-OSCQty"`
+	FGQty                  	float64       `xorm:"float 'FGQty'" json:"ArticleStock-FGQty"`//成品库存
+	SFGQty                  float64       `xorm:"float 'SFGQty'" json:"ArticleStock-SFGQty"` //半成品库存
+	WIPQty                  float64       `xorm:"float 'WIPQty'" json:"ArticleStock-WIPQty"` //成品在制库存
+	PUCQty                  float64       `xorm:"float 'PUCQty'" json:"ArticleStock-PUCQty"`//采购量
+	OSCQty                  float64       `xorm:"float 'OSCQty'" json:"ArticleStock-OSCQty"`//委外量
 }
 
 /******************************************************************************

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

@@ -202,12 +202,18 @@ func (impl *BalanceServiceImplement) GetCustomerArticleDemand(user *global.User,
 	//}
 
 	var artStockList []model_base.ArticleStock
-	for _, info := range alldata_ArticleStock{
-		for _, artId := range finalArtIdMap{
-			if info.ArtId ==artId{
+	for _, artId := range finalArtIdMap {
+		isIn := false
+		for _, info := range alldata_ArticleStock {
+			if info.ArtId == artId {
 				artStockList = append(artStockList, info)
+				isIn = true
 			}
 		}
+		if !isIn{
+			var artStockInfo = new(model_base.ArticleStock)
+			artStockList = append(artStockList, *artStockInfo)
+		}
 	}
 
 	//data_ArticleStock, err := dao_ArticleStock.Select([]grmi.Predicate{}, nil)