Merge pull request '共同model提交' (#50) from feature_common into develop

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

models/common/common.go

@@ -0,0 +1,13 @@
+package ap
+
+import (
+	"leit.com/LAPP_CHEERSSON_BACKEND/models/ap"
+	"leit.com/LAPP_CHEERSSON_BACKEND/models/base"
+)
+
+type CustomerDeviationDetailItemBomLst struct {
+	CustomerDeviationDetailItem1 []ap.CustomerDeviationDetailItem `json:"CustomerDeviationDetailItem1" xorm:"-"`
+	CustomerDeviationDetailItem2 []ap.CustomerDeviationDetailItem `json:"CustomerDeviationDetailItem2" xorm:"-"`
+	Article                     *base.Article                     `json:"Article" xorm:"-"`
+}
+

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

@@ -1121,7 +1121,6 @@ func (impl *CustDemandVerHeadServiceImplement) CompareVersionInfoByArtcle(user *
 	artDao := basedal.NewArticleDAO(session, user.PlantNr, user.UserId)
 	mDao := dal.NewCustDemandModelDAO(session, user.PlantNr, user.UserId)
 	tolDao := dal.NewDemandToleranceModelDAO(session, user.PlantNr, user.UserId)
-	data := make([]model.CustomerDeviationDetailItem, 0)
 
 	artInfo,err := artDao.SelectOne(artcle)
 	if err != nil {
@@ -1147,6 +1146,7 @@ func (impl *CustDemandVerHeadServiceImplement) CompareVersionInfoByArtcle(user *
 	}
 
 	if len(cust1) > 0 {
+		data := make([]model.CustomerDeviationDetailItem, 0)
 		var custInfo1 []string
 		custInfo1 = strings.Split(strings.TrimSpace(cust1), ",")
 		if len(custInfo1) == 0 {
@@ -1263,6 +1263,7 @@ func (impl *CustDemandVerHeadServiceImplement) CompareVersionInfoByArtcle(user *
 	}
 
 	if len(cust2) > 0 {
+		data := make([]model.CustomerDeviationDetailItem, 0)
 		var custInfo2 []string
 		custInfo2 = strings.Split(strings.TrimSpace(cust2), ",")
 		if len(custInfo2) == 0 {