合并分支 'test' 到 'dev'

Test 查看合并请求 !8

合并分支 'test' 到 'dev'
Test 查看合并请求 !8
庄敏学
deploy/k8s/test/allied-creation-manufacture.yaml
pkg/application/crontab/crontab.go
pkg/application/crontab/crontab_auto_approve_product_record.go
pkg/application/crontab/crontab_auto_init_workshop_product_record.go
pkg/application/productGroup/dto/product_group_employees_dto.go
pkg/application/productGroup/service/product_group.go
pkg/application/productPlan/service/product_plan.go
pkg/application/productRecord/dto/history_product_record_dto.go
pkg/application/productRecord/query/history_product_record.go
pkg/constant/common.go
pkg/domain/product_attendance_record.go
pkg/domain/product_record.go
pkg/domain/product_record_employee.go
pkg/domain/product_record_info.go
pkg/domain/user.go
pkg/infrastructure/dao/plan_dispatch_record_dao.go
pkg/infrastructure/dao/product_record_dao.go
pkg/infrastructure/domainService/allied-creation-user.go
pkg/infrastructure/domainService/pg_product_record_service.go
pkg/infrastructure/domainService/pg_product_record_statics_service.go
--- a/deploy/k8s/test/allied-creation-manufacture.yaml
查看文件 @9f563cc
+++ b/deploy/k8s/test/allied-creation-manufacture.yaml
查看文件 @9f563cc
--- a/pkg/application/crontab/crontab.go
查看文件 @9f563cc
+++ b/pkg/application/crontab/crontab.go
查看文件 @9f563cc
@@ -37,6 +37,9 @@ func (crontabService *CrontabService) initTask() {
 	})
 	task.AddTask("PullPrdMoK3cloud", PullPrdMoK3cloud)
+	autoInitWorkshopProductRecord := task.NewTask("AutoInitWorkshopProductRecord", "0 0 */4 * * *", AutoInitWorkshopProductRecord)
+	task.AddTask("AutoInitWorkshopProductRecord", autoInitWorkshopProductRecord)
+
 	autoApproveAttendanceRecord := task.NewTask("autoApproveAttendanceRecord", "0 */2 * * * *", AutoApproveProductAttendanceRecord)
 	task.AddTask("autoApproveAttendanceRecord", autoApproveAttendanceRecord)
--- a/pkg/application/crontab/crontab_auto_approve_product_record.go
查看文件 @9f563cc
+++ b/pkg/application/crontab/crontab_auto_approve_product_record.go
查看文件 @9f563cc
@@ -41,7 +41,7 @@ func AutoApproveProductRecord(ctx context.Context) error {
 	approveAttendanceRecordsService, _ := domainService.NewPGProductRecordService(transactionContext.(*pgTransaction.TransactionContext))
-	if _, err = approveAttendanceRecordsService.BatchApprove(records, 0, 0, domain.AttendanceAutoApproved); err != nil {
+	if _, err = approveAttendanceRecordsService.BatchApprove(records, 0, 0, domain.ProductRecordAutoApproved); err != nil {
 		log.Logger.Error(err.Error(), map[string]interface{}{"task": "定时审核生产记录"})
 		return err
 	}
--- a/pkg/application/crontab/crontab_auto_init_workshop_product_record.go 0 → 100644
查看文件 @9f563cc
+++ b/pkg/application/crontab/crontab_auto_init_workshop_product_record.go 0 → 100644
查看文件 @9f563cc
+package crontab
+
+import (
+	"context"
+	"fmt"
+	"github.com/linmadan/egglib-go/transaction/pg"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/factory"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/constant"
+	"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/domainService"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/repository"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
+	"time"
+)
+
+// AutoInitWorkshopProductRecord 自动初始化车间生产记录
+func AutoInitWorkshopProductRecord(ctx context.Context) error {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Logger.Error(fmt.Sprintf("%v", r), map[string]interface{}{"task": "自动初始化车间生产记录"})
+		}
+	}()
+	transactionContext, err := factory.CreateTransactionContext(nil)
+	if err != nil {
+		return err
+	}
+	if err := transactionContext.StartTransaction(); err != nil {
+		return err
+	}
+	defer func() {
+		if err != nil {
+			log.Logger.Error("【自动初始化车间生产记录】 失败:" + err.Error())
+		}
+		transactionContext.RollbackTransaction()
+	}()
+	log.Logger.Debug("【自动初始化车间生产记录】 启动")
+	_, workshop, err := factory.FastPgWorkshop(transactionContext, constant.MANUFACTURE_DEFAULT_WORKSHOPID)
+	if err != nil {
+		return err
+	}
+	productPlanDispatchRecordDao, _ := dao.NewProductPlanDispatchRecord(transactionContext.(*pg.TransactionContext))
+	productPlans, err := productPlanDispatchRecordDao.ProductPlans(constant.MANUFACTURE_DEFAULT_COMPANYID,
+		constant.MANUFACTURE_DEFAULT_ORGID,
+		constant.MANUFACTURE_DEFAULT_WORKSHOPID,
+		utils.GetZeroTimeWithLocal(time.Now(), time.UTC), "")
+	if err != nil {
+		return err
+	}
+	if len(productPlans) == 0 {
+		log.Logger.Debug("【自动初始化车间生产记录】 当天执行计划为空")
+		return nil
+	}
+	workshopProductRecordDao, _ := dao.NewWorkshopProductRecordDao(transactionContext.(*pg.TransactionContext))
+	workshopProductRecordRepository, _ := repository.NewWorkshopProductRecordRepository(transactionContext.(*pg.TransactionContext))
+	lines := workshop.GetProductLines(domain.NotDeleted)
+	for _, line := range lines {
+		for _, section := range line.ProductSections {
+			if !(section.SectionName == domain.ProductSection1 || section.SectionName == domain.ProductSection2) {
+				continue
+			}
+			if section.Removed == domain.Deleted {
+				continue
+			}
+			workstation := domain.NewWorkStation(workshop, line, section)
+			cid := constant.MANUFACTURE_DEFAULT_COMPANYID
+			oid := constant.MANUFACTURE_DEFAULT_ORGID
+			for _, plan := range productPlans {
+				var workshopProductRecord *domain.WorkshopProductRecord
+				workshopProductRecord, err = workshopProductRecordDao.WorkshopProductRecord(cid, oid, workstation.WorkStationId, plan.ProductPlanId, time.Now())
+				if err == domain.ErrorNotFound {
+					productRecord := &domain.ProductRecord{
+						CompanyId:   constant.MANUFACTURE_DEFAULT_COMPANYID,
+						OrgId:       constant.MANUFACTURE_DEFAULT_ORGID,
+						WorkStation: workstation,
+						CreatedAt:   time.Now(),
+						ProductRecordInfo: &domain.ProductRecordInfo{
+							ProductPlanId:   plan.ProductPlanId,
+							PlanProductName: plan.PlanProductName,
+							BatchNumber:     plan.BatchNumber,
+						},
+					}
+					workshopProductRecord = domainService.NewWorkshopProductRecord(productRecord, plan)
+					workshopProductRecord.UpdateProductWeigh(productRecord)
+					if workshopProductRecord, err = workshopProductRecordRepository.Save(workshopProductRecord); err != nil {
+						return err
+					}
+					log.Logger.Debug(fmt.Sprintf("【自动初始化车间生产记录】 工位:%v(%v) 初始产能:%v kg 日期:%v ID:%v",
+						workshopProductRecord.WorkStation.WorkStationId, workshopProductRecord.WorkStation.SectionName,
+						workshopProductRecord.ProductWeigh, workshopProductRecord.ProductRecordInfo.ProductDate, workshopProductRecord.WorkshopProductRecordId))
+					continue
+				}
+				if err != nil {
+					log.Logger.Error(err.Error())
+					return nil
+				}
+			}
+		}
+	}
+	if err = transactionContext.CommitTransaction(); err != nil {
+		return err
+	}
+	return nil
+}
--- a/pkg/application/productGroup/dto/product_group_employees_dto.go
查看文件 @9f563cc
+++ b/pkg/application/productGroup/dto/product_group_employees_dto.go
查看文件 @9f563cc
@@ -73,7 +73,7 @@ func (d *ProductGroupEmployeesDtos) LoadDto(groups ...*domain.ProductGroup) {
 	}
 }
-func (d *ProductGroupEmployeesDtos) LoadDtoV2(list []*domain.ProductAttendanceRecord, mapGroupUser map[string]*domain.User, keyFunc func(int) string) {
+func (d *ProductGroupEmployeesDtos) LoadDtoV2(list []*domain.ProductAttendanceRecord, mapGroupUser map[string]*domain.User, keyFunc func(int) string, checkUserEnableFunc func(int) bool) {
 	var mapUser = make(map[int]int)
 	// 打卡的用户
 	for _, v := range list {
@@ -83,6 +83,9 @@ func (d *ProductGroupEmployeesDtos) LoadDtoV2(list []*domain.ProductAttendanceRe
 		item.ProductGroupId = 0
 		item.GroupName = ""
 		item.Online = true
+		if enable := checkUserEnableFunc(item.UserId); !enable {
+			continue
+		}
 		if v, ok := mapGroupUser[keyFunc(item.UserId)]; ok {
 			item.GroupName = v.GroupName
 			item.ProductGroupId = v.GroupId
@@ -107,6 +110,9 @@ func (d *ProductGroupEmployeesDtos) LoadDtoV2(list []*domain.ProductAttendanceRe
 		item.UserName = v.UserName
 		item.ProductGroupId = v.GroupId
 		item.GroupName = v.GroupName
+		if enable := checkUserEnableFunc(item.UserId); !enable {
+			continue
+		}
 		mapUser[item.UserId] = item.UserId
 		d.Append(item)
 	}
--- a/pkg/application/productGroup/service/product_group.go
查看文件 @9f563cc
+++ b/pkg/application/productGroup/service/product_group.go
查看文件 @9f563cc
@@ -11,6 +11,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/domain"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/domainService"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/log"
 	"sort"
 	"strings"
 	"time"
@@ -491,7 +492,20 @@ func (productGroupService *ProductGroupService) SearchProductGroupEmployeesV2(op
 	productGroupRepository, _, _ := factory.FastPgProductGroup(transactionContext, 0)
 	mapUser, keyFunc := domainService.FindGroupMembers(productGroupRepository, cmd.CompanyId, cmd.OrgId, domain.WorkstationKey(cmd.WorkshopId, cmd.LineId, cmd.SectionId))
 	var results = dto.NewProductGroupEmployeesDtos()
-	results.LoadDtoV2(productGroups, mapUser, keyFunc)
+
+	userService := domainService.NewUserService()
+	checkUserEnableFunc := func(userId int) bool {
+		user, err := userService.User(userId)
+		if err != nil {
+			return false
+		}
+		if user.EnableStatus == int(domain.UserStatusEnable) {
+			return true
+		}
+		log.Logger.Debug(fmt.Sprintf("ID:%d 用户:%s 状态:%d 已被禁用,过滤", user.UserId, user.UserName, user.EnableStatus))
+		return false
+	}
+	results.LoadDtoV2(productGroups, mapUser, keyFunc, checkUserEnableFunc)
 	sort.Stable(results)
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return 0, nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
--- a/pkg/application/productPlan/service/product_plan.go
查看文件 @9f563cc
+++ b/pkg/application/productPlan/service/product_plan.go
查看文件 @9f563cc
@@ -5,11 +5,13 @@ import (
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/transaction/pg"
 	"github.com/linmadan/egglib-go/utils/tool_funs"
+	"github.com/linmadan/egglib-go/utils/xtime"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/factory"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/productPlan/command"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/productPlan/dto"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/productPlan/query"
 	"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/domainService"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/redis"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
@@ -514,6 +516,26 @@ func (productPlanService *ProductPlanService) ReturnMaterial(returnMaterialComma
 	productRecordService, _ := domainService.NewPGProductRecordService(transactionContext.(*pg.TransactionContext))
+	productRecordDao, _ := dao.NewProductRecordDao(transactionContext.(*pg.TransactionContext))
+	begin := xtime.BeginningOfDay()
+	end := time.Now()
+	workstationId := domain.WorkstationKey(returnMaterialCommand.WorkshopId, returnMaterialCommand.LineId, returnMaterialCommand.SectionId)
+	totalReceive, err := productRecordDao.ProductWeightStatics(returnMaterialCommand.CompanyId, returnMaterialCommand.OrgId, domain.RecordTypeReceiveMaterial, returnMaterialCommand.ProductPlanId, workstationId, begin, end)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	totalReturn, err := productRecordDao.ProductWeightStatics(returnMaterialCommand.CompanyId, returnMaterialCommand.OrgId, domain.RecordTypeReturnMaterial, returnMaterialCommand.ProductPlanId, workstationId, begin, end)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	allowReturn := totalReceive - totalReturn
+	if totalReturn+returnMaterialCommand.Weigh > totalReceive {
+		if allowReturn > 0 {
+			return nil, application.ThrowError(application.BUSINESS_ERROR, fmt.Sprintf("当天累计退料大于累计领料,当前只允许退料 %v kg", totalReceive-totalReturn))
+		}
+		return nil, application.ThrowError(application.BUSINESS_ERROR, fmt.Sprintf("当天累计退料大于累计领料"))
+	}
+
 	_, err = productRecordService.SubmitProductRecord(domain.RecordTypeReturnMaterial, tool_funs.SimpleStructToMap(returnMaterialCommand))
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
--- a/pkg/application/productRecord/dto/history_product_record_dto.go
查看文件 @9f563cc
+++ b/pkg/application/productRecord/dto/history_product_record_dto.go
查看文件 @9f563cc
@@ -29,14 +29,20 @@ type HistoryProductRecord struct {
 func (d *HistoryProductRecord) LoadDto(m *domain.ProductRecord) *HistoryProductRecord {
 	d.ProductRecordId = m.ProductRecordId
 	d.ProductWorker = m.ProductWorker
-	d.Weight = utils.Round(m.ProductRecordInfo.WeighBefore, 1)
+	d.Weight = utils.Round(m.ProductRecordInfo.Original, 1)
 	d.Status = m.ProductRecordInfo.ApproveStatus
 	d.PlanProductName = m.ProductRecordInfo.PlanProductName
 	d.BatchNumber = m.ProductRecordInfo.BatchNumber
 	d.CreatedAt = m.CreatedAt.Local().Format("2006-01-02 15:04:05")
 	d.ProductRecordType = m.ProductRecordType
-	if m.ProductRecordType != domain.RecordTypeSecondLevelWeigh && m.ProductRecordInfo.ApproveStatus == domain.ProductRecordNotApprove && !xtime.BeginningOfDay().Equal(xtime.New(m.CreatedAt).BeginningOfDay()) {
+	if m.ProductRecordType != domain.RecordTypeSecondLevelWeigh &&
+		m.ProductRecordInfo.ApproveStatus == domain.ProductRecordNotApprove &&
+		!(xtime.BeginningOfDay().Equal(xtime.New(m.CreatedAt.Local()).BeginningOfDay())) {
+		//log.Logger.Debug("not equal", map[string]interface{}{"t1": xtime.BeginningOfDay(), "t2": xtime.New(m.CreatedAt.Local()).BeginningOfDay()})
 		d.Status = domain.ProductRecordLogged
 	}
+	if m.ProductRecordType == domain.RecordTypeSecondLevelWeigh && m.ProductRecordInfo.ApproveStatus == domain.ProductRecordAutoApproved {
+		d.Status = domain.ProductRecordApproved
+	}
 	return d
 }
--- a/pkg/application/productRecord/query/history_product_record.go
查看文件 @9f563cc
+++ b/pkg/application/productRecord/query/history_product_record.go
查看文件 @9f563cc
@@ -27,12 +27,12 @@ type HistoryProductRecordQuery struct {
 	PageNumber int `cname:"页码" json:"pageNumber,omitempty"`
 	// 页数
 	PageSize int `cname:"页数" json:"pageSize,omitempty"`
-	// 车间名称
-	//WorkshopName string `cname:"车间名称" json:"workshopName"`
-	// 批号
-	//BatchNumber string `cname:"批号" json:"batchNumber"`
-	// 姓名
-	//UserName string `cname:"姓名" json:"userName"`
+	// 车间ID
+	WorkshopId int `cname:"车间ID" json:"workshopId,omitempty"`
+	// 生产线ID
+	LineId int `cname:"生产线ID"  json:"lineId,omitempty"`
+	// 工段ID
+	SectionId int `json:"sectionId,omitempty"`
 	// 生产记录类型：1:领料 2：退料  4：称重 8：二级品称重
 	ProductRecordType int `cname:"生产记录类型：1:领料 2：退料  4：称重 8：二级品称重" json:"productRecordType"`
 	// 生产线名称
@@ -54,6 +54,8 @@ type HistoryProductRecordQuery struct {
 	ProductWorkerId int `cname:"生产员工ID" json:"productWorkerId"`
 	//  状态 0:全部 1:未审核  2：已审核 3:已撤回 4:已记录
 	Status int `cname:"状态" json:"status"`
+	//  状态 0:全部 1:未审核  2：已审核 3:已撤回 4:已记录
+	InStatus []int `cname:"匹配多个状态" json:"intStatus"`
 	// 开始时间
 	ProductBeginTime time.Time `cname:"开始时间" json:"productBeginTime"`
@@ -92,11 +94,25 @@ func (cmd *HistoryProductRecordQuery) Valid(validation *validation.Validation) {
 		cmd.ProductBeginTime = t
 		cmd.ProductEndTime = t.AddDate(0, 0, 1)
 	}
-	if cmd.Status == domain.ProductRecordLogged {
+	if cmd.ProductRecordType == domain.RecordTypeReceiveMaterial || cmd.ProductRecordType == domain.RecordTypeReturnMaterial {
+		if cmd.Status == domain.ProductRecordNotApprove {
+			cmd.Status = domain.ProductRecordNotApprove
+			if xtime.IsZero(cmd.ProductBeginTime) || xtime.BeforeEqual(cmd.ProductBeginTime, xtime.BeginningOfDay()) {
+				cmd.ProductBeginTime = xtime.BeginningOfDay()
+			}
+		} else if cmd.Status == domain.ProductRecordLogged {
 			cmd.Status = domain.ProductRecordNotApprove
 			if len(cmd.Date) == 0 && xtime.IsZero(cmd.ProductEndTime) {
 				cmd.ProductEndTime = xtime.BeginningOfDay()
 			}
+			if len(cmd.Date) > 0 && !xtime.BeforeEqual(cmd.ProductEndTime, xtime.BeginningOfDay()) {
+				cmd.Status = domain.ProductRecordLogged
+			}
+		}
+	}
+	if cmd.ProductRecordType == domain.RecordTypeSecondLevelWeigh && cmd.Status == domain.ProductRecordApproved {
+		cmd.Status = 0
+		cmd.InStatus = []int{domain.ProductRecordApproved, domain.ProductRecordAutoApproved}
 	}
 }
--- a/pkg/constant/common.go
查看文件 @9f563cc
+++ b/pkg/constant/common.go
查看文件 @9f563cc
@@ -14,6 +14,7 @@ var HTTP_PORT int = 8081
 var CACHE_PREFIX = "allied-creation-manufacture-dev"
 var LOG_LEVEL = "debug"
 var LOG_FILE = "app.log"
+var PPROF_ON = true
 //天联共创基础模块
 var ALLIED_CREATION_BASIC_HOST = "http://localhost:8080" //"http://allied-creation-basic-dev.fjmaimaimai.com"
@@ -45,5 +46,6 @@ func init() {
 	SERVICE_ENV = Configurator.DefaultString("SERVICE_ENV", SERVICE_ENV)
 	HTTP_PORT = Configurator.DefaultInt("HTTP_PORT", HTTP_PORT)
 	SERVICE_NAME = fmt.Sprintf("%v-%v", SERVICE_NAME, SERVICE_ENV)
+	PPROF_ON = Configurator.DefaultBool("PPROF_ON", PPROF_ON)
 	CACHE_PREFIX = SERVICE_NAME
 }
--- a/pkg/domain/product_attendance_record.go
查看文件 @9f563cc
+++ b/pkg/domain/product_attendance_record.go
查看文件 @9f563cc
@@ -80,7 +80,9 @@ func (productAttendanceRecord *ProductAttendanceRecord) ComputeWorkTimeBefore(pr
 	if !productAttendanceRecord.SignOut.After(productAttendanceRecord.SignIn) {
 		return 0
 	}
-	wt := utils.Round(productAttendanceRecord.SignOut.Sub(productAttendanceRecord.SignIn).Hours(), 2)
+	signIn := roundTime(productAttendanceRecord.SignIn)
+	signOut := roundTime(productAttendanceRecord.SignOut)
+	wt := utils.Round(signOut.Sub(signIn).Hours(), 2)
 	if productCalendar == nil {
 		return roundWorkTime(wt)
 	}
@@ -108,6 +110,20 @@ func roundWorkTime(wt float64) float64 {
 	return i
 }
+func roundTime(t time.Time) time.Time {
+	hour, min, _ := t.Local().Clock()
+	y, m, d := t.Local().Date()
+	newTime := time.Date(y, m, d, hour, 0, 0, 0, time.Local)
+	if min < 11 {
+		min = 0
+	} else if min >= 11 && min < 41 {
+		min = 30
+	} else {
+		min = 60
+	}
+	return newTime.Add(time.Minute * time.Duration(min))
+}
+
 func (productAttendanceRecord *ProductAttendanceRecord) SetProductTimeByProductCalendar(productCalendar *ProductCalendar) error {
 	now := xtime.New(productAttendanceRecord.SignIn)
 	productAttendanceRecord.ProductDate = now.BeginningOfDay()
--- a/pkg/domain/product_record.go
查看文件 @9f563cc
+++ b/pkg/domain/product_record.go
查看文件 @9f563cc
@@ -19,6 +19,7 @@ const (
 	ProductRecordApproved     = 2 // 已审核
 	ProductRecordWithdraw     = 3 // 已撤回
 	ProductRecordLogged       = 4 // 已记录
+	ProductRecordAutoApproved = 5 // 自动审核
 )
 // 生产记录
--- a/pkg/domain/product_record_employee.go
查看文件 @9f563cc
+++ b/pkg/domain/product_record_employee.go
查看文件 @9f563cc
@@ -11,7 +11,7 @@ const (
 )
 const (
-	ProductSection1 = "打料"
+	ProductSection1 = "制模"
 	ProductSection2 = "成型"
 	ProductSection3 = "穿串"
 	ProductSection4 = "包装"
--- a/pkg/domain/product_record_info.go
查看文件 @9f563cc
+++ b/pkg/domain/product_record_info.go
查看文件 @9f563cc
@@ -12,7 +12,7 @@ type ProductRecordInfo struct {
 	WeighBefore float64 `json:"weighBefore"`
 	// 产能-审核后
 	WeighAfter float64 `json:"weighAfter"`
-	// 审核状态  1:未审核  2：已审核
+	// 审核状态  1:未审核  2：已审核  3.已撤回 4.已记录 5.自动审核
 	ApproveStatus int `json:"approveStatus"`
 	// 审核时间
 	ApproveAt int64 `json:"approveAt"`
--- a/pkg/domain/user.go
查看文件 @9f563cc
+++ b/pkg/domain/user.go
查看文件 @9f563cc
@@ -6,6 +6,15 @@ const (
 	EmployeePartTime = 3 // 临时
 )
+// 用户状态
+const (
+	UserStatusEnable  UserStatus = 1
+	UserStatusDisable UserStatus = 2
+	UserStatusDestroy UserStatus = 3
+)
+
+type UserStatus int
+
 // 用户对象
 type User struct {
 	// 用户Id 用户唯一标识
@@ -21,6 +30,8 @@ type User struct {
 	// 手机号码
 	Phone string `json:"phone,omitempty"`
+	// 启用状态
+	EnableStatus int `json:"-"`
 	// 额外扩展的参数
 	GroupId   int    `json:"-"`
 	GroupName string `json:"-"`
--- a/pkg/infrastructure/dao/plan_dispatch_record_dao.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/dao/plan_dispatch_record_dao.go
查看文件 @9f563cc
@@ -29,7 +29,7 @@ func NewProductPlanDispatchRecord(transactionContext *pgTransaction.TransactionC
 // 日期
 // 产品编号
 // 调度状态 status
-func (dao *ProductPlanDispatchRecordDao) DeviceProductPlan(companyId, orgId int, workStationId string, date time.Time, productCode string, status int) (*domain.ProductPlanDispatchRecord, error) {
+func (dao *ProductPlanDispatchRecordDao) ProductPlanDispatchRecord(companyId, orgId int, workStationId string, date time.Time, productCode string, status int) (*domain.ProductPlanDispatchRecord, error) {
 	tx := dao.transactionContext.PgTx
 	productPlanDispatchRecordModel := new(models.ProductPlanDispatchRecord)
 	query := sqlbuilder.BuildQuery(tx.Model(productPlanDispatchRecordModel), map[string]interface{}{})
@@ -37,7 +37,9 @@ func (dao *ProductPlanDispatchRecordDao) DeviceProductPlan(companyId, orgId int,
 	query.Where("org_id = ?", orgId)
 	query.Where("work_station->>'workStationId'=?", workStationId)
 	query.Where("product_date = ?", date)
+	if status > 0 {
 		query.Where("plan_dispatch_status = ?", status)
+	}
 	query.Where("plan_dispatch_record_ext->>'productCode'=?", productCode)
 	query.Order("updated_at desc")
 	if err := query.First(); err != nil {
@@ -53,3 +55,57 @@ func (dao *ProductPlanDispatchRecordDao) DeviceProductPlan(companyId, orgId int,
 		return transform.TransformToProductPlanDispatchRecordDomainModelFromPgModels(productPlanDispatchRecordModel)
 	}
 }
+
+func (dao *ProductPlanDispatchRecordDao) ProductPlan(companyId, orgId int, workshopId int, date time.Time, productCode string) (*domain.ProductPlan, error) {
+	tx := dao.transactionContext.PgTx
+	productPlan := new(models.ProductPlan)
+	query := sqlbuilder.BuildQuery(tx.Model(productPlan), map[string]interface{}{})
+	query.Where("company_id = ?", companyId)
+	query.Where("org_id = ?", orgId)
+	query.Where("workshop->>'workshopId'='?'", workshopId)
+	query.Where("product_date = ?", date)
+	if len(productCode) > 0 {
+		query.Where("ext #>>'{productPlanExt,productCode}'=?", productCode)
+	}
+	query.Order("updated_at 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 productPlan.ProductPlanId == 0 {
+		return nil, nil
+	} else {
+		return transform.TransformToProductPlanDomainModelFromPgModels(productPlan)
+	}
+}
+
+func (dao *ProductPlanDispatchRecordDao) ProductPlans(companyId, orgId int, workshopId int, date time.Time, productCode string) ([]*domain.ProductPlan, error) {
+	tx := dao.transactionContext.PgTx
+	productPlan := new(models.ProductPlan)
+	query := sqlbuilder.BuildQuery(tx.Model(productPlan), map[string]interface{}{})
+	query.Where("company_id = ?", companyId)
+	query.Where("org_id = ?", orgId)
+	query.Where("workshop->>'workshopId'='?'", workshopId)
+	query.Where("product_date = ?", date)
+	if len(productCode) > 0 {
+		query.Where("ext #>>'{productPlanExt,productCode}'=?", productCode)
+	}
+	query.Order("updated_at desc")
+	var productPlanModels = make([]*models.ProductPlan, 0)
+	var productPlans = make([]*domain.ProductPlan, 0)
+	if err := query.Select(&productPlanModels); err != nil {
+		return productPlans, err
+	} else {
+		for _, productPlanModel := range productPlanModels {
+			if productPlan, err := transform.TransformToProductPlanDomainModelFromPgModels(productPlanModel); err != nil {
+				return productPlans, err
+			} else {
+				productPlans = append(productPlans, productPlan)
+			}
+		}
+		return productPlans, nil
+	}
+}
--- a/pkg/infrastructure/dao/product_record_dao.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/dao/product_record_dao.go
查看文件 @9f563cc
@@ -117,7 +117,7 @@ select sum(a.weight) item_total,max(sname) sname  from (
 	and product_record_info->>'approveStatus'='2'
 	and created_at >=?
     and created_at <?
-	and  work_station->>'sectionName' in ('打料','成型','穿串','包装')
+	and  work_station->>'sectionName' in ('制模','成型','穿串','包装')
 ) a
 group by a.workStationId
 )
@@ -127,10 +127,31 @@ select sname,round(item_total/(select sum(item_total) from item_product)*100, 0)
 )
 --select * from item_product_rate
 select a.sname, coalesce(b.rate,0) rate from (
-	select unnest(ARRAY ['打料','成型','穿串','包装']) sname
+	select unnest(ARRAY ['制模','成型','穿串','包装']) sname
 ) a left join item_product_rate b on a.sname=b.sname`)
 	if _, err := tx.Query(result, sql, companyId, orgId, workshopId, beginTime, endTime); err != nil {
 		return err
 	}
 	return nil
 }
+
+// ProductWeightStatics 产能统计
+func (dao *ProductRecordDao) ProductWeightStatics(companyId, orgId, productRecordType, productPlanId int, workstationId string, beginTime time.Time, endTime time.Time) (float64, error) {
+
+	tx := dao.transactionContext.PgTx
+	var result = struct {
+		Total float64
+	}{}
+	sql := fmt.Sprintf(`
+select coalesce(sum(cast(product_record_info->>'original' as DECIMAL)),0) total
+from manufacture.product_records
+where company_id = ? and org_id = ? and  product_record_type = ? 
+and  work_station->>'workStationId' = ?
+and  product_record_info->>'productPlanId' = '?'
+and created_at >= ? and created_at < ?
+`)
+	if _, err := tx.QueryOne(&result, sql, companyId, orgId, productRecordType, workstationId, productPlanId, beginTime, endTime); err != nil {
+		return 0, err
+	}
+	return result.Total, nil
+}
--- a/pkg/infrastructure/domainService/allied-creation-user.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/domainService/allied-creation-user.go
查看文件 @9f563cc
@@ -63,6 +63,7 @@ func (svr *UserService) ToUser(from *models.User) *domain.User {
 		IcCardNumber: from.IcCardNumber,
 		Avatar:       from.UserInfo.Avatar,
 		Phone:        from.UserInfo.Phone,
+		EnableStatus: from.EnableStatus,
 	}
 	if user.EmployeeType == 0 {
 		user.EmployeeType = 1 //默认正式员工
--- a/pkg/infrastructure/domainService/pg_product_record_service.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/domainService/pg_product_record_service.go
查看文件 @9f563cc
@@ -204,7 +204,7 @@ func (ptr *PGProductRecordService) Cancel(productRecordId int) (interface{}, err
 	return struct{}{}, nil
 }
-func (ptr *PGProductRecordService) BatchApprove(list []*domain.ProductRecord, approveUserId int, weight float64, status int) (interface{}, error) {
+func (ptr *PGProductRecordService) BatchApprove(list []*domain.ProductRecord, approveUserId int, weightAfter float64, status int) (interface{}, error) {
 	var productRecordRepository, _ = repository.NewProductRecordRepository(ptr.transactionContext)
 	var record *domain.ProductRecord
 	var err error
@@ -220,26 +220,19 @@ func (ptr *PGProductRecordService) BatchApprove(list []*domain.ProductRecord, ap
 	for i := range list {
 		record = list[i]
-		t := record.ProductRecordInfo.WeighBefore
-		if weight > 0 {
-			t = weight
+		weighBefore := record.ProductRecordInfo.WeighBefore
+		if weightAfter > 0 {
+			weighBefore = weightAfter
 		}
-		if t <= 0 && status == domain.AttendanceAutoApproved {
+		if weighBefore <= 0 || record.ProductRecordInfo.ApproveStatus != domain.ProductRecordNotApprove {
 			continue
 		}
-		if err = record.Approve(user, t, time.Now(), status); err != nil {
+		if err = record.Approve(user, weighBefore, time.Now(), status); err != nil {
 			return nil, err
 		}
 		if _, err := productRecordRepository.Save(record); err != nil {
 			return nil, err
 		}
-	}
-
-	for i := range list {
-		record = list[i]
-		if record.ProductRecordInfo.WeighBefore <= 0 && status == domain.AttendanceAutoApproved {
-			continue
-		}
 		if e := SendProductRecordStaticsJob(record); e != nil {
 			log.Logger.Error("【发送产量统计任务失败】" + e.Error())
 		}
--- a/pkg/infrastructure/domainService/pg_product_record_statics_service.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/domainService/pg_product_record_statics_service.go
查看文件 @9f563cc
@@ -11,7 +11,7 @@ import (
 )
 const (
-	ProductSection1 = "打料"
+	ProductSection1 = "制模" //打料更新为制模
 	ProductSection2 = "成型"
 	ProductSection3 = "穿串"
 	ProductSection4 = "包装"
@@ -298,7 +298,7 @@ func (ptr *PGProductRecordService) WorkshopProductStatics(productRecord *domain.
 	workshopProductRecordDao, _ := dao.NewWorkshopProductRecordDao(ptr.transactionContext)
 	workshopProductRecord, err = workshopProductRecordDao.WorkshopProductRecord(cid, oid, productRecord.WorkStation.WorkStationId, planId, productRecord.CreatedAt)
 	if err == domain.ErrorNotFound {
-		workshopProductRecord = newWorkshopProductRecord(productRecord, productPlan)
+		workshopProductRecord = NewWorkshopProductRecord(productRecord, productPlan)
 	} else {
 		if err != nil {
 			log.Logger.Error(err.Error())
@@ -310,9 +310,9 @@ func (ptr *PGProductRecordService) WorkshopProductStatics(productRecord *domain.
 		workshopProductRecord.ProductWeigh, productRecord.ProductRecordInfo.Weigh, productRecord.ProductRecordInfo.Original))
 	workshopProductRecord.UpdateProductWeigh(productRecord)
 	// 打料 跟 成型工段的初始产能是批次的产能
-	if productRecord.WorkStation.SectionName == ProductSection1 && productRecord.WorkStation.SectionName == ProductSection2 {
-		workshopProductRecord.AddPlanProductWeight(productPlan.PlanDevoted.Weight, productPlan.ProductPlanId)
-	}
+	//if productRecord.WorkStation.SectionName == ProductSection1 || productRecord.WorkStation.SectionName == ProductSection2 {
+	//	workshopProductRecord.AddPlanProductWeight(productPlan.PlanDevoted.Weight, productPlan.ProductPlanId)
+	//}
 	if workshopProductRecord, err = workshopProductRecordRepository.Save(workshopProductRecord); err != nil {
 		// TODO：异常处理
@@ -321,8 +321,8 @@ func (ptr *PGProductRecordService) WorkshopProductStatics(productRecord *domain.
 	return nil, nil
 }
-// newEmployeeProductRecord 员工生产记录
-func newWorkshopProductRecord(productRecord *domain.ProductRecord, productPlan *domain.ProductPlan) *domain.WorkshopProductRecord {
+// NewWorkshopProductRecord 车间生产记录
+func NewWorkshopProductRecord(productRecord *domain.ProductRecord, productPlan *domain.ProductPlan) *domain.WorkshopProductRecord {
 	record := &domain.WorkshopProductRecord{
 		CompanyId:   productRecord.CompanyId,
 		OrgId:       productRecord.OrgId,
@@ -347,7 +347,7 @@ func newWorkshopProductRecord(productRecord *domain.ProductRecord, productPlan *
 	}
 	// 打料、成型有初始值
 	if productRecord.WorkStation.SectionName == ProductSection1 || productRecord.WorkStation.SectionName == ProductSection2 {
-		record.ProductWeigh = productPlan.PlanDevoted.Weight
+		record.AddPlanProductWeight(productPlan.PlanDevoted.Weight, productPlan.ProductPlanId)
 	}
 	return record
 }
--- a/pkg/infrastructure/domainService/pg_workshop_data_consume_service.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/domainService/pg_workshop_data_consume_service.go
查看文件 @9f563cc
@@ -78,7 +78,7 @@ func (ptr *PGWorkshopDataConsumeService) Consume(companyId, orgId int, record *d
 	// 封箱机、串串机需要定位到批次
 	if record.DeviceType == domain.DeviceTypeChuanChuanJi { //record.DeviceType == domain.DeviceTypeFengXiangJi ||
 		datetime, _ := time.ParseInLocation("2006-01-02", deviceRunningData.Date, time.Local)
-		if plan, err = ptr.findDeviceProductPlan(companyId, orgId, workStation.WorkStationId, utils.GetZeroTimeWithLocal(datetime, time.UTC), deviceRunningData.ProductType); err != nil {
+		if plan, err = ptr.findProductPlanAndActive(companyId, orgId, workStation, utils.GetZeroTimeWithLocal(datetime, time.UTC), deviceRunningData.ProductType); err != nil {
 			log.Logger.Error(err.Error(), map[string]interface{}{"workstation": workStation, "product_code": deviceRunningData.ProductType})
 		} else {
 			planId = plan.PlanDispatchRecordExt.ProductPlanId
@@ -326,20 +326,29 @@ func (ptr *PGWorkshopDataConsumeService) saveDeviceDailyRunningRecord(companyId,
 }
 // 查找设备的生产计划，如果计划没有上线的话将他上线
-func (ptr *PGWorkshopDataConsumeService) findDeviceProductPlan(companyId, orgId int, workStationId string, date time.Time, productCode string) (*domain.ProductPlanDispatchRecord, error) {
+func (ptr *PGWorkshopDataConsumeService) findProductPlanAndActive(companyId, orgId int, workStation *domain.WorkStation, date time.Time, productCode string) (*domain.ProductPlanDispatchRecord, error) {
 	planDispatchRecordDao, _ := dao.NewProductPlanDispatchRecord(ptr.transactionContext)
 	planDispatchRecordRepository, _ := repository.NewProductPlanDispatchRecordRepository(ptr.transactionContext)
-	var setPlanOnline = false
-	record, err := planDispatchRecordDao.DeviceProductPlan(companyId, orgId, workStationId, date, productCode, domain.PlanOnline)
+	record, err := planDispatchRecordDao.ProductPlanDispatchRecord(companyId, orgId, workStation.WorkStationId, date, productCode, 0)
+	// 未找到当前工段的调度计划,从计划管理查询是否有匹配记录,如果有在调度计划中上线
+	var productPlan *domain.ProductPlan
 	if err == domain.ErrorNotFound {
-		if record, err = planDispatchRecordDao.DeviceProductPlan(companyId, orgId, workStationId, date, productCode, domain.PlanOffline); err != nil {
+		if productPlan, err = planDispatchRecordDao.ProductPlan(companyId, orgId, workStation.WorkshopId, date, productCode); err == nil && productPlan != nil {
+			var productPlanDispatch = domain.NewProductPlanDispatchRecord(productPlan, workStation)
+			if productPlanDispatch, err = planDispatchRecordRepository.Save(productPlanDispatch); err != nil {
+				return nil, err
+			}
+			return productPlanDispatch, nil
+		}
 		return nil, err
-		} else {
-			setPlanOnline = true
 	}
+	if err != nil {
+		return nil, err
+	}
+	if record != nil && record.PlanDispatchStatus == domain.PlanOffline {
+		if err = record.ChangeStatus(domain.PlanOnline); err != nil {
+			return nil, err
 		}
-	if setPlanOnline {
-		record.ChangeStatus(domain.PlanOnline)
 		if record, err = planDispatchRecordRepository.Save(record); err != nil {
 			return nil, err
 		}
--- a/pkg/infrastructure/pg/transform/device_collection.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/pg/transform/device_collection.go
查看文件 @9f563cc
@@ -6,6 +6,17 @@ import (
 )
 func TransformToDeviceCollectionDomainModelFromPgModels(deviceCollectionModel *models.DeviceCollection) (*domain.DeviceCollection, error) {
+	if deviceCollectionModel.DeviceType == domain.DeviceTypeYouZhaJi {
+		if tmp, ok := deviceCollectionModel.Values["Temp1"]; ok {
+			deviceCollectionModel.Values["FrontTemp"] = tmp
+		}
+		if tmp, ok := deviceCollectionModel.Values["Temp2"]; ok {
+			deviceCollectionModel.Values["TankTemp"] = tmp
+		}
+		if tmp, ok := deviceCollectionModel.Values["Temp3"]; ok {
+			deviceCollectionModel.Values["BackTemp"] = tmp
+		}
+	}
 	return &domain.DeviceCollection{
 		DeviceCollectionId: deviceCollectionModel.DeviceCollectionId,
 		WorkShopName:       deviceCollectionModel.WorkShopName,
--- a/pkg/infrastructure/repository/pg_product_record_repository.go
查看文件 @9f563cc
+++ b/pkg/infrastructure/repository/pg_product_record_repository.go
查看文件 @9f563cc
@@ -6,6 +6,7 @@ import (
 	"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/transform"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils"
 	"time"
 	"github.com/linmadan/egglib-go/persistent/pg/sqlbuilder"
@@ -147,12 +148,18 @@ func (repository *ProductRecordRepository) Find(queryOptions map[string]interfac
 	query.SetWhereByQueryOption("company_id = ?", "companyId")
 	query.SetWhereByQueryOption("org_id = ?", "orgId")
 	query.SetWhereByQueryOption("product_record_type & ? >0", "productRecordType")
+	query.SetWhereByQueryOption("work_station->>'workshopId'='?'", "workshopId")
+	query.SetWhereByQueryOption("work_station->>'lineId'='?'", "lineId")
+	query.SetWhereByQueryOption("work_station->>'sectionId'='?'", "sectionId")
 	if v, ok := queryOptions["inOrgIds"]; ok && len(v.([]int)) > 0 {
 		query.Where(`org_id in (?)`, pg.In(v))
 	}
 	if v, ok := queryOptions["userName"]; ok && len(v.(string)) > 0 {
 		query.Where(fmt.Sprintf(`product_worker->>'userName' like '%%%v%%'`, v))
 	}
+	if v, ok := queryOptions["productWorkerId"]; ok && v.(int) > 0 {
+		query.Where(`product_worker->>'userId' = '?'`, v)
+	}
 	if v, ok := queryOptions["workshopName"]; ok && len(v.(string)) > 0 {
 		query.Where(fmt.Sprintf(`work_station->>'workshopName' like '%%%v%%'`, v))
 	}
@@ -183,6 +190,9 @@ func (repository *ProductRecordRepository) Find(queryOptions map[string]interfac
 	if v, ok := queryOptions["status"]; ok && v.(int) > 0 {
 		query.Where(fmt.Sprintf(`product_record_info->>'approveStatus' = '%v'`, v))
 	}
+	if v, ok := queryOptions["inStatus"]; ok && len(v.([]int)) > 0 {
+		query.Where(`product_record_info->>'approveStatus' in (?)`, pg.In(utils.ToArrayString(v.([]int))))
+	}
 	if v, ok := queryOptions["lastProductRecordId"]; ok && v.(int) > 0 {
 		query.Where(`product_record_id < ?`, v)
 	}
--- a/pkg/port/beego/beego.go
查看文件 @9f563cc
+++ b/pkg/port/beego/beego.go
查看文件 @9f563cc
@@ -3,6 +3,9 @@ package beego
 import (
 	"github.com/beego/beego/v2/server/web"
 	"github.com/linmadan/egglib-go/web/beego/filters"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/constant"
+	"net/http"
+	"net/http/pprof"
 	"os"
 	"strconv"
@@ -39,6 +42,22 @@ func init() {
 			web.BConfig.Listen.HTTPSPort = port
 		}
 	}
+
+	if constant.PPROF_ON {
+		web.Handler("/debug/pprof/", http.HandlerFunc(pprof.Index))
+		web.Handler("/debug/cmdline", http.HandlerFunc(pprof.Cmdline))
+		web.Handler("/debug/profile", http.HandlerFunc(pprof.Profile))
+		web.Handler("/debug/symbol", http.HandlerFunc(pprof.Symbol))
+		web.Handler("/debug/trace", http.HandlerFunc(pprof.Trace))
+
+		web.Handler("/debug/allocs", pprof.Handler("allocs"))
+		web.Handler("/debug/block", pprof.Handler("block"))
+		web.Handler("/debug/goroutine", pprof.Handler("goroutine"))
+		web.Handler("/debug/heap", pprof.Handler("heap"))
+		web.Handler("/debug/mutex", pprof.Handler("mutex"))
+		web.Handler("/debug/threadcreate", pprof.Handler("threadcreate"))
+	}
+
 	web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
 	web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"
 	web.InsertFilter("/*", web.BeforeExec, filters.AllowCors())
--- a/pkg/port/beego/controllers/common_statistics_controller.go
查看文件 @9f563cc
+++ b/pkg/port/beego/controllers/common_statistics_controller.go
查看文件 @9f563cc
@@ -154,6 +154,8 @@ func (controller *StatisticsController) TaskHandler() func(ctx *context.Context)
 				Response(ctx, nil, err)
 				return
 			}
+		case "13":
+			crontab.AutoInitWorkshopProductRecord(nil)
 		}
 		Response(ctx, nil, nil)
 	}