Merge pull request '修改bug' (#300) from feature_mps_2 into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_CHEERSSON_BACKEND/pulls/300

models/ap/ArticleDemand.model.go

@@ -42,8 +42,8 @@ type ArticleDemand struct {
 	PublishedVersionNr   string    `xorm:"nvarchar(40) 'PublishedVersionNr'" json:"AP_ArticleDemand-PublishedVersionNr"`     //期末库存
 	Status               int       `xorm:"int 'Status' not null" json:"AP_ArticleDemand-Status"`                             //0未发布 1 发布中 2 已发布
 
-	ZaituQty               float64   `xorm:"-" json:"AP_ArticleDemand-ZaituQty"`                                    //在途量
-	WeiwaiQty  				float64   `xorm:"-" json:"AP_ArticleDemand-WeiwaiQty"`                                    //委外量
+	ZaituQty               float64   `xorm:"float 'ZaituQty'" json:"AP_ArticleDemand-ZaituQty"`                                    //在途量
+	WeiwaiQty  				float64   `xorm:"float 'WeiwaiQty'" json:"AP_ArticleDemand-WeiwaiQty"`                                    //委外量
 
 	//不显示
 	OriginOutSourcingQty float64 `xorm:"float 'OriginOutSourcingQty'" json:"AP_ArticleDemand-OriginOutSourcingQty"` //原始外购需求

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

@@ -3497,6 +3497,8 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 			MaxCoverPeriod:     MaxCoverPeriod,
 			MinCoverPeriodType: "W",
 			ResourceId:         resourceId,
+			WeiwaiQty: 0,
+			ZaituQty: 0,
 		}
 
 		firstDemandList = append(firstDemandList, firstArticleDemand)
@@ -3684,6 +3686,8 @@ func (impl *BalanceServiceImplement) RefreshBalanceData(user *global.User) error
 			MaxCoverPeriod:     MaxCoverPeriod,
 			MinCoverPeriodType: "W",
 			ResourceId:         resourceId,
+			WeiwaiQty: 0,
+			ZaituQty: 0,
 		}
 
 		firstDemandList = append(firstDemandList, firstArticleDemand)