|
@@ -4,7 +4,6 @@ import ( |
|
@@ -4,7 +4,6 @@ import ( |
|
4
|
"github.com/linmadan/egglib-go/utils/xtime"
|
4
|
"github.com/linmadan/egglib-go/utils/xtime"
|
|
5
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
|
5
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
|
|
6
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
|
6
|
"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
|
|
7
|
- "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
|
|
|
|
8
|
)
|
7
|
)
|
|
9
|
|
8
|
|
|
10
|
// HistoryProductRecord 历史生成记录
|
9
|
// HistoryProductRecord 历史生成记录
|
|
@@ -39,7 +38,7 @@ func (d *HistoryProductRecord) LoadDto(m *domain.ProductRecord) *HistoryProductR |
|
@@ -39,7 +38,7 @@ func (d *HistoryProductRecord) LoadDto(m *domain.ProductRecord) *HistoryProductR |
|
39
|
if m.ProductRecordType != domain.RecordTypeSecondLevelWeigh &&
|
38
|
if m.ProductRecordType != domain.RecordTypeSecondLevelWeigh &&
|
|
40
|
m.ProductRecordInfo.ApproveStatus == domain.ProductRecordNotApprove &&
|
39
|
m.ProductRecordInfo.ApproveStatus == domain.ProductRecordNotApprove &&
|
|
41
|
!(xtime.BeginningOfDay().Equal(xtime.New(m.CreatedAt.Local()).BeginningOfDay())) {
|
40
|
!(xtime.BeginningOfDay().Equal(xtime.New(m.CreatedAt.Local()).BeginningOfDay())) {
|
|
42
|
- log.Logger.Debug("not equal", map[string]interface{}{"t1": xtime.BeginningOfDay(), "t2": xtime.New(m.CreatedAt.Local()).BeginningOfDay()})
|
41
|
+ //log.Logger.Debug("not equal", map[string]interface{}{"t1": xtime.BeginningOfDay(), "t2": xtime.New(m.CreatedAt.Local()).BeginningOfDay()})
|
|
43
|
d.Status = domain.ProductRecordLogged
|
42
|
d.Status = domain.ProductRecordLogged
|
|
44
|
}
|
43
|
}
|
|
45
|
return d
|
44
|
return d
|
