Merge branch 'dev' into test

+package service
+
+import (
+	"github.com/linmadan/egglib-go/core/application"
+	"github.com/linmadan/egglib-go/utils/excel"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/ecelData/command"
+	productRecordCommand "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/productRecord/command"
+	productRecordService "gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/application/productRecord/service"
+	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils/converter"
+)
+
+// ImportProductCapacities 导入产能数据
+func (srv ExcelDataService) ImportProductCapacities(importDataCommand *command.ImportDataCommand) (interface{}, error) {
+	excelImport := excel.NewExcelImport()
+	excelImport.RowBegin = 3 //第二行开始读取
+	excelImport.DataFields = []excel.DataField{
+		{EnName: "RecordDate", CnName: "日期"},
+		{EnName: "WorkshopName", CnName: "车间"},
+		{EnName: "LineName", CnName: "线别"},
+		{EnName: "SectionName", CnName: "工段"},
+		{EnName: "WorkOn", CnName: "班别"},
+		{EnName: "WorkerName", CnName: "姓名"},
+		{EnName: "BatchNumber", CnName: "批次号"},
+		{EnName: "Weigh", CnName: "产量(kg)"},
+	}
+	excelData, err := converter.OpenImportFileFromIoReader(excelImport, importDataCommand.Reader, importDataCommand.FileExt) //excelImport.OpenExcelFromIoReader(importDataCommand.Reader)
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	items := make([]productRecordCommand.BatchAddProductCapacitiesCmd, 0, len(excelData))
+	item := productRecordCommand.BatchAddProductCapacitiesCmd{}
+	for _, v := range excelData {
+		item = productRecordCommand.BatchAddProductCapacitiesCmd{
+			RecordDate:   v["RecordDate"],
+			WorkshopName: v["WorkshopName"],
+			LineName:     v["LineName"],
+			SectionName:  v["SectionName"],
+			WorkerName:   v["WorkerName"],
+			BatchNumber:  v["BatchNumber"],
+			WorkOn:       v["WorkOn"],
+			Weigh:        v["Weigh"],
+			FailReason:   "",
+		}
+		items = append(items, item)
+	}
+
+	svr := productRecordService.NewProductRecordService(nil)
+	failRows, err := svr.BatchAddProductCapacities(importDataCommand.Operator, items)
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	return srv.importResultWithHeader(excelImport.DataFields, failRows, len(items)), nil
+}

@@ -9,7 +9,7 @@ import (
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils/converter"
 	"gitlab.fjmaimaimai.com/allied-creation/allied-creation-manufacture/pkg/infrastructure/utils/converter"
 )
 )
 
 
-// ImportProductRecord 导入生产记录
+// ImportProductRecord 导入二级品生产记录
 func (srv ExcelDataService) ImportProductRecord(importDataCommand *command.ImportDataCommand) (interface{}, error) {
 func (srv ExcelDataService) ImportProductRecord(importDataCommand *command.ImportDataCommand) (interface{}, error) {
 	excelImport := excel.NewExcelImport()
 	excelImport := excel.NewExcelImport()
 	excelImport.RowBegin = 3 //第二行开始读取
 	excelImport.RowBegin = 3 //第二行开始读取

+package command
+
+import "errors"
+
+type BatchAddProductCapacitiesCmd struct {
+	WorkshopName string `json:"workshopName"` //车间
+	LineName     string `json:"lineName"`     //生产线
+	SectionName  string `json:"sectionName"`  //工段
+	WorkerName   string `json:"workerName"`   //员工
+	Weigh        string `json:"weigh"`        //产量重量
+	BatchNumber  string `json:"batchNumber"`  //计划 批次号
+	RecordDate   string `json:"recordDate"`   //日期 2006-01-02
+	WorkOn       string `json:"workOn"`       //上班班次 1:全天 2：白班 4：中班 8：夜班
+	FailReason   string `json:"failReason"`
+}
+
+func (data *BatchAddProductCapacitiesCmd) ValidField() error {
+	if len(data.RecordDate) == 0 {
+		return errors.New("日期未填写")
+	}
+	if len(data.WorkshopName) == 0 {
+		return errors.New("车间未填写")
+	}
+	if len(data.LineName) == 0 {
+		return errors.New("生产线未填写")
+	}
+	if len(data.SectionName) == 0 {
+		return errors.New("工段未填写")
+	}
+	if len(data.WorkerName) == 0 {
+		return errors.New("姓名未填写")
+	}
+	if len(data.BatchNumber) == 0 {
+		return errors.New("批次未填写")
+	}
+	if len(data.Weigh) == 0 {
+		return errors.New("重量未填写")
+	}
+	if len(data.WorkOn) == 0 {
+		return errors.New("上班班次未填写")
+	}
+	return nil
+}

@@ -2,7 +2,7 @@ package command
 
 
 import "errors"
 import "errors"
 
 
-//批量添加生产记录
+// 批量添加生产记录，二级品
 type BatchAddProductRecordCommand struct {
 type BatchAddProductRecordCommand struct {
 	CreatedDate      string `json:"createdDate"`      // 日期
 	CreatedDate      string `json:"createdDate"`      // 日期
 	WorkshopName     string `json:"workshopName"`     // 车间
 	WorkshopName     string `json:"workshopName"`     // 车间

 package command
 package command
 
 
-type SaveProductRecordCmd struct {
+type SaveProductCapacitiesCmd struct {
 	//id
 	//id
 	ProductRecordId int `json:"productRecordId"`
 	ProductRecordId int `json:"productRecordId"`
 	// 车间ID
 	// 车间ID
@@ -15,8 +15,6 @@ type SaveProductRecordCmd struct {
 	Weigh float64 `cname:"重量" json:"weigh" valid:"Required" `
 	Weigh float64 `cname:"重量" json:"weigh" valid:"Required" `
 	//计划id
 	//计划id
 	ProductPlanId int `json:"productPlanId"`
 	ProductPlanId int `json:"productPlanId"`
-	// 参与类型 1：正常 2：支援
-	ParticipateType int `json:"participateType"`
 	//日期
 	//日期
 	RecordDate string `json:"recordDate"`
 	RecordDate string `json:"recordDate"`
 	//上班班次 1:全天 2：白班 4：中班 8：夜班
 	//上班班次 1:全天 2：白班 4：中班 8：夜班

 package service
 package service
 
 
 import (
 import (
+	"strconv"
+	"strings"
 	"time"
 	"time"
 
 
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
@@ -15,7 +17,7 @@ import (
 //产能管理
 //产能管理
 
 
 // 产能管理  页面上手动创建员工生产记录
 // 产能管理  页面上手动创建员工生产记录
-func (productRecordService *ProductRecordService) SaveProductCapacities(operateInfo *domain.OperateInfo, param *command.SaveProductRecordCmd) (map[string]interface{}, error) {
+func (productRecordService *ProductRecordService) SaveProductCapacities(operateInfo *domain.OperateInfo, param *command.SaveProductCapacitiesCmd) (map[string]interface{}, error) {
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	transactionContext, err := factory.CreateTransactionContext(nil)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -334,3 +336,207 @@ func (productRecordService *ProductRecordService) ApproveProductCapacities(opera
 		"productRecordId": recordData.ProductRecordId,
 		"productRecordId": recordData.ProductRecordId,
 	}, nil
 	}, nil
 }
 }
+
+// 从excel导入 批量添加
+func (srv *ProductRecordService) BatchAddProductCapacities(operate *domain.OperateInfo, dataList []command.BatchAddProductCapacitiesCmd) (
+	failRows []interface{}, 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()
+	}()
+
+	//获取当前操作人
+	userSrv := domainService.NewUserService()
+	operateUser, err := userSrv.User(operate.UserId)
+	if err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, "查询操作人数据失败。"+err.Error())
+	}
+	//获取当前操作人的组织
+	var org *domain.Org
+	org, err = userSrv.Organization(operate.OrgId)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+
+	//生产班组 数据
+	productGroupRepo, _ := factory.CreateProductGroupRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+
+	//生产计划数据
+	productPlanRepo, _ := factory.CreateProductPlanRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+
+	_, productGroupList, err := productGroupRepo.Find(map[string]interface{}{
+		"companyId": operate.CompanyId,
+		"orgId":     operate.OrgId,
+	})
+	if err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	//车间名称+/+线别名称+/+工段名称  作为键名
+	workStationMap := map[string]*domain.WorkStation{}
+	//车间名称+/+工人名  作为键名
+	workerMap := map[string][]*domain.User{}
+	//班组名称   作为键名
+	productGroupMap := map[string]*domain.ProductGroup{}
+	for _, v := range productGroupList {
+		workStationName := strings.Join([]string{
+			v.WorkStation.WorkshopName, v.WorkStation.LineName, v.WorkStation.SectionName,
+		}, "/")
+		workStationMap[workStationName] = v.WorkStation
+		productGroupMap[v.GroupName] = v
+		for _, vv := range v.GroupMembers {
+			k := v.WorkStation.WorkshopName + "/" + vv.UserName
+			isIn := false
+			for _, vvv := range workerMap[k] {
+				if vvv.UserId == vv.UserId {
+					isIn = true
+					break
+				}
+			}
+			if !isIn {
+				workerMap[k] = append(workerMap[k], vv)
+			}
+		}
+	}
+
+	productRecordList := []*domain.ProductRecord{}
+
+	nowTime := time.Now()
+	for i := range dataList {
+		//检查字段
+		err = dataList[i].ValidField()
+		if err != nil {
+			dataList[i].FailReason = err.Error()
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+		//检查日期格式
+		productDate, err := time.ParseInLocation("2006-01-02", dataList[i].RecordDate, time.Local)
+		if err != nil {
+			dataList[i].FailReason = "日期格式错误，例 2006-01-02。"
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+		//检查工位
+		var workStation *domain.WorkStation
+		workStationName := dataList[i].WorkerName + "/" + dataList[i].LineName + "/" + dataList[i].SectionName
+		if v, ok := workStationMap[workStationName]; ok {
+			workStation = v
+		} else {
+			dataList[i].FailReason = "车间、线别、工段不存在"
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+
+		//检查员工姓名
+		var worker *domain.User
+		workKey := dataList[i].WorkshopName + "/" + dataList[i].WorkerName
+		if u, ok := workerMap[workKey]; ok {
+			if len(u) > 1 {
+				dataList[i].FailReason = "当前车间存在重复的用户名"
+				failRows = append(failRows, dataList[i])
+				continue
+			}
+			worker = u[0]
+		} else {
+			dataList[i].FailReason = "当前车间不存在用户" + dataList[i].WorkerName
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+		//二级品重量
+		weigh, err := strconv.ParseFloat(dataList[i].Weigh, 64)
+		if err != nil {
+			dataList[i].FailReason = "重量填写错误"
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+		//按批次获取生产计划
+		productPlanData, err := productPlanRepo.FindOne(map[string]interface{}{
+			"batchNumber": dataList[i].BatchNumber,
+			"companyId":   operate.CompanyId,
+		})
+		if err != nil {
+			dataList[i].FailReason = "批次号不存在"
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+		//检查上班班次 1:全天 2：白班 4：中班 8：夜班
+		workerOn := 0
+		switch dataList[i].WorkOn {
+		case "全天":
+			workerOn = 1
+		case "白班":
+			workerOn = 2
+		case "中班":
+			workerOn = 4
+		case "夜班":
+			workerOn = 8
+		default:
+			dataList[i].FailReason = "上班班次 填写错误"
+			failRows = append(failRows, dataList[i])
+			continue
+		}
+
+		tempItem := &domain.ProductRecord{
+			ProductRecordId:   0,
+			CompanyId:         operate.CompanyId,
+			OrgId:             operate.OrgId,
+			ProductRecordType: domain.RecordTypeReceiveMaterial,
+			ProductWorker:     worker,
+			WorkStation:       workStation,
+			CreatedAt:         productDate,
+			UpdatedAt:         nowTime,
+			DeletedAt:         time.Time{},
+			ProductRecordInfo: &domain.ProductRecordInfo{
+				ProductDate:      productDate.Local().Format("2006-01-02"),
+				Original:         weigh,
+				Weigh:            weigh,
+				WeighBefore:      weigh,
+				WeighAfter:       weigh,
+				ApproveStatus:    domain.ProductRecordAutoApproved,
+				ApproveAt:        nowTime.Unix(),
+				ApproveUser:      operateUser,
+				UnitConversionId: productPlanData.Ext.ProductPlanExt.ProductId,
+				ProductPlanId:    productPlanData.ProductPlanId,
+				PlanProductName:  productPlanData.PlanProductName,
+				BatchNumber:      productPlanData.BatchNumber,
+				ProductGroupId:   0,
+				WorkOn:           workerOn,
+			},
+			Ext: &domain.Ext{
+				Operator: operateUser,
+				OrgName:  org.OrgName,
+			},
+			PreRecord: &domain.ProductRecord{},
+		}
+		productRecordList = append(productRecordList, tempItem)
+	}
+	if len(failRows) > 0 {
+		return failRows, nil
+	}
+	productRecordRepo, _ := factory.CreateProductRecordRepository(map[string]interface{}{
+		"transactionContext": transactionContext,
+	})
+	for i := range productRecordList {
+		_, err := productRecordRepo.Save(productRecordList[i])
+		if err != nil {
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+		}
+	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	if err := transactionContext.CommitTransaction(); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	}
+	return failRows, nil
+}

@@ -64,6 +64,8 @@ func (controller *ExcelDataController) FileImport() {
 		data, err = excelService.ImportProductRecord(cmd)
 		data, err = excelService.ImportProductRecord(cmd)
 	case "ImportAttendance":
 	case "ImportAttendance":
 		data, err = excelService.ImportDataAttendance(cmd)
 		data, err = excelService.ImportDataAttendance(cmd)
+	case "ImportProductCapacities":
+		data, err = excelService.ImportDataAttendance(cmd)
 	default:
 	default:
 		err = application.ThrowError(application.BUSINESS_ERROR, fmt.Sprintf("导入不存在 Code:%v", cmd.Code))
 		err = application.ThrowError(application.BUSINESS_ERROR, fmt.Sprintf("导入不存在 Code:%v", cmd.Code))
 	}
 	}

@@ -132,7 +132,7 @@ func (controller *ProductRecordController) SearchWorkshopProductRecord() {
 // 产能管理  添加产能
 // 产能管理  添加产能
 func (controller *ProductRecordController) CreateProductCapacities() {
 func (controller *ProductRecordController) CreateProductCapacities() {
 	productRecordService := service.NewProductRecordService(nil)
 	productRecordService := service.NewProductRecordService(nil)
-	saveCommand := &command.SaveProductRecordCmd{}
+	saveCommand := &command.SaveProductCapacitiesCmd{}
 	controller.Unmarshal(saveCommand)
 	controller.Unmarshal(saveCommand)
 	operateInfo := ParseOperateInfo(controller.BaseController)
 	operateInfo := ParseOperateInfo(controller.BaseController)
 	data, err := productRecordService.SaveProductCapacities(operateInfo, saveCommand)
 	data, err := productRecordService.SaveProductCapacities(operateInfo, saveCommand)
@@ -142,7 +142,7 @@ func (controller *ProductRecordController) CreateProductCapacities() {
 // 产能管理  编辑产能
 // 产能管理  编辑产能
 func (controller *ProductRecordController) UpdateProductCapacities() {
 func (controller *ProductRecordController) UpdateProductCapacities() {
 	productRecordService := service.NewProductRecordService(nil)
 	productRecordService := service.NewProductRecordService(nil)
-	saveCommand := &command.SaveProductRecordCmd{}
+	saveCommand := &command.SaveProductCapacitiesCmd{}
 	controller.Unmarshal(saveCommand)
 	controller.Unmarshal(saveCommand)
 	productRecordId, _ := controller.GetInt(":productRecordId")
 	productRecordId, _ := controller.GetInt(":productRecordId")
 	saveCommand.ProductRecordId = productRecordId
 	saveCommand.ProductRecordId = productRecordId