From 28addaa46cb97c20ad37e13eb10535de7b75e71c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 29 十一月 2023 19:29:43 +0800
Subject: [PATCH] 首次报工开始时间为工序开始时间
---
model/device_plc.go | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/model/device_plc.go b/model/device_plc.go
index c68b1f3..a6e7331 100644
--- a/model/device_plc.go
+++ b/model/device_plc.go
@@ -57,12 +57,15 @@
}
func (slf *DevicePlc) AfterFind(tx *gorm.DB) error {
- details := make([]*DevicePlcAddress, 0)
- err := json.Unmarshal([]byte(slf.Detail), &details)
- if err != nil {
- return err
+ if slf.Detail != "" {
+ details := make([]*DevicePlcAddress, 0)
+ err := json.Unmarshal([]byte(slf.Detail), &details)
+ if err != nil {
+ return err
+ }
+ slf.Details = details
}
- slf.Details = details
+
return nil
}
@@ -127,7 +130,7 @@
func (slf *DevicePlcSearch) Save(record *DevicePlc) error {
var db = slf.build()
- if err := db.Omit("CreatedAt").Updates(record).Error; err != nil {
+ if err := db.Omit("CreatedAt").Save(record).Error; err != nil {
return fmt.Errorf("save err: %v, record: %+v", err, record)
}
--
Gitblit v1.8.0