From 5d3d6ac9f5ba1da49d7864399988bf7150c0b8a4 Mon Sep 17 00:00:00 2001 From: henry Date: Mon, 22 Nov 2021 09:47:00 +0800 Subject: [PATCH] Init --- .DS_Store | Bin 0 -> 8196 bytes app/.DS_Store | Bin 0 -> 6148 bytes app/controller/work/repair.go | 49 ++++++++++++++++++++++++++++------ build_window.sh | 2 +- config.yaml | 1 - router/router.go | 2 +- 6 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 .DS_Store create mode 100644 app/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..00f488d347d696e5929b2ba7b9231f21f4b32e2f GIT binary patch literal 8196 zcmeHM!EVz)5S>lZ)Mc(Znc*KxTZ0fk*@ckJCaJG;+2V^2avqS~)pM2kdZpt3B^qe&?| z&ULC}qMnQ*zL8Tc<5 z;P_yovaCdM97-8F(8v@3GKX$ia4kRnAx-XptVD7gO7x(JP!%#%6;X;IqTE4*>KLy? z_;DyhbrRAt=7}teC_@oZ>LE-CCs7HdZZ!j%foTRfch8bd9qMemO8&lqk z2E9&{<$rWKZmSoR%U?t$o14kc8pfP4cX{qv?Z6+@0z2sUs&@AY-|g7JffHRn^nG`7 zZ99)zjlpj5>OJ2J?3UN)O669)0m#$GEwAnms(#S$CjuHCZkZtt~EUJhT4PTz$47E$b=h46mTzQt9vy`x&!bA7Lg z9!Ag826d@T4XV=)`Q%cI_NkGe>I0B*sut3dRheR33#r-FjbKd0$!C{}i@DgRKkZ`I;bLoWE9=fOyO>qB z*vHnaDIa4WLOIvR-eGXUM8eCm@{~IXe)!zQ`C*iwdg4-0F%JK+FeOPy5IBoNYfEP@ z@gY`;l^x+}_ ztaQ~?v70EtX9i9J6dk1o$oQ;a$(#!lu`wa rOvfQ*Iu1Gc!w}adpsZ7g``(Jv_uQlHRw6dgO literal 0 HcmV?d00001 diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..2cd2877459067c2ee9135d370b531d68cd16fe9b GIT binary patch literal 6148 zcmeHK%}xR_5N-jrV2m709@N0D5ZPqinq`qFuG!bnH}VO5 z9cS7?Lco)WF=U2Jzv=w6=~vQj8DqRX?$;SBGsXlcVy+0y3c)z)lH{xhk?S#HrdSBS z0gIQi$?+cAZ+858|3mcnTLX<>lr*!KM z)x=G_WISqn@iq3&y=3TH`$DO3ZhQV^Fqm}9dnYPNydWCHx;W?$Am!#Ni27>MR^zBY z(&M-$AVg6VyXDGsdRVVjWxdf%t8&_EwyLsm)J)T&*gvQrpY-x7$@qGK^L2oVr&N&!tNw@(ai%E2#fo?|gHXv!JaGs8G`W^P|7 zT+a@EsnZ#E3{p!B5Ce-0JbCPz*;fD3mv!9h9%j%b!l;U*GkYH qC<^9f2InPU=&KlV@hYx>Y5~7Q1JJRU83YdqeF$h8s38Xal!0%)+EiHp literal 0 HcmV?d00001 diff --git a/app/controller/work/repair.go b/app/controller/work/repair.go index 0895a4d..bcbad26 100644 --- a/app/controller/work/repair.go +++ b/app/controller/work/repair.go @@ -25,7 +25,8 @@ type ( // RepairDetailInfo 详细信息 RepairDetailInfo struct { *RepairInfo - Details []*model2.WorkRepairDetail `json:"details"` + //Details []*model2.WorkRepairDetail `json:"details"` + Work *InstanceDetailInfo `json:"work"` } ) @@ -64,26 +65,58 @@ func (c *Repair) List(orderNo, equipmentCode, equipmentTitle string, page, pageS // Detail 详细信息 func (c *Repair) Detail(id uint64) (*RepairDetailInfo, error) { - repair, err := model.NewWorkRepair().Detail(id) if err != nil { return nil, err } - details := make([]*model2.WorkRepairDetail, 0) + work := new(InstanceDetailInfo) - if err = model2.Find(model.NewWorkRepairDetail().WorkRepairDetail, &details, &model2.ModelWhereOrder{ - Where: model2.NewWhere("repair_id", id), - Order: model2.NewOrder("id", model2.OrderModeToAsc), - }); err != nil { + mWorkInstance := model.NewWorkInstance() + // 基本信息 + if work.WorkInstanceInfo, err = mWorkInstance.Detail(repair.WorkID); err != nil { return nil, err } + mWorkInstance.SetID(work.WorkInstanceInfo.ID) + work.CommonIDString = basic.CommonIDString{ + ID: mWorkInstance.GetEncodeID(), + } + work.EquipmentID = (&model2.Model{ID: work.WorkInstanceInfo.EquipmentID}).GetEncodeID() + work.ScheduleID = (&model2.Model{ID: work.WorkInstanceInfo.ScheduleID}).GetEncodeID() + // 位置信息 + mWorkInstance.Distribution = work.WorkInstanceInfo.Distribution + + work.Distribution = mWorkInstance.GetDistributionAttribute() + // 内修才有数据 + if work.WorkInstanceInfo.Kind == model2.WorkInstanceKindForWithin { + // 器材信息 + materials := make([]*model.WorkMaterialInfo, 0) + + if materials, err = model.NewWorkMaterial().Materials(id); err != nil { + return nil, err + } + // 采购信息 + purchases := make([]*model.WorkPurchaseInfo, 0) + + if purchases, err = model.NewWorkPurchase().Purchases(id); err != nil { + return nil, err + } + work.Within = struct { + Material []*model.WorkMaterialInfo `json:"material"` + Purchase []*model.WorkPurchaseInfo `json:"purchase"` + }{Material: materials, Purchase: purchases} + } else if work.WorkInstanceInfo.Kind == model2.WorkInstanceKindForOutside { + work.Outside = struct { + SupplierName string `json:"supplier_name"` + }{SupplierName: work.WorkInstanceInfo.SupplierName} + } return &RepairDetailInfo{ RepairInfo: &RepairInfo{ CommonIDString: basic.CommonIDString{ID: repair.GetEncodeID()}, WorkRepairInfo: repair, }, - Details: details, + Work: work, + //Details: details, }, nil } diff --git a/build_window.sh b/build_window.sh index b47da4d..20362d4 100755 --- a/build_window.sh +++ b/build_window.sh @@ -2,4 +2,4 @@ set -e #CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o ArmedPolice.exe main.go -CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -x -v -ldflags "-s -w" -o ArmedPolice.exe main.go \ No newline at end of file +CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -x -v -ldflags "-s -w" -o ArmedPolice.exe main.go \ No newline at end of file diff --git a/config.yaml b/config.yaml index eaa7b9f..dea09f6 100644 --- a/config.yaml +++ b/config.yaml @@ -30,7 +30,6 @@ engine: complex: false # MYSQL 配置 mysql: - # host: 47.96.31.6 host: 192.168.0.188 # host: 127.0.0.1 port: 3306 diff --git a/router/router.go b/router/router.go index a9babd1..910df8c 100644 --- a/router/router.go +++ b/router/router.go @@ -134,7 +134,7 @@ func (this *Router) registerAPI() { _api := new(api.Role) roleV1.GET("/list", _api.List) roleV1.POST("/add", _api.Add) - roleV1.POST("/menu", _api.Edit) + roleV1.POST("/edit", _api.Edit) roleV1.POST("/delete", _api.Delete) roleV1.POST("/menus", _api.Menu) roleV1.POST("/menu/bind", _api.MenuBind)