diff --git a/.gitignore b/.gitignore index 7c36cbe..8528472 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .idea/ .DS_Store output/ +web/public/ +log/ # Binaries for programs and plugins *.exe @@ -8,10 +10,11 @@ output/ *.dll *.so *.dylib +*.log +demo*.go # Test binary, built with `go test -c` *.test - # Output of the go coverage tool, specifically when used with LiteIDE *.out diff --git a/dao/pln/implments/ToyotaCalloff.dao.impl.go b/dao/pln/implments/ToyotaCalloff.dao.impl.go index e64e86b..e8b1138 100644 --- a/dao/pln/implments/ToyotaCalloff.dao.impl.go +++ b/dao/pln/implments/ToyotaCalloff.dao.impl.go @@ -8,7 +8,6 @@ import ( model "LAPP_ACURA_MOM_BACKEND/models/pln" "fmt" "github.com/go-xorm/xorm" - "reflect" "xorm.io/core" ) @@ -264,27 +263,26 @@ func (impl *ToyotaCalloffDAOImplement) SelectAndPaging(paging *grmi.Paging, pred if predicate.ColumnName == meta.ToyotaCalloff_Parsed.ColumnName { if len(predicate.Values) != 0 { parsed := predicate.Values[0] - fmt.Println("parsed:", parsed) - fmt.Println(reflect.TypeOf(parsed)) if parsed == int64(-1) { where += fmt.Sprintf(" and %s != ?", meta.ToyotaCalloff_Parsed.ColumnName) parameters = append(parameters, model.CALLOFF_STATUS_SHIPED) continue } } - } else if predicate.ColumnName == meta.ToyotaCalloff_OrderTime.ColumnName { - if len(predicate.Values) != 0 { - day := predicate.Values[0] - dayStr, ok := day.(string) - if ok { - start := dayStr + " 00:00:00" - end := dayStr + " 23:59:59" - where += fmt.Sprintf(" and %s >= ? and %s <= ?", meta.ToyotaCalloff_OrderTime.ColumnName, meta.ToyotaCalloff_OrderTime.ColumnName) - parameters = append(parameters, start, end) - continue - } - } } + //} else if predicate.ColumnName == meta.ToyotaCalloff_OrderTime.ColumnName { + // if len(predicate.Values) != 0 { + // day := predicate.Values[0] + // dayStr, ok := day.(string) + // if ok { + // start := dayStr + " 00:00:00" + // end := dayStr + " 23:59:59" + // where += fmt.Sprintf(" and %s >= ? and %s <= ?", meta.ToyotaCalloff_OrderTime.ColumnName, meta.ToyotaCalloff_OrderTime.ColumnName) + // parameters = append(parameters, start, end) + // continue + // } + // } + //} where += predicate.Build() parameters = append(parameters, predicate.Values...) } @@ -375,9 +373,10 @@ func (impl *ToyotaCalloffDAOImplement) UpdateWhere(predicates []grmi.Predicate, ******************************************************************************/ func (impl *ToyotaCalloffDAOImplement) SelectMaxSeqCallOff() (*model.ToyotaCalloff, error) { - parameters := []interface{}{impl.plantNr} - where := fmt.Sprintf("%s = ?", + parameters := []interface{}{impl.plantNr, model.CALLOFF_STATUS_PARSED} + where := fmt.Sprintf("%s = ? and %s = ?", meta.ToyotaCalloff_PlantNr.ColumnName, + meta.ToyotaCalloff_Parsed.ColumnName, ) var data model.ToyotaCalloff ok, err := impl.session.Table(impl.meta.TableName).Where(where, parameters...).Desc(meta.ToyotaCalloff_RecordId.Name).Get(&data) diff --git a/meta/me/Product.meta.go b/meta/me/Product.meta.go index 3058f38..080c82e 100644 --- a/meta/me/Product.meta.go +++ b/meta/me/Product.meta.go @@ -19,6 +19,7 @@ import ( var Product_PlantNr = grmi.NewField("PlantNr", "[ME_Product].PlantNr", "plantnr", grmi.TypeInt) var Product_ProductId = grmi.NewField("ProductId", "[ME_Product].ProductId", "productid", grmi.TypeString) var Product_ProjectId = grmi.NewField("ProjectId", "[ME_Product].ProjectId", "projectid", grmi.TypeString) +var Product_SerialOrderSnr = grmi.NewField("SerialOrderSnr", "[ME_Product].SerialOrderSnr", "serialordersnr", grmi.TypeString) var Product_Descr = grmi.NewField("Descr", "[ME_Product].Descr", "descr", grmi.TypeString) var Product_Descr1 = grmi.NewField("Descr1", "[ME_Product].Descr1", "descr1", grmi.TypeString) var Product_Descr2 = grmi.NewField("Descr2", "[ME_Product].Descr2", "descr2", grmi.TypeString) @@ -74,6 +75,7 @@ var Product = grmi.NewEntity( Product_PlantNr.Name: Product_PlantNr, Product_ProductId.Name: Product_ProductId, Product_ProjectId.Name: Product_ProjectId, + Product_SerialOrderSnr.Name: Product_SerialOrderSnr, Product_Descr.Name: Product_Descr, Product_Descr1.Name: Product_Descr1, Product_Descr2.Name: Product_Descr2, @@ -114,4 +116,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", "PlanPriority", "BatchSize", "LeadTimeInSecond", "PickingFlag", "MachineCode", "ColorValue", "PrintTemplateId", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) + []string{"Descr", "Descr1", "Descr2", "PartId", "SerialOrderSnr", "DefaultWorkLineId", "MultiWorkLineToggle", "CustPartId", "IntPartId", "PlanType", "PlanMode", "ProductType", "ProductType1", "ProductType2", "ProductSpec", "ProductSpec1", "ProductSpec2", "AllowPackToggle", "CreateWorkOrderToggle", "CreatePackOrderToggle", "PackSize", "PackOrderItemSize", "Jph", "PlanPriority", "BatchSize", "LeadTimeInSecond", "PickingFlag", "MachineCode", "ColorValue", "PrintTemplateId", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) diff --git a/meta/me/ProductFamily.meta.go b/meta/me/ProductFamily.meta.go index a155e06..e8f9f96 100644 --- a/meta/me/ProductFamily.meta.go +++ b/meta/me/ProductFamily.meta.go @@ -80,4 +80,4 @@ var ProductFamily = grmi.NewEntity( ProductFamily_CreateTime.Name: ProductFamily_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "MultiWorkLineToggle", "Jph", "WorkLineId", "PackTypeId", "CheckSyncKey", "Enable", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) + []string{"Descr", "ProjectId", "ConfigValue", "ModelValue", "ColorValue", "BroadcastPoint", "AutoGenPackToggle", "MultiWorkLineToggle", "Jph", "WorkLineId", "PackTypeId", "CheckSyncKey", "Enable", "CtrlPara1", "CtrlPara2", "CtrlStr1", "CtrlStr2", "CtrlTime1", "CtrlTime2", "LastUser"}) diff --git a/models/me/Product.model.go b/models/me/Product.model.go index ecdd2f3..a958126 100644 --- a/models/me/Product.model.go +++ b/models/me/Product.model.go @@ -20,51 +20,52 @@ import ( * ******************************************************************************/ type Product struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_Product-PlantNr"` - ProductId string `xorm:"pk nvarchar(40) 'ProductId'" json:"ME_Product-ProductId"` - Descr string `xorm:"nvarchar(40) 'Descr' not null" json:"ME_Product-Descr"` - ProductFamilyId string `xorm:"-" json:"ME_Product-ProductFamilyId"` - ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ME_Product-ProjectId"` - DefaultWorkLineId string `xorm:"nvarchar(40) 'DefaultWorkLineId'" json:"ME_Product-DefaultWorkLineId"` - MultiWorkLineToggle bool `xorm:"bit 'MultiWorkLineToggle' not null" json:"ME_Product-MultiWorkLineToggle"` - Descr1 string `xorm:"nvarchar(40) 'Descr1' not null" json:"ME_Product-Descr1"` - Descr2 string `xorm:"nvarchar(40) 'Descr2' not null" json:"ME_Product-Descr2"` - PartId string `xorm:"nvarchar(40) 'PartId' not null" json:"ME_Product-PartId"` - CustPartId string `xorm:"nvarchar(40) 'CustPartId' not null" json:"ME_Product-CustPartId"` - IntPartId string `xorm:"nvarchar(40) 'IntPartId' not null" json:"ME_Product-IntPartId"` - PlanType string `xorm:"nvarchar(20) 'PlanType' not null" json:"ME_Product-PlanType"` - PlanMode string `xorm:"nvarchar(20) 'PlanMode' not null" json:"ME_Product-PlanMode"` - ProductType string `xorm:"nvarchar(20) 'ProductType' not null" json:"ME_Product-ProductType"` - ProductType1 string `xorm:"nvarchar(20) 'ProductType1' not null" json:"ME_Product-ProductType1"` - ProductType2 string `xorm:"nvarchar(20) 'ProductType2' not null" json:"ME_Product-ProductType2"` - ProductSpec string `xorm:"nvarchar(40) 'ProductSpec' not null" json:"ME_Product-ProductSpec"` - ProductSpec1 string `xorm:"nvarchar(40) 'ProductSpec1' not null" json:"ME_Product-ProductSpec1"` - ProductSpec2 string `xorm:"nvarchar(40) 'ProductSpec2' not null" json:"ME_Product-ProductSpec2"` - AllowPackToggle bool `xorm:"bit 'AllowPackToggle' not null" json:"ME_Product-AllowPackToggle"` - CreateWorkOrderToggle bool `xorm:"bit 'CreateWorkOrderToggle' not null" json:"ME_Product-CreateWorkOrderToggle"` - CreatePackOrderToggle bool `xorm:"bit 'CreatePackOrderToggle' not null" json:"ME_Product-CreatePackOrderToggle"` - PackSize int `xorm:"int 'PackSize' not null" json:"ME_Product-PackSize"` - PackOrderItemSize int `xorm:"int 'PackOrderItemSize' not null" json:"ME_Product-PackOrderItemSize"` - Jph float64 `xorm:"float 'Jph' not null" json:"ME_Product-Jph"` - 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"` - MachineCode string `xorm:"nvarchar(40) 'MachineCode' not null" json:"ME_Product-MachineCode"` - ColorValue string `xorm:"nvarchar(40) 'ColorValue' not null" json:"ME_Product-ColorValue"` - PrintTemplateId string `xorm:"nvarchar(40) 'PrintTemplateId' not null" json:"ME_Product-PrintTemplateId"` - 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"` - CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"ME_Product-CtrlStr2"` - CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1' not null" json:"ME_Product-CtrlTime1"` - CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2' not null" json:"ME_Product-CtrlTime2"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_Product-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_Product-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_Product-CreateTime"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_Product-PlantNr"` + ProductId string `xorm:"pk nvarchar(40) 'ProductId'" json:"ME_Product-ProductId"` + Descr string `xorm:"nvarchar(40) 'Descr' not null" json:"ME_Product-Descr"` + SerialOrderSnr string `xorm:"nvarchar(40) 'SerialOrderSnr' not null" json:"ME_Product-SerialOrderSnr"` + ProductFamilyId string `xorm:"-" json:"ME_Product-ProductFamilyId"` + ProjectId string `xorm:"pk nvarchar(40) 'ProjectId'" json:"ME_Product-ProjectId"` + DefaultWorkLineId string `xorm:"nvarchar(40) 'DefaultWorkLineId'" json:"ME_Product-DefaultWorkLineId"` + MultiWorkLineToggle bool `xorm:"bit 'MultiWorkLineToggle' not null" json:"ME_Product-MultiWorkLineToggle"` + Descr1 string `xorm:"nvarchar(40) 'Descr1' not null" json:"ME_Product-Descr1"` + Descr2 string `xorm:"nvarchar(40) 'Descr2' not null" json:"ME_Product-Descr2"` + PartId string `xorm:"nvarchar(40) 'PartId' not null" json:"ME_Product-PartId"` + CustPartId string `xorm:"nvarchar(40) 'CustPartId' not null" json:"ME_Product-CustPartId"` + IntPartId string `xorm:"nvarchar(40) 'IntPartId' not null" json:"ME_Product-IntPartId"` + PlanType string `xorm:"nvarchar(20) 'PlanType' not null" json:"ME_Product-PlanType"` + PlanMode string `xorm:"nvarchar(20) 'PlanMode' not null" json:"ME_Product-PlanMode"` + ProductType string `xorm:"nvarchar(20) 'ProductType' not null" json:"ME_Product-ProductType"` + ProductType1 string `xorm:"nvarchar(20) 'ProductType1' not null" json:"ME_Product-ProductType1"` + ProductType2 string `xorm:"nvarchar(20) 'ProductType2' not null" json:"ME_Product-ProductType2"` + ProductSpec string `xorm:"nvarchar(40) 'ProductSpec' not null" json:"ME_Product-ProductSpec"` + ProductSpec1 string `xorm:"nvarchar(40) 'ProductSpec1' not null" json:"ME_Product-ProductSpec1"` + ProductSpec2 string `xorm:"nvarchar(40) 'ProductSpec2' not null" json:"ME_Product-ProductSpec2"` + AllowPackToggle bool `xorm:"bit 'AllowPackToggle' not null" json:"ME_Product-AllowPackToggle"` + CreateWorkOrderToggle bool `xorm:"bit 'CreateWorkOrderToggle' not null" json:"ME_Product-CreateWorkOrderToggle"` + CreatePackOrderToggle bool `xorm:"bit 'CreatePackOrderToggle' not null" json:"ME_Product-CreatePackOrderToggle"` + PackSize int `xorm:"int 'PackSize' not null" json:"ME_Product-PackSize"` + PackOrderItemSize int `xorm:"int 'PackOrderItemSize' not null" json:"ME_Product-PackOrderItemSize"` + Jph float64 `xorm:"float 'Jph' not null" json:"ME_Product-Jph"` + 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"` + MachineCode string `xorm:"nvarchar(40) 'MachineCode' not null" json:"ME_Product-MachineCode"` + ColorValue string `xorm:"nvarchar(40) 'ColorValue' not null" json:"ME_Product-ColorValue"` + PrintTemplateId string `xorm:"nvarchar(40) 'PrintTemplateId' not null" json:"ME_Product-PrintTemplateId"` + 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"` + CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"ME_Product-CtrlStr2"` + CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1' not null" json:"ME_Product-CtrlTime1"` + CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2' not null" json:"ME_Product-CtrlTime2"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_Product-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_Product-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_Product-CreateTime"` //Project []Project `xorm:"-" json:"-"` - ProductFamily []ProductFamily `xorm:"-" json:"ME_Product-ProductFamily"` - Count int `xorm:"-" json:"ME_Product-Count"` + ProductFamily []ProductFamily `xorm:"-" json:"ME_Product-ProductFamily"` + Count int `xorm:"-" json:"ME_Product-Count"` } /****************************************************************************** diff --git a/models/me/ProductFamily.model.go b/models/me/ProductFamily.model.go index 550e0aa..8510ef7 100644 --- a/models/me/ProductFamily.model.go +++ b/models/me/ProductFamily.model.go @@ -20,35 +20,35 @@ import ( * ******************************************************************************/ type ProductFamily struct { - PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_ProductFamily-PlantNr"` - ProductFamilyId string `xorm:"pk nvarchar(40) 'ProductFamilyId'" json:"ME_ProductFamily-ProductFamilyId"` - Descr string `xorm:"nvarchar(40) 'Descr' not null" json:"ME_ProductFamily-Descr"` - ProjectId string `xorm:"nvarchar(40) 'ProjectId' not null" json:"ME_ProductFamily-ProjectId"` - ConfigValue string `xorm:"nvarchar(40) 'ConfigValue' not null" json:"ME_ProductFamily-ConfigValue"` - ModelValue string `xorm:"nvarchar(40) 'ModelValue' not null" json:"ME_ProductFamily-ModelValue"` - ColorValue string `xorm:"nvarchar(40) 'ColorValue' not null" json:"ME_ProductFamily-ColorValue"` - BroadcastPoint string `xorm:"nvarchar(40) 'BroadcastPoint' not null" json:"ME_ProductFamily-BroadcastPoint"` - AutoGenPackToggle bool `xorm:"bit 'AutoGenPackToggle' not null" json:"ME_ProductFamily-AutoGenPackToggle"` - MultiWorkLineToggle bool `xorm:"bit 'MultiWorkLineToggle' not null" json:"ME_ProductFamily-MultiWorkLineToggle"` - Jph float64 `xorm:"float 'Jph' not null" json:"ME_ProductFamily-Jph"` - WorkLineId string `xorm:"nvarchar(40) 'WorkLineId' not null" json:"ME_ProductFamily-WorkLineId"` - 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"` + PlantNr int `xorm:"pk int 'PlantNr'" json:"ME_ProductFamily-PlantNr"` + ProductFamilyId string `xorm:"pk nvarchar(40) 'ProductFamilyId'" json:"ME_ProductFamily-ProductFamilyId"` + Descr string `xorm:"nvarchar(40) 'Descr' not null" json:"ME_ProductFamily-Descr"` + ProjectId string `xorm:"nvarchar(40) 'ProjectId' not null" json:"ME_ProductFamily-ProjectId"` + ConfigValue string `xorm:"nvarchar(40) 'ConfigValue' not null" json:"ME_ProductFamily-ConfigValue"` + ModelValue string `xorm:"nvarchar(40) 'ModelValue' not null" json:"ME_ProductFamily-ModelValue"` + ColorValue string `xorm:"nvarchar(40) 'ColorValue' not null" json:"ME_ProductFamily-ColorValue"` + BroadcastPoint string `xorm:"nvarchar(40) 'BroadcastPoint' not null" json:"ME_ProductFamily-BroadcastPoint"` + AutoGenPackToggle bool `xorm:"bit 'AutoGenPackToggle' not null" json:"ME_ProductFamily-AutoGenPackToggle"` + MultiWorkLineToggle bool `xorm:"bit 'MultiWorkLineToggle' not null" json:"ME_ProductFamily-MultiWorkLineToggle"` + Jph float64 `xorm:"float 'Jph' not null" json:"ME_ProductFamily-Jph"` + WorkLineId string `xorm:"nvarchar(40) 'WorkLineId' not null" json:"ME_ProductFamily-WorkLineId"` + 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"` - CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"ME_ProductFamily-CtrlStr2"` - CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1' not null" json:"ME_ProductFamily-CtrlTime1"` - CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2' not null" json:"ME_ProductFamily-CtrlTime2"` - LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_ProductFamily-LastModify"` - LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_ProductFamily-LastUser"` - CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_ProductFamily-CreateTime"` - Product []Product `xorm:"-" json:"ME_ProductFamily-Product"` - Relate []ProductFamilyRelate `xorm:"-" json:"-"` - Project Project `xorm:"-" json:"-"` - Count int `xorm:"-" json:"ME_ProductFamily-Count"` + 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"` + CtrlStr2 string `xorm:"nvarchar(255) 'CtrlStr2' not null" json:"ME_ProductFamily-CtrlStr2"` + CtrlTime1 grmi.DateTime `xorm:"datetime 'CtrlTime1' not null" json:"ME_ProductFamily-CtrlTime1"` + CtrlTime2 grmi.DateTime `xorm:"datetime 'CtrlTime2' not null" json:"ME_ProductFamily-CtrlTime2"` + LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"ME_ProductFamily-LastModify"` + LastUser string `xorm:"nvarchar(20) 'LastUser' not null" json:"ME_ProductFamily-LastUser"` + CreateTime grmi.DateTime `xorm:"datetime 'CreateTime' not null created" json:"ME_ProductFamily-CreateTime"` + Product []Product `xorm:"-" json:"ME_ProductFamily-Product"` + Relate []ProductFamilyRelate `xorm:"-" json:"-"` + Project Project `xorm:"-" json:"-"` + Count int `xorm:"-" json:"ME_ProductFamily-Count"` } /****************************************************************************** diff --git a/services/jit/implments/PackOrder.service.impl.go b/services/jit/implments/PackOrder.service.impl.go index eafd1c2..103d0b5 100644 --- a/services/jit/implments/PackOrder.service.impl.go +++ b/services/jit/implments/PackOrder.service.impl.go @@ -1157,9 +1157,9 @@ func (impl *PackOrderServiceImplement) ClosePackOrder(user *global.User, packOrd if packOrder == nil { return grmi.NewBusinessError("不存在该包装单, 包装单Id:" + packOrderId) } - if packOrder.PackTypeId != model.PACK_TYPE_INT { - return grmi.NewBusinessError("不是内部包装单，不允许手动关包") - } + //if packOrder.PackTypeId != model.PACK_TYPE_INT { + // return grmi.NewBusinessError("不是内部包装单，不允许手动关包") + //} packOrderStatus, err := statusDao.SelectOne(packOrderId) if err != nil { return grmi.NewBusinessError("查询包装单状态失败, error:" + err.Error()) diff --git a/services/jit/implments/ShipOrder.service.impl.go b/services/jit/implments/ShipOrder.service.impl.go index 7c9fb25..4eaee92 100644 --- a/services/jit/implments/ShipOrder.service.impl.go +++ b/services/jit/implments/ShipOrder.service.impl.go @@ -1820,75 +1820,91 @@ func (impl *ShipOrderServiceImplement) WithdrawShipOrderItem(user *global.User, if len(shipOrderDataLi) == 0 { return grmi.NewBusinessError("发运单数据项不存在") } - packOrderId := shipOrderDataLi[0].PackOrderId - packOrderStatus, err := packOrderStatusDao.SelectOne(packOrderId) - if err != nil { - _ = session.Rollback() - return grmi.NewBusinessError("查询发运单状态数据失败，错误：" + err.Error()) - } - if packOrderStatus == nil { - _ = session.Rollback() - return grmi.NewBusinessError("未查询到发运单状态数据, 发运单ID:" + packOrderId) - } - maxPos, err := packOrderStatusHistoryDao.GetMaxPos(packOrderId) - if err != nil { - return grmi.NewBusinessError("查询包装单状态变更历史数据失败, 错误:" + err.Error()) - } - if err = session.Begin(); err != nil { - return grmi.NewBusinessError("开启事务失败, 错误:" + err.Error()) - } - - err = shipOrderDataDao.DeleteOne(shipOrderId, packOrderId) - if err != nil { - _ = session.Rollback() - return grmi.NewBusinessError("删除发运单数据项失败, 错误:" + err.Error()) - } - - if shipOrder.ShipType == model.SHIP_TYPE_FORMAL { - packOrderStatusHistory := model.PackOrderStatusHistory{ - PackOrderId: packOrderId, - Pos: maxPos + 1, - StatusChangeType: model.SHIP_STATUS_CHANGE_TYPE_SHIP, - FromStatus: packOrderStatus.ShipStatus, - ToStatus: model.PACK_STATUS_PLANNED, - ChangeTime: grmi.DateTime(time.Now()), - TriggerPara1: model.SHIP_TYPE_FORMAL, + for _, shipOrderData := range shipOrderDataLi { + packOrderId := shipOrderData.PackOrderId + packOrderStatus, err := packOrderStatusDao.SelectOne(packOrderId) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("查询发运单状态数据失败，错误：" + err.Error()) } - err = packOrderStatusHistoryDao.InsertOne(&packOrderStatusHistory) + if packOrderStatus == nil { + _ = session.Rollback() + return grmi.NewBusinessError("未查询到发运单状态数据, 发运单ID:" + packOrderId) + } + maxPos, err := packOrderStatusHistoryDao.GetMaxPos(packOrderId) + if err != nil { + return grmi.NewBusinessError("查询包装单状态变更历史数据失败, 错误:" + err.Error()) + } + if err = session.Begin(); err != nil { + return grmi.NewBusinessError("开启事务失败, 错误:" + err.Error()) + } + + err = shipOrderDataDao.DeleteOne(shipOrderId, packOrderId) if err != nil { _ = session.Rollback() - return grmi.NewBusinessError("写入包装单状态变更历史失败, 错误:" + err.Error()) + return grmi.NewBusinessError("删除发运单数据项失败, 错误:" + err.Error()) } - packOrderStatus.ShipStatus = model.PACK_STATUS_PLANNED - } else { - packOrderStatusHistory := model.PackOrderStatusHistory{ - PackOrderId: packOrderId, - Pos: maxPos + 1, - StatusChangeType: model.SHIP_STATUS_CHANGE_TYPE_SHIP, - FromStatus: packOrderStatus.LoadStatus, - ToStatus: model.PACK_STATUS_PLANNED, - ChangeTime: grmi.DateTime(time.Now()), - TriggerPara1: model.SHIP_TYPE_ADVANCE, + if shipOrder.ShipType == model.SHIP_TYPE_FORMAL { + packOrderStatusHistory := model.PackOrderStatusHistory{ + PackOrderId: packOrderId, + Pos: maxPos + 1, + StatusChangeType: model.SHIP_STATUS_CHANGE_TYPE_SHIP, + FromStatus: packOrderStatus.ShipStatus, + ToStatus: model.PACK_STATUS_PLANNED, + ChangeTime: grmi.DateTime(time.Now()), + TriggerPara1: model.SHIP_TYPE_FORMAL, + } + err = packOrderStatusHistoryDao.InsertOne(&packOrderStatusHistory) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("写入包装单状态变更历史失败, 错误:" + err.Error()) + } + packOrderStatus.ShipStatus = model.PACK_STATUS_PLANNED + } else { + packOrderStatusHistory := model.PackOrderStatusHistory{ + PackOrderId: packOrderId, + Pos: maxPos + 1, + StatusChangeType: model.SHIP_STATUS_CHANGE_TYPE_SHIP, + FromStatus: packOrderStatus.LoadStatus, + ToStatus: model.PACK_STATUS_PLANNED, + ChangeTime: grmi.DateTime(time.Now()), + TriggerPara1: model.SHIP_TYPE_ADVANCE, + } + err = packOrderStatusHistoryDao.InsertOne(&packOrderStatusHistory) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("写入包装单状态变更历史失败, 错误:" + err.Error()) + } + packOrderStatus.LoadStatus = model.PACK_STATUS_PLANNED } - err = packOrderStatusHistoryDao.InsertOne(&packOrderStatusHistory) + err = packOrderStatusDao.UpdateOne(packOrderStatus) if err != nil { _ = session.Rollback() - return grmi.NewBusinessError("写入包装单状态变更历史失败, 错误:" + err.Error()) + return grmi.NewBusinessError("更新包装单状态失败, 错误:" + err.Error()) } - packOrderStatus.LoadStatus = model.PACK_STATUS_PLANNED } - err = packOrderStatusDao.UpdateOne(packOrderStatus) + shipOrder.ActQty -= shipOrderItem.ActQty + err = shipOrderDao.UpdateOne(shipOrder) if err != nil { _ = session.Rollback() - return grmi.NewBusinessError("更新包装单状态失败, 错误:" + err.Error()) + return grmi.NewBusinessError("更新发运单数据失败, 错误:" + err.Error()) } - shipOrderItem.Status = model.SHIP_STATUS_PLANNED - shipOrderItem.ActQty-- - err = shipOrderItemDao.UpdateOne(shipOrderItem) - if err != nil { - _ = session.Rollback() - return grmi.NewBusinessError("更新发运单子项数据失败, 错误:" + err.Error()) + if shipOrder.ShipType == model.SHIP_TYPE_ADVANCE && shipOrder.ShipTemplateId == "" { + err = shipOrderItemDao.DeleteOne(shipOrderItem.ShipOrderId, shipOrderItem.Pos) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("删除发运单子项失败, 错误:" + err.Error()) + } + } else { + shipOrderItem.Status = model.SHIP_STATUS_PLANNED + shipOrderItem.ActQty = 0 + err = shipOrderItemDao.UpdateOne(shipOrderItem) + if err != nil { + _ = session.Rollback() + return grmi.NewBusinessError("更新发运单子项数据失败, 错误:" + err.Error()) + } } + _ = session.Commit() return nil } diff --git a/services/me/implments/Product.service.impl.go b/services/me/implments/Product.service.impl.go index 045eccc..a301e63 100644 --- a/services/me/implments/Product.service.impl.go +++ b/services/me/implments/Product.service.impl.go @@ -27,6 +27,7 @@ var DefaultConditionOfProduct = grmi.NewCondition( map[string]grmi.ConditionItem{ meta.Product_ProductId.UrlParameterName: grmi.NewConditionItem(meta.Product_ProductId, grmi.Equal, true), meta.Product_ProjectId.UrlParameterName: grmi.NewConditionItem(meta.Product_ProjectId, grmi.Equal, true), + meta.Product_SerialOrderSnr.UrlParameterName: grmi.NewConditionItem(meta.Product_SerialOrderSnr, grmi.Equal, false), meta.Product_Descr.UrlParameterName: grmi.NewConditionItem(meta.Product_Descr, grmi.Equal, false), meta.Product_Descr1.UrlParameterName: grmi.NewConditionItem(meta.Product_Descr1, grmi.Equal, false), meta.Product_Descr2.UrlParameterName: grmi.NewConditionItem(meta.Product_Descr2, grmi.Equal, false), @@ -674,4 +675,4 @@ func (impl *ProductServiceImplement) SelectWorkLineByProduct(user *global.User, return nil, grmi.NewBusinessError("查询产线数据失败, 错误:" + err.Error()) } return workLineLi, nil -} \ No newline at end of file +} diff --git a/services/pln/implments/CustOrder.Dashborad.impl.go b/services/pln/implments/CustOrder.Dashborad.impl.go index 67549d5..17266c5 100644 --- a/services/pln/implments/CustOrder.Dashborad.impl.go +++ b/services/pln/implments/CustOrder.Dashborad.impl.go @@ -62,22 +62,22 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s var jPHPercent float64 //IPPM for _, v := range dashlist { if v.ParamName == "TimeBeat" { - timeBeat = v.FloatParam1 + timeBeat = utils.ValueToFloat(v.CharParam1, 0.0) } if v.ParamName == "PersonNum" { - personNum = v.IntParam1 + personNum = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "AttendancePersonNum" { - attendancePersonNum = v.IntParam1 + attendancePersonNum = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "Days" { - days = v.IntParam1 + days = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "IppmTarge" { - ippmTarge = v.IntParam1 + ippmTarge = utils.ValueToInt(v.CharParam1, 0) } if v.ParamName == "JPHPercent" { - jPHPercent = v.FloatParam1 + jPHPercent = utils.ValueToFloat(v.CharParam1, 0.0) } } @@ -299,11 +299,14 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s if dayModelEndTime < dayModelStartTime { return nil, errors.New("日模型开始时间大于结束时间") } + dayModelStartHour := startDayTime.Add(time.Duration(dayModelStartTime) * time.Second) - dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second) + //dayModelEndHour := startDayTime.Add(time.Duration(dayModelEndTime) * time.Second) endDayTime := utils.GetZeroTime(time.Now().AddDate(0, 0, 1)) - DayModelHours, err := utils.GetHoursData(dayModelStartHour, dayModelEndHour) + nowEndHour := time.Now() + DayModelHours, err := utils.GetHoursData(dayModelStartHour, nowEndHour) + _ = endDayTime _ = DayModelHours if err != nil { @@ -325,7 +328,7 @@ func (impl *CustOrderServiceImplement) Dashboard(user *global.User, workLineId s }(&wg) //图例003 go func(wg *sync.WaitGroup) { - DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId) + DashboardData.DashboardDataPic3, err3 = impl.SelectPic3(user, DayModelHours, dayModel, jPHPercent, startDayTime, endDayTime, timeBeat, attendancePersonNum, workLineId) wg.Done() // 操作完成，减少一个计数 }(&wg) //图例004 @@ -1231,7 +1234,7 @@ func (impl *CustOrderServiceImplement) GetUsefulTime(start, end time.Time, timeL } //图例3 -func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) { +func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHours []string, dayModel *baseModel.DayModel,jPHPercent float64, startDayTime time.Time, endDayTime time.Time, timeBeat float64, attendancePersonNum int, workLineId string) (model.PerDashboardData, error) { engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() @@ -1439,6 +1442,7 @@ func (impl *CustOrderServiceImplement) SelectPic3(user *global.User, DayModelHou } DashboardData3.DashboardData2 = append(DashboardData3.DashboardData2, two) } + DashboardData3.CompleteNumber = utils.ValueToInt(utils.ValueToFloat(DashboardData3.CompleteNumber, 0.0)*jPHPercent, 0) return DashboardData3, nil } diff --git a/services/pln/implments/ToyotaCalloff.service.impl.go b/services/pln/implments/ToyotaCalloff.service.impl.go index 12b981c..1e80ab1 100644 --- a/services/pln/implments/ToyotaCalloff.service.impl.go +++ b/services/pln/implments/ToyotaCalloff.service.impl.go @@ -312,9 +312,9 @@ func (impl *ToyotaCalloffServiceImplement) SelectAndPaging(user *global.User, ur engine := db.Eloquent.Master() session := engine.NewSession() defer session.Close() - _, exist := urlParameters["parsed"] + _, exist := urlParameters["Parsed"] if !exist { - urlParameters["parsed"] = "-1" + urlParameters["Parsed"] = "-1" } predicates, err := condition.BuildPredicates(urlParameters) @@ -324,7 +324,7 @@ func (impl *ToyotaCalloffServiceImplement) SelectAndPaging(user *global.User, ur start, exist := urlParameters["start"] if exist { start += " 00:00:00" - startT, err := time.ParseInLocation(grmi.DateTimeOutFormat, start, utils.TimezoneLocation) + _, err := time.ParseInLocation(grmi.DateTimeOutFormat, start, utils.TimezoneLocation) if err != nil { return grmi.EmptyPagingResult, grmi.NewBusinessError("开始日期格式错误") } @@ -333,23 +333,23 @@ func (impl *ToyotaCalloffServiceImplement) SelectAndPaging(user *global.User, ur PredicateType: func(predicate grmi.Predicate) (string, error) { return fmt.Sprintf(" and %s >= ?", predicate.ColumnName), nil }, - Values: []interface{}{startT}, + Values: []interface{}{start}, } predicates = append(predicates, p) } end, exist := urlParameters["end"] if exist { end += " 23:59:59" - endT, err := time.ParseInLocation(grmi.DateTimeOutFormat, start, utils.TimezoneLocation) + _, err := time.ParseInLocation(grmi.DateTimeOutFormat, start, utils.TimezoneLocation) if err != nil { - return grmi.EmptyPagingResult, grmi.NewBusinessError("开始日期格式错误") + return grmi.EmptyPagingResult, grmi.NewBusinessError("结束日期格式错误") } p := grmi.Predicate{ ColumnName: meta.ToyotaCalloff_OrderTime.ColumnName, PredicateType: func(predicate grmi.Predicate) (string, error) { return fmt.Sprintf(" and %s <= ?", predicate.ColumnName), nil }, - Values: []interface{}{endT}, + Values: []interface{}{end}, } predicates = append(predicates, p) }