models/me/ProductFamily.model.go

@@ -35,6 +35,7 @@ type ProductFamily struct {
 	PackTypeId        string                `xorm:"nvarchar(40) 'PackTypeId' not null" json:"ME_ProductFamily-PackTypeId"`
 	CheckSyncKey      bool                  `xorm:"bit 'CheckSyncKey' not null" json:"ME_ProductFamily-CheckSyncKey"`
 	Enable            bool                  `xorm:"bit 'Enable' not null" json:"ME_ProductFamily-Enable"`
+	// 代表派生是樱泰的还是安道拓的
 	CtrlPara1         int                   `xorm:"int 'CtrlPara1' not null" json:"ME_ProductFamily-CtrlPara1"`
 	CtrlPara2         int                   `xorm:"int 'CtrlPara2' not null" json:"ME_ProductFamily-CtrlPara2"`
 	CtrlStr1          string                `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"ME_ProductFamily-CtrlStr1"`

services/pln/implments/ToyotaCalloff.service.impl.go

@@ -680,6 +680,9 @@ func (impl *ToyotaCalloffServiceImplement) ParseCallOffData(user *global.User, p
 			}
 			productFamilyMap[callOffData.ProductFamilyId] = productFamily
 		}
+
+		var seatData string
+		if productFamily.CtrlPara1 == 1 { // 如果座椅是安道拓的
 			productLi, exist := productFamilyRelateMap[callOffData.ProductFamilyId]
 			if !exist {
 				productLi, err = productFamilyRelateDao.SelectProductByFamilyId(project.ProjectId, callOffData.ProductFamilyId)
@@ -717,7 +720,7 @@ func (impl *ToyotaCalloffServiceImplement) ParseCallOffData(user *global.User, p
 				}
 				productFamilyRelateMap[callOffData.ProductFamilyId] = productLi
 			}
-		seatData, err := impl.MakeUpSeatData(productLi)
+			seatData, err = impl.MakeUpSeatData(productLi)
 			if err != nil {
 				callOffError := model.ToyotaCallOffErrorLst{
 					DemandId:    callOffData.DemandId,
@@ -734,6 +737,13 @@ func (impl *ToyotaCalloffServiceImplement) ParseCallOffData(user *global.User, p
 				}
 				break
 			}
+		} else { // 如果座椅是樱泰的
+			seatData = productFamily.ProductFamilyId
+			for i := len(seatData); i < 25; i++ {
+				seatData += "0"
+			}
+		}
+
 		plcCode := `1` + strconv.Itoa(productFamily.CtrlPara1) + seatData
 		deliveryOrder := model.ToyotaDeliveryOrder{
 			DemandId:        callOffData.DemandId,