作者 yangfu

fix: 查询修改

@@ -92,7 +92,7 @@ func (cmd *HistoryProductRecordQuery) Valid(validation *validation.Validation) { @@ -92,7 +92,7 @@ func (cmd *HistoryProductRecordQuery) Valid(validation *validation.Validation) {
92 cmd.ProductBeginTime = t 92 cmd.ProductBeginTime = t
93 cmd.ProductEndTime = t.AddDate(0, 0, 1) 93 cmd.ProductEndTime = t.AddDate(0, 0, 1)
94 } 94 }
95 - if cmd.ProductRecordType == domain.RecordTypeReceiveMaterial && cmd.ProductRecordType == domain.RecordTypeReturnMaterial { 95 + if cmd.ProductRecordType == domain.RecordTypeReceiveMaterial || cmd.ProductRecordType == domain.RecordTypeReturnMaterial {
96 if cmd.Status == domain.ProductRecordNotApprove { 96 if cmd.Status == domain.ProductRecordNotApprove {
97 cmd.Status = domain.ProductRecordNotApprove 97 cmd.Status = domain.ProductRecordNotApprove
98 if xtime.IsZero(cmd.ProductBeginTime) || xtime.BeforeEqual(cmd.ProductBeginTime, xtime.BeginningOfDay()) { 98 if xtime.IsZero(cmd.ProductBeginTime) || xtime.BeforeEqual(cmd.ProductBeginTime, xtime.BeginningOfDay()) {