fix:

1.生产班组查询异常
2.配置修改

@@ -97,4 +97,20 @@ spec:
         - name: HTTP_PORT
         - name: HTTP_PORT
           value: "8082"
           value: "8082"
         - name: SERVICE_ENV
         - name: SERVICE_ENV
-          value: "dev"
+          value: "dev"
+        - name: SUPLUS_ADMIN_BASE_HOST
+          value: "http://suplus-admin-base-dev.fjmaimaimai.com"
+        - name: ALLIED_CREATION_GATEWAY_HOST
+          value: "https://allied-creation-gateway-test.fjmaimaimai.com"
+        - name: ALLIED_CREATION_USER_HOST
+          value: "https://allied-creation-user-test.fjmaimaimai.com"
+        - name: ALLIED_CREATION_COOPERATION_HOST
+          value: "https://allied-creation-cooperation-test.fjmaimaimai.com"
+        - name: ALLIED_CREATION_BASIC_HOST
+          value: "https://allied-creation-basic-test.fjmaimaimai.com"
+        - name: ALLIED_CREATION_MANUFACTURE_HOST
+          value: "http://allied-creation-manufacture-test.fjmaimaimai.com"
+        - name: SMS_SERVE_HOST
+          value: "https://sms.fjmaimaimai.com:9897"
+        - name: SUPLUS_SALE_APP
+          value: "http://suplus-sale-app-gateway-test.fjmaimaimai.com"

+package command
+
+import (
+	"fmt"
+	"github.com/beego/beego/v2/core/validation"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
+	"reflect"
+	"strings"
+)
+
+type WorkerAttendanceReportCommand struct {
+	*domain.DeviceZkTeco
+}
+
+func (removeProductRecordCommand *WorkerAttendanceReportCommand) Valid(validation *validation.Validation) {
+	//validation.SetError("CustomValid", "未实现的自定义认证")
+}
+
+func (removeProductRecordCommand *WorkerAttendanceReportCommand) ValidateCommand() error {
+	valid := validation.Validation{}
+	b, err := valid.Valid(removeProductRecordCommand)
+	if err != nil {
+		return err
+	}
+	if !b {
+		elem := reflect.TypeOf(removeProductRecordCommand).Elem()
+		for _, validErr := range valid.Errors {
+			field, isExist := elem.FieldByName(validErr.Field)
+			if isExist {
+				return fmt.Errorf(strings.Replace(validErr.Message, validErr.Field, field.Tag.Get("cname"), -1))
+			} else {
+				return fmt.Errorf(validErr.Message)
+			}
+		}
+	}
+	return nil
+}

+package service
+
+import (
+	"github.com/linmadan/egglib-go/core/application"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/attendance/command"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/factory"
+)
+
+func (attendanceService *AttendanceService) WorkerAttendanceReport(cmd *command.WorkerAttendanceReportCommand) (interface{}, error) {
+	if err := cmd.ValidateCommand(); err != nil {
+		return nil, application.ThrowError(application.ARG_ERROR, err.Error())
+	}
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	defer func() {
+		transactionContext.RollbackTransaction()
+	}()
+
+	//svr, _ := domainService.NewPGWorkshopWorkTimeStaticService(transactionContext.(*pgTransaction.TransactionContext))
+	//if _, err := svr.WorkshopWorkTimeStatic(cmd.ProductAttendanceRecord); err != nil {
+	//	log.Logger.Error(err.Error())
+	//	return nil, err
+	//}
+
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	return struct{}{}, nil
+}

@@ -350,7 +350,7 @@ func (deviceService *DeviceService) SearchDevice(operateInfo *domain.OperateInfo
 	for i := range devices {
 	for i := range devices {
 		item := devices[i]
 		item := devices[i]
 		newJobDto := &dto.DeviceDto{}
 		newJobDto := &dto.DeviceDto{}
-		item.WorkStation = workshops.FindWorkStation(item.WorkStation.WorkshopId, item.WorkStation.LineId, item.WorkStation.SectionId)
+		newJobDto.WorkStation = workshops.FindWorkStation(item.WorkStation.WorkshopId, item.WorkStation.LineId, item.WorkStation.SectionId)
 		newJobDto.LoadDto(item, operateInfo.OrgId)
 		newJobDto.LoadDto(item, operateInfo.OrgId)
 		result = append(result, newJobDto)
 		result = append(result, newJobDto)
 	}
 	}

@@ -328,8 +328,8 @@ func (productCalendarService *ProductCalendarService) UpdateProductCalendar(cmd
 }
 }
 
 
 // 返回工厂日历服务列表
 // 返回工厂日历服务列表
-func (productCalendarService *ProductCalendarService) SearchProductCalendar(operateInfo *domain.OperateInfo, listProductCalendarQuery *query.SearchProductCalendarQuery) (int64, interface{}, error) {
-	if err := listProductCalendarQuery.ValidateQuery(); err != nil {
+func (productCalendarService *ProductCalendarService) SearchProductCalendar(operateInfo *domain.OperateInfo, cmd *query.SearchProductCalendarQuery) (int64, interface{}, error) {
+	if err := cmd.ValidateQuery(); err != nil {
 		return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.ARG_ERROR, err.Error())
 	}
 	}
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
@@ -345,7 +345,12 @@ func (productCalendarService *ProductCalendarService) SearchProductCalendar(oper
 	var productCalendarRepository domain.ProductCalendarRepository
 	var productCalendarRepository domain.ProductCalendarRepository
 	productCalendarRepository, _, _ = factory.FastPgProductCalendar(transactionContext, 0)
 	productCalendarRepository, _, _ = factory.FastPgProductCalendar(transactionContext, 0)
 
 
-	count, productCalendars, err := productCalendarRepository.Find(utils.ObjectToMap(listProductCalendarQuery))
+	workshops, _ := factory.FastPgWorkshops(transactionContext, operateInfo.CompanyId)
+	queryOptions := utils.ObjectToMap(cmd)
+	delete(queryOptions, "workshopName")
+	queryOptions = workshops.FindByNameWithQuery(queryOptions, cmd.WorkshopName, "", "")
+
+	count, productCalendars, err := productCalendarRepository.Find(queryOptions)
 	if err != nil {
 	if err != nil {
 		return 0, nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		return 0, nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	}
@@ -358,6 +363,7 @@ func (productCalendarService *ProductCalendarService) SearchProductCalendar(oper
 		item := productCalendars[i]
 		item := productCalendars[i]
 		newJobDto := &dto.ProductCalendarDto{}
 		newJobDto := &dto.ProductCalendarDto{}
 		newJobDto.LoadDto(item, operateInfo.OrgId)
 		newJobDto.LoadDto(item, operateInfo.OrgId)
+		newJobDto.WorkStation = workshops.FindWorkStation(item.WorkStation.WorkshopId, item.WorkStation.LineId, item.WorkStation.SectionId)
 		result = append(result, newJobDto)
 		result = append(result, newJobDto)
 	}
 	}
 
 

@@ -359,7 +359,7 @@ func (productGroupService *ProductGroupService) SearchProductGroup(operateInfo *
 		item := productGroups[i]
 		item := productGroups[i]
 		newItem := &dto.ProductGroupDto{}
 		newItem := &dto.ProductGroupDto{}
 		newItem.LoadDto(productGroups[i], operateInfo.OrgId)
 		newItem.LoadDto(productGroups[i], operateInfo.OrgId)
-		item.WorkStation = workshops.FindWorkStation(item.WorkStation.WorkshopId, item.WorkStation.LineId, item.WorkStation.SectionId)
+		newItem.WorkStation = workshops.FindWorkStation(item.WorkStation.WorkshopId, item.WorkStation.LineId, item.WorkStation.SectionId)
 		results = append(results, newItem)
 		results = append(results, newItem)
 	}
 	}
 	if err := transactionContext.CommitTransaction(); err != nil {
 	if err := transactionContext.CommitTransaction(); err != nil {

+package constant
+
+import (
+	"os"
+	"strconv"
+)
+
+var (
+	// 生产制造 - 称重系统 - 默认公司
+	MANUFACTURE_WEIGH_DEFAULT_COMPANYID = 1
+	// 生产制造 - 称重系统 - 默认组织
+	MANUFACTURE_WEIGH_DEFAULT_ORGID = 1
+)
+
+func init() {
+	if os.Getenv("MANUFACTURE_WEIGH_DEFAULT_COMPANY_ID") != "" {
+		MANUFACTURE_WEIGH_DEFAULT_COMPANYID, _ = strconv.Atoi(os.Getenv("MANUFACTURE_WEIGH_DEFAULT_COMPANYID"))
+	}
+	if os.Getenv("MANUFACTURE_WEIGH_DEFAULT_ORGID") != "" {
+		MANUFACTURE_WEIGH_DEFAULT_ORGID, _ = strconv.Atoi(os.Getenv("MANUFACTURE_WEIGH_DEFAULT_ORGID"))
+	}
+}

@@ -67,7 +67,7 @@ func (employeeProductRecord *EmployeeProductRecord) Update(data map[string]inter
 }
 }
 
 
 // 更新生产量
 // 更新生产量
-func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh float64, productRecordType int, sectionName string) {
+func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh float64, productRecordType int, sectionName string, yesterdayWeight float64, bestWeight float64) {
 	if employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh == nil {
 	if employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh == nil {
 		employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh = make(map[string]float64)
 		employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh = make(map[string]float64)
 	}
 	}
@@ -77,13 +77,8 @@ func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh flo
 			employeeProductRecord.SecondLevelWeigh += weigh
 			employeeProductRecord.SecondLevelWeigh += weigh
 		} else {
 		} else {
 			// 其他工段的二级品
 			// 其他工段的二级品
-			if _, ok := employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName]; ok {
-				employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName] += weigh //存关联级的二级品
-			} else {
-				employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName] = weigh
-			}
+			employeeProductRecord.ProductRecordInfo.AddSectionWeight(sectionName, weigh)
 		}
 		}
-		employeeProductRecord.ProductRecordInfo.TotalOtherSecondLevelWeigh = employeeProductRecord.ProductRecordInfo.OtherSecondLevelWeigh() // 预先统计其他二级品占比
 	}
 	}
 	if productRecordType == RecordTypeReceiveMaterial {
 	if productRecordType == RecordTypeReceiveMaterial {
 		employeeProductRecord.ProductWeigh += weigh
 		employeeProductRecord.ProductWeigh += weigh
@@ -91,6 +86,7 @@ func (employeeProductRecord *EmployeeProductRecord) UpdateProductWeigh(weigh flo
 	if productRecordType == RecordTypeReturnMaterial {
 	if productRecordType == RecordTypeReturnMaterial {
 		employeeProductRecord.ProductWeigh -= weigh
 		employeeProductRecord.ProductWeigh -= weigh
 	}
 	}
+	employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, 0, 0)
 	employeeProductRecord.UpdatedAt = time.Now()
 	employeeProductRecord.UpdatedAt = time.Now()
 	employeeProductRecord.Version += 1
 	employeeProductRecord.Version += 1
 }
 }

@@ -9,9 +9,22 @@ type ProductRecordStaticInfo struct {
 	PlanProductName string `json:"planProductName,omitempty"`
 	PlanProductName string `json:"planProductName,omitempty"`
 	// 批号
 	// 批号
 	BatchNumber string `json:"batchNumber,omitempty"`
 	BatchNumber string `json:"batchNumber,omitempty"`
-
 	// 生产小组ID
 	// 生产小组ID
 	ProductGroupId int `json:"productGroupId,omitempty"`
 	ProductGroupId int `json:"productGroupId,omitempty"`
+
+	// 投入量
+	InputWeight float64 `json:"inputWeight,omitempty"`
+	// 产出量
+	OutputWeight float64 `json:"outputWeight,omitempty"`
+	// 二级品重量
+	SecondLevelWeight float64 `json:"secondLevelWeight"`
+	// 昨天产出量
+	YesterdayOutputWeight float64 `json:"yesterdayOutputWeight"`
+	// 历史最好产出量
+	BestOutputWeight float64 `json:"bestOutputWeight"`
+	// 合格率
+	QualificationRate int `json:"qualificationRate"`
+
 	// 其他工段二级品的重量合计
 	// 其他工段二级品的重量合计
 	TotalOtherSecondLevelWeigh float64 `json:"totalOtherSecondLevelWeigh"`
 	TotalOtherSecondLevelWeigh float64 `json:"totalOtherSecondLevelWeigh"`
 	// 保存其他工段二级品的重量
 	// 保存其他工段二级品的重量
@@ -25,3 +38,31 @@ func (info *ProductRecordStaticInfo) OtherSecondLevelWeigh() float64 {
 	}
 	}
 	return result
 	return result
 }
 }
+
+// AddSectionWeight 添加工段的二级品
+func (info *ProductRecordStaticInfo) AddSectionWeight(section string, weight float64) {
+	if _, ok := info.OtherSectionSecondLevelWeigh[section]; ok {
+		info.OtherSectionSecondLevelWeigh[section] += weight //存关联级的二级品
+	} else {
+		info.OtherSectionSecondLevelWeigh[section] = weight
+	}
+}
+
+// 预统计
+// productWeight 初始产能
+// secondWeight  二级品重量
+// yesterdayWeight 昨天产能
+// bestWeight 最佳产能
+func (info *ProductRecordStaticInfo) PreStatistics(productWeight float64, secondWeight float64, yesterdayWeight float64, bestWeight float64) {
+	totalOtherSecondLevelWeigh := info.OtherSecondLevelWeigh()
+	info.InputWeight = productWeight - totalOtherSecondLevelWeigh
+	info.OutputWeight = info.InputWeight - secondWeight
+	info.SecondLevelWeight = secondWeight
+	info.YesterdayOutputWeight = yesterdayWeight
+	info.BestOutputWeight = bestWeight
+	if bestWeight <= info.InputWeight {
+		info.BestOutputWeight = info.OutputWeight
+	}
+	info.TotalOtherSecondLevelWeigh = totalOtherSecondLevelWeigh
+	info.QualificationRate = int(info.OutputWeight / info.InputWeight * 100)
+}

@@ -58,12 +58,8 @@ func (employeeProductRecord *WorkshopProductRecord) UpdateProductWeigh(weigh flo
 		if employeeProductRecord.WorkStation.SectionName == sectionName {
 		if employeeProductRecord.WorkStation.SectionName == sectionName {
 			employeeProductRecord.SecondLevelWeigh += weigh
 			employeeProductRecord.SecondLevelWeigh += weigh
 		} else {
 		} else {
-			if _, ok := employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName]; ok {
-				employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName] += weigh //存关联级的二级品
-			} else {
-				employeeProductRecord.ProductRecordInfo.OtherSectionSecondLevelWeigh[sectionName] = weigh
-			}
-			employeeProductRecord.ProductRecordInfo.TotalOtherSecondLevelWeigh = employeeProductRecord.ProductRecordInfo.OtherSecondLevelWeigh() // 预先统计其他二级品占比
+			// 其他工段的二级品
+			employeeProductRecord.ProductRecordInfo.AddSectionWeight(sectionName, weigh)
 		}
 		}
 	}
 	}
 	if productRecordType == RecordTypeReceiveMaterial {
 	if productRecordType == RecordTypeReceiveMaterial {
@@ -72,6 +68,7 @@ func (employeeProductRecord *WorkshopProductRecord) UpdateProductWeigh(weigh flo
 	if productRecordType == RecordTypeReturnMaterial {
 	if productRecordType == RecordTypeReturnMaterial {
 		employeeProductRecord.ProductWeigh -= weigh
 		employeeProductRecord.ProductWeigh -= weigh
 	}
 	}
+	employeeProductRecord.ProductRecordInfo.PreStatistics(employeeProductRecord.ProductWeigh, employeeProductRecord.SecondLevelWeigh, 0, 0)
 	employeeProductRecord.UpdatedAt = time.Now()
 	employeeProductRecord.UpdatedAt = time.Now()
 	employeeProductRecord.Version += 1
 	employeeProductRecord.Version += 1
 }
 }

@@ -80,3 +80,32 @@ func (dao *AttendanceRecordDao) RecentUnApprovedAttendanceRecord(fromLastHour in
 		return int64(count), productAttendanceRecords, nil
 		return int64(count), productAttendanceRecords, nil
 	}
 	}
 }
 }
+
+func (dao *AttendanceRecordDao) WorkerAttendanceRecords(companyId, orgId, workerId int, workStationId string, beginTime, endTime time.Time) (int64, []*domain.ProductAttendanceRecord, error) {
+	tx := dao.transactionContext.PgTx
+	//endTime := time.Now()
+	//beginTime := endTime.Add(-(time.Hour * time.Duration(recentDay*24)))
+	var productAttendanceRecordModels []*models.ProductAttendanceRecord
+	productAttendanceRecords := make([]*domain.ProductAttendanceRecord, 0)
+	query := sqlbuilder.BuildQuery(tx.Model(&productAttendanceRecordModels), map[string]interface{}{})
+	query.Where("company_id =?", companyId)
+	query.Where("org_id =?", orgId)
+	query.Where("product_worker ->>'userId' = '?'", workerId)
+	query.Where("sign_in <= ?", endTime)
+	query.Where("sign_in >= ?", beginTime)
+	query.Where("attendance_status = ?", domain.AttendanceNotApprove)
+	query.SetOffsetAndLimit(domain.MaxQueryRow)
+	query.SetOrderDirect("product_attendance_id", "DESC")
+	if count, err := query.SelectAndCount(); err != nil {
+		return 0, productAttendanceRecords, err
+	} else {
+		for _, productAttendanceRecordModel := range productAttendanceRecordModels {
+			if productAttendanceRecord, err := transform.TransformToProductAttendanceRecordDomainModelFromPgModels(productAttendanceRecordModel); err != nil {
+				return 0, productAttendanceRecords, err
+			} else {
+				productAttendanceRecords = append(productAttendanceRecords, productAttendanceRecord)
+			}
+		}
+		return int64(count), productAttendanceRecords, nil
+	}
+}

@@ -49,6 +49,30 @@ func (dao *EmployeeProductRecordDao) WorkerProductRecord(companyId, orgId, planI
 	}
 	}
 }
 }
 
 
+// 员工对应批次 最好生产记录
+func (dao *EmployeeProductRecordDao) WorkerBestOutputRecord(companyId, orgId, planId, workerId int) (*domain.EmployeeProductRecord, error) {
+	tx := dao.transactionContext.PgTx
+	employeeProductRecordModel := new(models.EmployeeProductRecord)
+	query := sqlbuilder.BuildQuery(tx.Model(employeeProductRecordModel), map[string]interface{}{})
+	query.Where("company_id = ?", companyId)
+	query.Where("org_id = ?", orgId)
+	query.Where("product_worker ->>'userId' = '?'", workerId)
+	query.Where("product_record_info ->>'productPlanId' = '?'", planId)
+	query.Order("product_record_info ->>'outputWeight' DESC")
+	if err := query.First(); err != nil {
+		if err.Error() == "pg: no rows in result set" {
+			return nil, domain.ErrorNotFound
+		} else {
+			return nil, err
+		}
+	}
+	if employeeProductRecordModel.EmployeeProductRecordId == 0 {
+		return nil, domain.ErrorNotFound
+	} else {
+		return transform.TransformToEmployeeProductRecordDomainModelFromPgModels(employeeProductRecordModel)
+	}
+}
+
 func (dao *EmployeeProductRecordDao) SearchEmployeeProductRecord(queryOptions map[string]interface{}) (int64, []*domain.EmployeeProductRecord, error) {
 func (dao *EmployeeProductRecordDao) SearchEmployeeProductRecord(queryOptions map[string]interface{}) (int64, []*domain.EmployeeProductRecord, error) {
 	tx := dao.transactionContext.PgTx
 	tx := dao.transactionContext.PgTx
 	var employeeProductRecordModels []*models.EmployeeProductRecord
 	var employeeProductRecordModels []*models.EmployeeProductRecord

@@ -80,6 +80,7 @@ func (ptr *PGProductRecordService) EmployeeProductStatics(productRecord *domain.
 		if _, ok := groupMembers[groupMembersKeyFunc(r.ProductWorker.UserId)]; !ok {
 		if _, ok := groupMembers[groupMembersKeyFunc(r.ProductWorker.UserId)]; !ok {
 			participateType = domain.ParticipateSupport
 			participateType = domain.ParticipateSupport
 		}
 		}
+
 		var employeeProductRecord *domain.EmployeeProductRecord
 		var employeeProductRecord *domain.EmployeeProductRecord
 		employeeProductRecord, err = employeeProductRecordDao.WorkerProductRecord(cid, oid, productRecord.ProductRecordInfo.ProductPlanId, r.ProductWorker.UserId, productRecord.CreatedAt)
 		employeeProductRecord, err = employeeProductRecordDao.WorkerProductRecord(cid, oid, productRecord.ProductRecordInfo.ProductPlanId, r.ProductWorker.UserId, productRecord.CreatedAt)
 		if err == domain.ErrorNotFound {
 		if err == domain.ErrorNotFound {
@@ -90,7 +91,23 @@ func (ptr *PGProductRecordService) EmployeeProductStatics(productRecord *domain.
 				continue
 				continue
 			}
 			}
 		}
 		}
-		employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName)
+
+		// 查询当前员工 昨日产能 、历史最好产能
+		var (
+			yesterdayOutputWeight float64 = 0
+			bestOutputWeight      float64 = 0
+		)
+		if record, e := employeeProductRecordDao.WorkerProductRecord(cid, oid, planId, r.ProductWorker.UserId, productRecord.CreatedAt.AddDate(0, 0, -1)); e == nil && record != nil {
+			yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
+			bestOutputWeight = record.ProductRecordInfo.BestOutputWeight
+
+		} else {
+			if record, e := employeeProductRecordDao.WorkerBestOutputRecord(cid, oid, planId, r.ProductWorker.UserId); e == nil && record != nil {
+				yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
+			}
+		}
+
+		employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName, yesterdayOutputWeight, bestOutputWeight)
 
 
 		if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
 		if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
 			// TODO：异常处理
 			// TODO：异常处理
@@ -211,7 +228,23 @@ func (ptr *PGProductRecordService) personalProductStatics(productRecord *domain.
 	if err == domain.ErrorNotFound {
 	if err == domain.ErrorNotFound {
 		employeeProductRecord = newEmployeeProductRecord(productRecord, participateType, productPlan, productRecord.ProductWorker)
 		employeeProductRecord = newEmployeeProductRecord(productRecord, participateType, productPlan, productRecord.ProductWorker)
 	}
 	}
-	employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName)
+
+	// 查询当前员工 昨日产能 、历史最好产能
+	var (
+		yesterdayOutputWeight float64 = 0
+		bestOutputWeight      float64 = 0
+	)
+	if record, e := employeeProductRecordDao.WorkerProductRecord(cid, oid, planId, productRecord.ProductWorker.UserId, productRecord.CreatedAt.AddDate(0, 0, -1)); e == nil && record != nil {
+		yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
+		bestOutputWeight = record.ProductRecordInfo.BestOutputWeight
+
+	} else {
+		if record, e := employeeProductRecordDao.WorkerBestOutputRecord(cid, oid, planId, productRecord.ProductWorker.UserId); e == nil && record != nil {
+			yesterdayOutputWeight = record.ProductRecordInfo.OutputWeight
+		}
+	}
+
+	employeeProductRecord.UpdateProductWeigh(productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordType, productRecord.WorkStation.SectionName, yesterdayOutputWeight, bestOutputWeight)
 
 
 	if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
 	if employeeProductRecord, err = employeeProductRecordRepository.Save(employeeProductRecord); err != nil {
 		// TODO：异常处理
 		// TODO：异常处理

+package domainService
+
+import (
+	"fmt"
+	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/dao"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
+	"time"
+)
+
+type PGWorkerAttendanceReportService struct {
+	transactionContext *pgTransaction.TransactionContext
+}
+
+// 考勤汇报
+func (ptr *PGWorkerAttendanceReportService) Report(cid, oid int, report *domain.DeviceZkTeco) (interface{}, error) {
+	var (
+		attendanceRecordDao, _ = dao.NewAttendanceRecordDao(ptr.transactionContext)
+		isSignIn               = true
+		record                 *domain.ProductAttendanceRecord
+		workStationId          string //具体工位
+		workStation            *domain.WorkStation
+		attendanceType         int
+		worker                 *domain.User
+		org                    *domain.Org
+	)
+
+	beginTime := utils.GetZeroTime(time.Now())
+	_, records, _ := attendanceRecordDao.WorkerAttendanceRecords(cid, oid, worker.UserId, workStationId, beginTime, time.Now())
+	for i := 0; i < len(records); i++ {
+		r := records[i]
+		// 操作时间 < 签到时间   签退时间 < 操作时间
+		if (!r.SignIn.IsZero() && r.SignIn.After(report.ActionTime)) || (!r.SignOut.IsZero() && r.SignOut.Before(report.ActionTime)) {
+			continue
+		}
+
+		if !r.SignIn.IsZero() && !r.SignOut.IsZero() {
+			if r.SignIn.Before(report.ActionTime) && r.SignOut.After(report.ActionTime) {
+				log.Logger.Info(fmt.Sprintf("【考勤汇报】 已存在同一时间段的考勤记录 考勤ID:%v   用户:%v  打卡时间:%v", r.ProductAttendanceId, worker.UserId, report.ActionTime))
+				return struct{}{}, nil
+			}
+			continue
+		}
+		if !r.SignIn.IsZero() && r.SignOut.IsZero() && r.SignIn.Before(report.ActionTime) {
+			isSignIn = false
+			record = r
+			break
+		}
+	}
+
+	if isSignIn {
+		record = &domain.ProductAttendanceRecord{
+			//ProductAttendanceId: cmd.ProductAttendanceId,
+			CompanyId:      cid,
+			OrgId:          oid,
+			AttendanceType: attendanceType,
+			ProductWorker:  worker,
+			WorkStation:    workStation,
+			SignIn:         report.ActionTime,
+			//SignOut:          cmd.SignOut,
+			AttendanceStatus: domain.AttendanceNotApprove,
+			WorkTimeBefore:   0,
+			WorkTimeAfter:    0,
+			CreatedAt:        time.Now(),
+			UpdatedAt:        time.Now(),
+			Ext:              domain.NewExt(org.OrgName).WithAttendanceExt(&domain.ProductAttendanceRecordExt{
+				//GroupName:      productGroup.GroupName,
+				//ProductGroupId: productGroup.ProductGroupId,
+			}),
+		}
+	} else {
+		record.WorkTimeBefore = record.ComputeWorkTimeBefore()
+	}
+
+	return struct{}{}, nil
+}
+
+func NewPGWorkerAttendanceReportService(transactionContext *pgTransaction.TransactionContext) (*PGWorkerAttendanceReportService, error) {
+	if transactionContext == nil {
+		return nil, fmt.Errorf("transactionContext参数不能为nil")
+	} else {
+		return &PGWorkerAttendanceReportService{
+			transactionContext: transactionContext,
+		}, nil
+	}
+}

@@ -6,6 +6,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/pg/models"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/pg/models"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/pg/transform"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/pg/transform"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
 
 
 	"github.com/linmadan/egglib-go/persistent/pg/sqlbuilder"
 	"github.com/linmadan/egglib-go/persistent/pg/sqlbuilder"
 	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
 	pgTransaction "github.com/linmadan/egglib-go/transaction/pg"
@@ -161,8 +162,8 @@ func (repository *ProductCalendarRepository) Find(queryOptions map[string]interf
 	}
 	}
 	query.SetWhereByQueryOption("work_station->>'workStationId'=?", "workStationId")
 	query.SetWhereByQueryOption("work_station->>'workStationId'=?", "workStationId")
 	query.SetWhereByQueryOption("work_on & ? >0", "workOn")
 	query.SetWhereByQueryOption("work_on & ? >0", "workOn")
-	if v, ok := queryOptions["workshopName"]; ok && len(v.(string)) > 0 {
-		query.Where(fmt.Sprintf(`work_station->>'workshopName' like '%%%v%%'`, v))
+	if v, ok := queryOptions["inWorkshopIds"]; ok && len(v.([]int)) > 0 {
+		query.Where(`work_station->>'workshopId' in (?)`, pg.In(utils.ToArrayString(v.([]int))))
 	}
 	}
 	query.SetOffsetAndLimit(domain.MaxQueryRow)
 	query.SetOffsetAndLimit(domain.MaxQueryRow)
 	query.SetOrderDirect("product_calendar_id", "DESC")
 	query.SetOrderDirect("product_calendar_id", "DESC")

+package task
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/hibiken/asynq"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/attendance/command"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/attendance/service"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
+)
+
+// 员工工时汇报
+func WorkerAttendanceReport(c context.Context, t *asynq.Task) error {
+	svr := service.NewAttendanceService(nil)
+	cmd := &command.WorkerAttendanceReportCommand{}
+	if err := json.Unmarshal(t.Payload(), cmd); err != nil {
+		return err
+	}
+	log.Logger.Debug(fmt.Sprintf("【员工考勤记录汇报】 消费 设备：%v  用户编号：%v  时间:%v  ", cmd.Sn, cmd.UserNo, cmd.DeviceZkTeco))
+	_, err := svr.WorkerAttendanceReport(cmd)
+	if err != nil {
+		log.Logger.Error(err.Error())
+	}
+	return nil
+}