Merge pull request '添加pickingFlag 同时生成serialOrder将pickingFlag写入到serialorder上' (#38) from feature_me into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/38

meta/me/Product.meta.go

@@ -44,6 +44,7 @@ var Product_WorkLineId = grmi.NewField("WorkLineId", "[ME_Product].WorkLineId",
 var Product_PlanPriority = grmi.NewField("PlanPriority", "[ME_Product].PlanPriority", "planpriority", grmi.TypeInt)
 var Product_BatchSize = grmi.NewField("BatchSize", "[ME_Product].BatchSize", "batchsize", grmi.TypeInt)
 var Product_LeadTimeInSecond = grmi.NewField("LeadTimeInSecond", "[ME_Product].LeadTimeInSecond", "leadtimeinsecond", grmi.TypeInt)
+var Product_PickingFlag = grmi.NewField("PickingFlag", "[ME_Product].PickingFlag", "pickingflag", grmi.TypeString)
 var Product_CtrlPara1 = grmi.NewField("CtrlPara1", "[ME_Product].CtrlPara1", "ctrlpara1", grmi.TypeInt)
 var Product_CtrlPara2 = grmi.NewField("CtrlPara2", "[ME_Product].CtrlPara2", "ctrlpara2", grmi.TypeInt)
 var Product_CtrlStr1 = grmi.NewField("CtrlStr1", "[ME_Product].CtrlStr1", "ctrlstr1", grmi.TypeString)
@@ -95,6 +96,7 @@ var Product = grmi.NewEntity(
 		Product_PlanPriority.Name:          Product_PlanPriority,
 		Product_BatchSize.Name:             Product_BatchSize,
 		Product_LeadTimeInSecond.Name:      Product_LeadTimeInSecond,
+		Product_PickingFlag.Name:           Product_PickingFlag,
 		Product_CtrlPara1.Name:             Product_CtrlPara1,
 		Product_CtrlPara2.Name:             Product_CtrlPara2,
 		Product_CtrlStr1.Name:              Product_CtrlStr1,
@@ -106,4 +108,4 @@ var Product = grmi.NewEntity(
 		Product_CreateTime.Name:            Product_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"Descr", "Descr1", "Descr2", "PartId", "DefaultWorkLineId", "MultiWorkLineToggle", "CustPartId", "IntPartId", "PlanType", "PlanMode", "ProductType", "ProductType1", "ProductType2", "ProductSpec", "ProductSpec1", "ProductSpec2", "AllowPackToggle", "CreateWorkOrderToggle", "CreatePackOrderToggle", "PackSize", "PackOrderItemSize", "Jph", "WorkLineId", "PlanPriority", "BatchSize", "LeadTimeInSecond", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"Descr", "Descr1", "Descr2", "PartId", "DefaultWorkLineId", "MultiWorkLineToggle", "CustPartId", "IntPartId", "PlanType", "PlanMode", "ProductType", "ProductType1", "ProductType2", "ProductSpec", "ProductSpec1", "ProductSpec2", "AllowPackToggle", "CreateWorkOrderToggle", "CreatePackOrderToggle", "PackSize", "PackOrderItemSize", "Jph", "WorkLineId", "PlanPriority", "BatchSize", "LeadTimeInSecond", "PickingFlag", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})

meta/om/SerialOrder.meta.go

@@ -45,6 +45,7 @@ var SerialOrder_PlanStartTime = grmi.NewField("PlanStartTime", "[OM_SerialOrder]
 var SerialOrder_PlanEndTime = grmi.NewField("PlanEndTime", "[OM_SerialOrder].PlanEndTime", "planendtime", grmi.TypeDateTime)
 var SerialOrder_ActStartTime = grmi.NewField("ActStartTime", "[OM_SerialOrder].ActStartTime", "actstarttime", grmi.TypeDateTime)
 var SerialOrder_ActEndTime = grmi.NewField("ActEndTime", "[OM_SerialOrder].ActEndTime", "actendtime", grmi.TypeDateTime)
+var SerialOrder_PickingFlag = grmi.NewField("PickingFlag", "[OM_SerialOrder].PickingFlag", "pickingflag", grmi.TypeString)
 var SerialOrder_CtrlPara1 = grmi.NewField("CtrlPara1", "[OM_SerialOrder].CtrlPara1", "ctrlpara1", grmi.TypeInt)
 var SerialOrder_CtrlPara2 = grmi.NewField("CtrlPara2", "[OM_SerialOrder].CtrlPara2", "ctrlpara2", grmi.TypeInt)
 var SerialOrder_CtrlStr1 = grmi.NewField("CtrlStr1", "[OM_SerialOrder].CtrlStr1", "ctrlstr1", grmi.TypeString)
@@ -97,6 +98,7 @@ var SerialOrder = grmi.NewEntity(
 		SerialOrder_PlanEndTime.Name:       SerialOrder_PlanEndTime,
 		SerialOrder_ActStartTime.Name:      SerialOrder_ActStartTime,
 		SerialOrder_ActEndTime.Name:        SerialOrder_ActEndTime,
+		SerialOrder_PickingFlag.Name:       SerialOrder_PickingFlag,
 		SerialOrder_CtrlPara1.Name:         SerialOrder_CtrlPara1,
 		SerialOrder_CtrlPara2.Name:         SerialOrder_CtrlPara2,
 		SerialOrder_CtrlStr1.Name:          SerialOrder_CtrlStr1,
@@ -108,4 +110,4 @@ var SerialOrder = grmi.NewEntity(
 		SerialOrder_CreateTime.Name:        SerialOrder_CreateTime,
 	},
 	[]string{"PlantNr"},
-	[]string{"ArtId", "ProjectId", "Descr", "WorkOrderId", "CustOrderId", "FirstPieceInBatch", "LastPieceInBatch", "PreSchedKey", "SchedKey", "Priority", "OrderType", "OrderType1", "OrderType2", "PlanResourceId", "UsedResourceId", "PlanQty", "QtyUomId", "OpTimePerItem", "TimeUomId", "PlanStartDate", "PlanEndDate", "SetupStartTime", "SetupEndTime", "PlanStartTime", "PlanEndTime", "ActStartTime", "ActEndTime", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})
+	[]string{"ArtId", "ProjectId", "Descr", "WorkOrderId", "CustOrderId", "FirstPieceInBatch", "LastPieceInBatch", "PreSchedKey", "SchedKey", "Priority", "OrderType", "OrderType1", "OrderType2", "PlanResourceId", "UsedResourceId", "PlanQty", "QtyUomId", "OpTimePerItem", "TimeUomId", "PlanStartDate", "PlanEndDate", "SetupStartTime", "SetupEndTime", "PlanStartTime", "PlanEndTime", "ActStartTime", "ActEndTime", "PickingFlag", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"})

models/me/Product.model.go

@@ -50,6 +50,7 @@ type Product struct {
 	PlanPriority          int             `xorm:"int 'PlanPriority' not null" json:"ME_Product-PlanPriority"`
 	BatchSize             int             `xorm:"int 'BatchSize' not null" json:"ME_Product-BatchSize"`
 	LeadTimeInSecond      int             `xorm:"int 'LeadTimeInSecond' not null" json:"ME_Product-LeadTimeInSecond"`
+	PickingFlag           string          `xorm:"nvarchar(40) 'PickingFlag' not null" json:"ME_Product-PickingFlag"`
 	CtrlPara1             int             `xorm:"int 'CtrlPara1' not null" json:"ME_Product-CtrlPara1"`
 	CtrlPara2             int             `xorm:"int 'CtrlPara2' not null" json:"ME_Product-CtrlPara2"`
 	CtrlStr1              string          `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"ME_Product-CtrlStr1"`

models/om/SerialOrder.model.go

@@ -49,6 +49,7 @@ type SerialOrder struct {
 	PlanEndTime       grmi.DateTime     `xorm:"datetime 'PlanEndTime' not null" json:"OM_SerialOrder-PlanEndTime"`
 	ActStartTime      grmi.DateTime     `xorm:"datetime 'ActStartTime' not null" json:"OM_SerialOrder-ActStartTime"`
 	ActEndTime        grmi.DateTime     `xorm:"datetime 'ActEndTime' not null" json:"OM_SerialOrder-ActEndTime"`
+	PickingFlag       string            `xorm:"nvarchar(40) 'PickingFlag' not null" json:"OM_SerialOrder-PickingFlag"`
 	CtrlPara1         int               `xorm:"int 'CtrlPara1' not null" json:"OM_SerialOrder-CtrlPara1"`
 	CtrlPara2         int               `xorm:"int 'CtrlPara2' not null" json:"OM_SerialOrder-CtrlPara2"`
 	CtrlStr1          string            `xorm:"nvarchar(255) 'CtrlStr1' not null" json:"OM_SerialOrder-CtrlStr1"`

services/me/implments/Product.service.impl.go

@@ -49,6 +49,7 @@ var DefaultConditionOfProduct = grmi.NewCondition(
 		meta.Product_PlanPriority.UrlParameterName:          grmi.NewConditionItem(meta.Product_PlanPriority, grmi.Equal, false),
 		meta.Product_BatchSize.UrlParameterName:             grmi.NewConditionItem(meta.Product_BatchSize, grmi.Equal, false),
 		meta.Product_LeadTimeInSecond.UrlParameterName:      grmi.NewConditionItem(meta.Product_LeadTimeInSecond, grmi.Equal, false),
+		meta.Product_PickingFlag.UrlParameterName:           grmi.NewConditionItem(meta.Product_PickingFlag, grmi.Equal, false),
 		meta.Product_CtrlPara1.UrlParameterName:             grmi.NewConditionItem(meta.Product_CtrlPara1, grmi.Equal, false),
 		meta.Product_CtrlPara2.UrlParameterName:             grmi.NewConditionItem(meta.Product_CtrlPara2, grmi.Equal, false),
 		meta.Product_CtrlStr1.UrlParameterName:              grmi.NewConditionItem(meta.Product_CtrlStr1, grmi.Equal, false),
@@ -462,4 +463,4 @@ func (impl *ProductServiceImplement) SelectByWorkLine(user *global.User, workLin
 	productLi = append(productLi, relateProductLi...)
 	return productLi, nil
 
-}
+}

services/om/implments/SerialOrder.service.impl.go

@@ -57,6 +57,7 @@ var DefaultConditionOfSerialOrder = grmi.NewCondition(
 		meta.SerialOrder_PlanEndTime.UrlParameterName:       grmi.NewConditionItem(meta.SerialOrder_PlanEndTime, grmi.Approximate, false),
 		meta.SerialOrder_ActStartTime.UrlParameterName:      grmi.NewConditionItem(meta.SerialOrder_ActStartTime, grmi.Approximate, false),
 		meta.SerialOrder_ActEndTime.UrlParameterName:        grmi.NewConditionItem(meta.SerialOrder_ActEndTime, grmi.Approximate, false),
+		meta.SerialOrder_PickingFlag.UrlParameterName:       grmi.NewConditionItem(meta.SerialOrder_PickingFlag, grmi.Equal, false),
 		meta.SerialOrder_CtrlPara1.UrlParameterName:         grmi.NewConditionItem(meta.SerialOrder_CtrlPara1, grmi.Equal, false),
 		meta.SerialOrder_CtrlPara2.UrlParameterName:         grmi.NewConditionItem(meta.SerialOrder_CtrlPara2, grmi.Equal, false),
 		meta.SerialOrder_CtrlStr1.UrlParameterName:          grmi.NewConditionItem(meta.SerialOrder_CtrlStr1, grmi.Equal, false),

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

@@ -608,6 +608,7 @@ func (impl *CustOrderServiceImplement) LockCustOrder(user *global.User, custOrde
 					PlanEndDate:    planEndDate,
 					PlanStartTime:  grmi.DateTime(planStartTime),
 					PlanEndTime:    grmi.DateTime(planEndTime),
+					PickingFlag:    product.PickingFlag,
 				}
 				serialOrderLi = append(serialOrderLi, serialOrder)
 				serialOrderStatus := omModel.SerialOrderStatus{