Merge pull request '多工厂问题' (#183) from fix_morePlantnr into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/183

dao/qm/implments/ReclinerReclst.dao.impl.go

@@ -309,7 +309,7 @@ func (impl *ReclinerReclstDAOImplement) UpdateWhere(predicates []grmi.Predicate,
  ******************************************************************************/
 func (impl *ReclinerReclstDAOImplement) SelectUnPrint(num int) ([]model.ReclinerReclst, error) {
 
-	session := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and Status = ?", impl.plantNr, common.UN_PRINT).Asc("RecNr")
+	session := impl.session.Table(impl.meta.TableName).Where("Status = ?", common.UN_PRINT).Asc("RecNr")
 
 	data := make([]model.ReclinerReclst, 0)
 	err := session.Limit(num).Find(&data)
@@ -327,7 +327,7 @@ func (impl *ReclinerReclstDAOImplement) SelectUnPrint(num int) ([]model.Recliner
 func (impl *ReclinerReclstDAOImplement) UpdateUnPrint(recIds []int) error {
 	entity := new(model.ReclinerReclst)
 	entity.Status = common.PRINT
-	session := impl.session.Table(impl.meta.TableName).Select("Status").In("RecNr", recIds).Where("PlantNr = ? and  Status = ?", impl.plantNr, common.UN_PRINT)
+	session := impl.session.Table(impl.meta.TableName).Select("Status").In("RecNr", recIds).Where("Status = ?", common.UN_PRINT)
 	_, err := session.Update(entity)
 	if err != nil {
 		return grmi.NewDataBaseError(err)

services/qm/implments/ReclinerReclst.service.impl.go

@@ -692,7 +692,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	seriDao := omDal.NewSerialOrderDAO(session, 100, "sys")
+	seriDao := omDal.NewSerialOrderDAO(session, entity.PlantNr, "sys")
 	seriInfo, err := seriDao.SelectBySerialOrder(entity.SerialOrderId)
 	if err != nil {
 		return err
@@ -701,7 +701,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 		return grmi.NewBusinessError("不存在指定记录!")
 	}
 	//查询物料主数据表
-	artDao := baseDal.NewArticleDAO(session, bmodel.PlantNr, "Rec")
+	artDao := baseDal.NewArticleDAO(session, entity.PlantNr, "Rec")
 	artInfo, err := artDao.SelectOne(entity.ArtId, seriInfo.ProjectId)
 	if err != nil {
 		return err
@@ -711,7 +711,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 	}
 
 	//查询物料主数据表
-	proDao := meDal.NewProductDAO(session, bmodel.PlantNr, "Rec")
+	proDao := meDal.NewProductDAO(session, entity.PlantNr, "Rec")
 	proInfo, err := proDao.SelectOne(entity.ArtId, seriInfo.ProjectId)
 	if err != nil {
 		return err
@@ -719,12 +719,12 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 	if proInfo == nil {
 		return grmi.NewBusinessError("物料总成没有维护!")
 	}
-	dao := baseDal.NewLabelTemplateHeadDAO(session, bmodel.PlantNr, "Rec")
+	dao := baseDal.NewLabelTemplateHeadDAO(session, entity.PlantNr, "Rec")
 	result, err := dao.SelectOne(proInfo.PrintTemplateId)
 	if err != nil {
 		return err
 	}
-	lstdao := baseDal.NewLabelTemplateDetailDAO(session, bmodel.PlantNr, "Rec")
+	lstdao := baseDal.NewLabelTemplateDetailDAO(session, entity.PlantNr, "Rec")
 	list, err := lstdao.Select([]grmi.Predicate{
 		bmeta.LabelTemplateDetail_LabelTemplateId.NewPredicate(grmi.Equal, proInfo.PrintTemplateId),
 	}, nil)
@@ -734,7 +734,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 	result.LabelTemplateDetail = list
 
 	//查询序列订单表
-	orderDao := omDal.NewSerialOrderDAO(session, bmodel.PlantNr, "Rec")
+	orderDao := omDal.NewSerialOrderDAO(session, entity.PlantNr, "Rec")
 	orderInfo, err := orderDao.SelectBySerialOrder(entity.SerialOrderId)
 	if err != nil {
 		return err
@@ -743,7 +743,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 		return grmi.NewBusinessError("序列订单订单不存在!")
 	}
 
-	snrDao := baseDal.NewSnrDAO(session, bmodel.PlantNr, "Rec")
+	snrDao := baseDal.NewSnrDAO(session, entity.PlantNr, "Rec")
 	headId, err := snrDao.GetNextSnr("PrintId")
 	if err != nil {
 		return grmi.NewBusinessError("打印头部生成错误!")
@@ -753,7 +753,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 	if err := session.Begin(); err != nil {
 		return err
 	}
-	headDao := baseDal.NewLabelHeadDAO(session, bmodel.PlantNr, "Rec")
+	headDao := baseDal.NewLabelHeadDAO(session, entity.PlantNr, "Rec")
 	head := new(bmodel.LabelHead)
 	head.PlantNr = result.PlantNr
 	head.LabelId = headId
@@ -769,7 +769,7 @@ func (impl *ReclinerReclstServiceImplement) CreateRecPrintInfo(entity model.Recl
 		return err
 	}
 
-	detailDao := baseDal.NewLabelDetailDAO(session, bmodel.PlantNr, "Rec")
+	detailDao := baseDal.NewLabelDetailDAO(session, entity.PlantNr, "Rec")
 	for k, v := range list {
 		detail := new(bmodel.LabelDetail)
 		head.PlantNr = result.PlantNr
@@ -819,7 +819,7 @@ func (impl *ReclinerReclstServiceImplement) SelectUnPrint(num int) ([]model.Recl
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewReclinerReclstDAO(session, bmodel.PlantNr, "Rec")
+	dao := dal.NewReclinerReclstDAO(session,0, "Rec")
 	if num < 1 {
 		num = 50
 	}
@@ -840,7 +840,7 @@ func (impl *ReclinerReclstServiceImplement) UpdateUnPrint(recIds []int) error {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewReclinerReclstDAO(session, bmodel.PlantNr, "Rec")
+	dao := dal.NewReclinerReclstDAO(session, 0, "Rec")
 	err := dao.UpdateUnPrint(recIds)
 	if err != nil {
 		return err

services/schedule/DayModel.Ctrl_test.go

@@ -52,16 +52,17 @@ func TestInit(t *testing.T) {
 	}
 	fmt.Println("数据库加载成功")
 
-	tmsrv := TimeModelSrv{PlantNr: model.PlantNr}
+	plantNr := 100
+	tmsrv := TimeModelSrv{PlantNr: plantNr}
 	// 初始化
 	tmsrv.DayModelDict = make(map[int]DayModelSrv)
 	// 加载日模型
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewDayModelDAO(session, model.PlantNr, "scheduler")
+	dao := dal.NewDayModelDAO(session, plantNr, "scheduler")
 	if dmtablst, err = dao.SelectAll(); err != nil {
-		err = errors.New(fmt.Sprintf("加载工厂%d的日模型失败%v!", model.PlantNr, err))
+		err = errors.New(fmt.Sprintf("加载工厂%d的日模型失败%v!", plantNr, err))
 		return
 	}
 	for i := 0; i < len(dmtablst); i++ {

services/schedule/SchedTask.Ctrl.go

@@ -82,7 +82,7 @@ func (tasksrv *TaskSrv) Get() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := plnDal.NewCustOrderDAO(session, common.PlantNr, "scheduler")
+	dao := plnDal.NewCustOrderDAO(session, tasksrv.PlantNr, "scheduler")
 	var custOrder *plnModel.CustOrder
 	if custOrder, err = dao.SelectOne(tasksrv.TaskId); err != nil {
 		return grmi.NewBusinessError("获取工厂客户订单失败, 客户订单ID:" + tasksrv.TaskId + ", error:" + err.Error())
@@ -157,7 +157,7 @@ func (tasksrv *TaskSrv) LoadSerialOrders(session *xorm.Session) (err error) {
 	)
 	// 初始化批次订单的序列订单信息
 	tasksrv.SerialTaskArray = []SerialTaskSrv{}
-	dao := dal.NewSerialOrderDAO(session, common.PlantNr, "scheduler")
+	dao := dal.NewSerialOrderDAO(session, tasksrv.PlantNr, "scheduler")
 	if sordertablst, err = dao.SelectByCustOrder(tasksrv.CustOrder.CustOrderId, common.WO_STATUS_LOCKED); err != nil {
 		return grmi.NewBusinessError(fmt.Sprintf("查询客户订单的序列订单失败！, error:" + err.Error() + " ,客户订单ID: " + tasksrv.CustOrder.CustOrderId))
 	}
@@ -192,7 +192,7 @@ func (tasksrv *TaskSrv) CreateStatusRecord(prevstatus int, eventsrv EventSrv) (e
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewWorkOrderStatusRecLstDAO(session, common.PlantNr, "scheduler")
+	dao := dal.NewWorkOrderStatusRecLstDAO(session, tasksrv.PlantNr, "scheduler")
 	if err := dao.InsertOne(&wostatusrectab); err != nil {
 		err = errors.New(fmt.Sprintf("无法为工单%s插入状态变更记录%v!", tasksrv.TaskId, err))
 		return err
@@ -210,7 +210,7 @@ func (tasksrv *TaskSrv) ReleaseSerialOrder(relQty int, releaseId string) (err er
 		return grmi.NewBusinessError("开启事务失败, error:" + err.Error())
 	}
 	var user = "scheduler"
-	workLineDao := baseDal.NewWorkLineDAO(session, common.PlantNr, user)
+	workLineDao := baseDal.NewWorkLineDAO(session, tasksrv.PlantNr, user)
 	innerLog, _ := logger.NewLogger("scheduler", "scheduler")
 	innerLog.Debug("开始派工， 派工任务ID:"+releaseId, ", 客户订单ID:"+tasksrv.CustOrder.CustOrderId+", 通过数量进行派工,派工数量:"+strconv.Itoa(relQty))
 	// 判断批次订单状态是否满足下达条件 >= 24 && < 80
@@ -261,7 +261,7 @@ func (stasksrv *SerialTaskSrv) Get() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewSerialOrderDAO(session, common.PlantNr, "scheduler")
+	dao := dal.NewSerialOrderDAO(session, stasksrv.PlantNr, "scheduler")
 	if serordtab, err = dao.SelectInfo(stasksrv.TaskId); err != nil {
 		err = errors.New(fmt.Sprintf("获取工厂%d序列订单%s失败！", stasksrv.PlantNr, stasksrv.TaskId))
 		return
@@ -297,7 +297,7 @@ func (stasksrv *SerialTaskSrv) Create() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewSerialOrderDAO(session, common.PlantNr, "rel_service")
+	dao := dal.NewSerialOrderDAO(session, stasksrv.PlantNr, "rel_service")
 	if err = dao.InsertOne(&stasksrv.SerialOrderTab); err != nil {
 		err = errors.New(fmt.Sprintf("工单%s的序列订单%s头创建失败%v！", stasksrv.ParentTaskId, stasksrv.TaskId, err))
 		return
@@ -311,7 +311,7 @@ func (stasksrv *SerialTaskSrv) Create() (err error) {
 	stasksrv.SerialOrderStatusTab.TriggerObjectId = stasksrv.ParentTaskId
 	stasksrv.SerialOrderStatusTab.TriggerEvent = common.BATORD_EVENT_LOCK
 	SetTableLastModify(&stasksrv.SerialOrderStatusTab, stasksrv.SerialOrderStatusTab, common.MODIFY_MODE_CREATE, "rel_service")
-	serial := dal.NewSerialOrderStatusDAO(session, common.PlantNr, "rel_service")
+	serial := dal.NewSerialOrderStatusDAO(session, stasksrv.PlantNr, "rel_service")
 	if err = serial.InsertOne(&stasksrv.SerialOrderStatusTab); err != nil {
 		err = errors.New(fmt.Sprintf("工单%s的序列订单%s状态头创建失败%v！", stasksrv.ParentTaskId, stasksrv.TaskId, err))
 		return
@@ -328,7 +328,7 @@ func (stasksrv *SerialTaskSrv) Create() (err error) {
 	serordstatrectab.OutputObjectId = serordstatrectab.SerialOrderId
 	serordstatrectab.OutputStatus = common.OUTPUT_TRIGGER_UNHANDLED
 	SetTableLastModify(&serordstatrectab, serordstatrectab, common.MODIFY_MODE_CREATE, "rel_service")
-	serord := dal.NewSerialOrderStatusRecLstDAO(session, common.PlantNr, "rel_service")
+	serord := dal.NewSerialOrderStatusRecLstDAO(session, stasksrv.PlantNr, "rel_service")
 	if err = serord.InsertOne(&serordstatrectab); err != nil {
 		err = errors.New(fmt.Sprintf("工单%s的序列订单%s状态记录行创建失败%v！", stasksrv.ParentTaskId, stasksrv.TaskId, err))
 		return
@@ -357,7 +357,7 @@ func (stasksrv *SerialTaskSrv) Release() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	serial := dal.NewSerialOrderStatusDAO(session, common.PlantNr, "rel_service")
+	serial := dal.NewSerialOrderStatusDAO(session, stasksrv.PlantNr, "rel_service")
 	if err = serial.UpdateOne(&stasksrv.SerialOrderStatusTab); err != nil {
 		err = errors.New(fmt.Sprintf("工单%s的序列订单%s状态头更新失败%v！", stasksrv.ParentTaskId, stasksrv.TaskId, err))
 		return
@@ -374,7 +374,7 @@ func (stasksrv *SerialTaskSrv) Release() (err error) {
 	serordstatrectab.OutputObjectId = serordstatrectab.SerialOrderId
 	serordstatrectab.OutputStatus = common.OUTPUT_TRIGGER_UNHANDLED
 	SetTableLastModify(&serordstatrectab, serordstatrectab, common.MODIFY_MODE_UPDATE, "rel_service")
-	serord := dal.NewSerialOrderStatusRecLstDAO(session, common.PlantNr, "rel_service")
+	serord := dal.NewSerialOrderStatusRecLstDAO(session, stasksrv.PlantNr, "rel_service")
 	if err = serord.UpdateOne(&serordstatrectab); err != nil {
 		err = errors.New(fmt.Sprintf("工单%s的序列订单%s状态记录行创建失败%v！", stasksrv.ParentTaskId, stasksrv.TaskId, err))
 		return

services/schedule/Scheduler.Ctrl.go

@@ -60,7 +60,7 @@ func (schedsrv *SchedulerSrv) LoadProjectData() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewProjectDAO(session, common.PlantNr, "scheduler")
+	dao := dal.NewProjectDAO(session, schedsrv.PlantNr, "scheduler")
 	if projectLi, err = dao.SelectActiveProjects(); err != nil {
 		err = errors.New(fmt.Sprintf("获取工厂%d的激活的项目失败, 错误:%v !", schedsrv.PlantNr, err))
 		return
@@ -84,7 +84,7 @@ func (schedsrv *SchedulerSrv) LoadWorkLineData(workLineId string) (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := wltab.NewWorkLineDAO(session, common.PlantNr, "scheduler")
+	dao := wltab.NewWorkLineDAO(session, schedsrv.PlantNr, "scheduler")
 	if wltablst, err = dao.SelectByType(workLineId); err != nil {
 		err = errors.New(fmt.Sprintf("加载类型%s的产线数据失败:%v!", workLineId, err))
 		return
@@ -107,7 +107,7 @@ func (schedsrv *SchedulerSrv) LoadTimeModelData(workLineId string) (err error) {
 	defer session.Close()
 	// 查询已经分配到产线上的客户订单
 	var custOrderLi []plnModel.CustOrder
-	dao := plnDal.NewCustOrderDAO(session, common.PlantNr, "scheduler")
+	dao := plnDal.NewCustOrderDAO(session, schedsrv.PlantNr, "scheduler")
 	if custOrderLi, err = dao.SelectWorkLineTaskBeyondStatus(schedsrv.StartDate, schedsrv.EndDate, workLineId, common.WO_STATUS_PLANNED); err != nil {
 		return grmi.NewBusinessError("加载已经分配到产线上的客户订单失败, error:" + err.Error())
 	}
@@ -160,7 +160,7 @@ func (schedsrv *SchedulerSrv) LoadSetupData() (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewSetupMatrixDAO(session, common.PlantNr, "scheduler")
+	dao := dal.NewSetupMatrixDAO(session, schedsrv.PlantNr, "scheduler")
 	if setuptablst, err = dao.SelectAll(); err != nil {
 		err = errors.New(fmt.Sprintf("加载工厂%d的换型主数据出错%v!", schedsrv.PlantNr, err))
 		return
@@ -205,7 +205,7 @@ func (schedsrv *SchedulerSrv) LoadSchedTaskData(workLineId string) (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := plnDal.NewCustOrderDAO(session, common.PlantNr, "scheduler")
+	dao := plnDal.NewCustOrderDAO(session, schedsrv.PlantNr, "scheduler")
 	if custOrderLi, err = dao.SelectWorkLineTaskBeyondStatus(schedsrv.StartDate, schedsrv.EndDate, workLineId, common.WO_STATUS_LOCKED); err != nil {
 		return grmi.NewBusinessError("加载已锁定及以上的客户订单失败, error:" + err.Error())
 	}
@@ -909,7 +909,7 @@ func (schedsrv *SchedulerSrv) GetWipQty(workLineId string) (wipqty int, err erro
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := wotab.NewSerialOrderDAO(session, common.PlantNr, "scheduler")
+	dao := wotab.NewSerialOrderDAO(session, schedsrv.PlantNr, "scheduler")
 	if wipqty, err = dao.GetLineWIPQty(workLineId); err != nil {
 		return 0, grmi.NewBusinessError("获取产线WIP数量失败, error:" + err.Error() + ", 产线ID:" + workLineId)
 	}
@@ -943,7 +943,7 @@ func (schedsrv *SchedulerSrv) CreateTaskSerialOrder(schedtask *TaskSrv) (err err
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := wltab.NewSnrDAO(session, common.PlantNr, "scheduler")
+	dao := wltab.NewSnrDAO(session, schedsrv.PlantNr, "scheduler")
 	createqty = int(schedtask.CustOrderQty.PlanQty - schedtask.CustOrderQty.ReleasedQty)
 	for i = 0; i < createqty; i++ {
 		if serordid, err = dao.GetNextSnr(projtab.SerialOrderSnr); err != nil {
@@ -988,7 +988,7 @@ func (schedsrv *SchedulerSrv) ParseWorkOrderEvent(event string) (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := wotab.NewWorkOrderStatusRecLstDAO(session, common.PlantNr, "scheduler")
+	dao := wotab.NewWorkOrderStatusRecLstDAO(session, schedsrv.PlantNr, "scheduler")
 	if wostatusrectablst, err = dao.SelectByEvent(event); err != nil {
 		err = errors.New(fmt.Sprintf("获取工单事件%s失败%v!", event, err))
 		return
@@ -1043,7 +1043,7 @@ func (schedsrv *SchedulerSrv) ParseSerialOrderEvent(event string) (err error) {
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := wotab.NewSerialOrderStatusRecLstDAO(session, common.PlantNr, "scheduler")
+	dao := wotab.NewSerialOrderStatusRecLstDAO(session, schedsrv.PlantNr, "scheduler")
 
 	if serostatusrectablst, err = dao.SelectByEvent(event); err != nil {
 		err = errors.New(fmt.Sprintf("获取序列工单事件%s失败%v!", event, err))
@@ -1207,7 +1207,7 @@ func (schedsrv *SchedulerSrv) LoadLockedTaskArray(workLineId string, releaseId s
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := plnDal.NewCustOrderDAO(session, common.PlantNr, "scheduler")
+	dao := plnDal.NewCustOrderDAO(session, schedsrv.PlantNr, "scheduler")
 	custOrderLi, err := dao.SelectWaitReleaseCustOrder(workLineId)
 	if err != nil {
 		innerLog.Error("加载待派工的客户订单队列失败, error: "+err.Error(), "任务ID:"+releaseId)

services/schedule/TimeModel.Ctrl.go

@@ -42,9 +42,9 @@ func (tmsrv *TimeModelSrv) LoadBasicData(startDate, endDate time.Time) (err erro
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	dao := dal.NewDayModelDAO(session, model.PlantNr, "scheduler")
+	dao := dal.NewDayModelDAO(session, tmsrv.PlantNr, "scheduler")
 	if dmtablst, err = dao.SelectAll(); err != nil {
-		err = errors.New(fmt.Sprintf("加载工厂%d的日模型失败%v!", model.PlantNr, err))
+		err = errors.New(fmt.Sprintf("加载工厂%d的日模型失败%v!", tmsrv.PlantNr, err))
 		return
 	}
 	for i = 0; i < len(dmtablst); i++ {
@@ -54,9 +54,9 @@ func (tmsrv *TimeModelSrv) LoadBasicData(startDate, endDate time.Time) (err erro
 	}
 
 	// 加载周模型
-	wkmtab := dal.NewWeekModelDAO(session, model.PlantNr, "scheduler")
+	wkmtab := dal.NewWeekModelDAO(session, tmsrv.PlantNr, "scheduler")
 	if wkmtablst, err = wkmtab.SelectAll(); err != nil {
-		err = errors.New(fmt.Sprintf("加载工厂%d的周模型失败%v!", model.PlantNr, err))
+		err = errors.New(fmt.Sprintf("加载工厂%d的周模型失败%v!", tmsrv.PlantNr, err))
 		return
 	}
 	for i = 0; i < len(wkmtablst); i++ {
@@ -66,9 +66,9 @@ func (tmsrv *TimeModelSrv) LoadBasicData(startDate, endDate time.Time) (err erro
 	}
 
 	// 加载工作日历
-	caltab := dal.NewWorkCalendarDAO(session, model.PlantNr, "scheduler")
+	caltab := dal.NewWorkCalendarDAO(session, tmsrv.PlantNr, "scheduler")
 	if caltablst, err = caltab.SelectAll(startDate, endDate); err != nil {
-		err = errors.New(fmt.Sprintf("加载工厂%d的工作日历失败%v!", model.PlantNr, err))
+		err = errors.New(fmt.Sprintf("加载工厂%d的工作日历失败%v!", tmsrv.PlantNr, err))
 		return
 	}
 	for i = 0; i < len(caltablst); i++ {
@@ -78,9 +78,9 @@ func (tmsrv *TimeModelSrv) LoadBasicData(startDate, endDate time.Time) (err erro
 	}
 
 	// 加载工作班次模型
-	wstab := dal.NewWorkShiftDAO(session, model.PlantNr, "scheduler")
+	wstab := dal.NewWorkShiftDAO(session, tmsrv.PlantNr, "scheduler")
 	if wstablst, err = wstab.SelectAll(); err != nil {
-		err = errors.New(fmt.Sprintf("加载工厂%d的人员班组失败%v!", model.PlantNr, err))
+		err = errors.New(fmt.Sprintf("加载工厂%d的人员班组失败%v!", tmsrv.PlantNr, err))
 		return
 	}
 	for i = 0; i < len(wstablst); i++ {

services/schedule/WorkLine.Ctrl.go

@@ -67,7 +67,7 @@ func (wlsrv *WorklineSrv) LoadWorkShiftData(startdate, enddate time.Time) (err e
 	engine := db.Eloquent.Master()
 	session := engine.NewSession()
 	defer session.Close()
-	wlwstab := dal.NewWorkLineWorkShiftLstDAO(session, common.PlantNr, "scheduler")
+	wlwstab := dal.NewWorkLineWorkShiftLstDAO(session, wlsrv.PlantNr, "scheduler")
 	if wlwstablst, err = wlwstab.GetWorkLineWorkShiftData(wlsrv.WorklineId, st, et); err != nil {
 		err = errors.New(fmt.Sprintf("无法获取产线%s的排班数据:%v!", wlsrv.WorklineId, err))
 		return

task/task.go

@@ -54,7 +54,7 @@ func CreateOrder() {
 	query = query.Join("INNER", "PM_TemplateServiceLst", "PM_Template.PlantNr = PM_TemplateServiceLst.PlantNr and PM_Template.MainTemplateNr = PM_TemplateServiceLst.MainTemplateNr")
 	query = query.Join("INNER", "PM_Service", "PM_Service.PlantNr = PM_TemplateServiceLst.PlantNr and PM_Service.MainServiceNr = PM_TemplateServiceLst.MainServiceNr")
 
-	query = query.Where("PM_Asset.PlantNr = ? and PM_Service.SchedType = ?", 100, "AUTO")
+	query = query.Where("PM_Service.SchedType = ?", "AUTO")
 	err := query.Find(&data)
 	if err != nil {
 		return

web/controllers/log/ArtDemandLst.rest.go

@@ -4,7 +4,6 @@ package log
 
 import (
 	"LAPP_ACURA_MOM_BACKEND/global"
-	common "LAPP_ACURA_MOM_BACKEND/models/base"
 	model "LAPP_ACURA_MOM_BACKEND/models/log"
 	"LAPP_ACURA_MOM_BACKEND/utils"
 	"LAPP_ACURA_MOM_BACKEND/web/middleware/jwts"
@@ -550,9 +549,6 @@ func RegisterSyncHronousData(party router.Party, httpMethod string, path string,
 	party.Handle(httpMethod, path, func(ctx iris.Context) {
 		plant := ctx.FormValue("plantNr")
 		plantNr := utils.ValueToInt(plant, 0)
-		if utils.ValueIsEmpty(plantNr) {
-			plantNr = common.PlantNr
-		}
 		var err error = nil
 		//获取通过iris.WithPostMaxMemory获取的最大上传值大小。
 		maxSize := ctx.Application().ConfigurationReadOnly().GetPostMaxMemory()

web/controllers/log/ArtDemandLstCache.rest.go

@@ -4,7 +4,6 @@ package log
 
 import (
 	"LAPP_ACURA_MOM_BACKEND/global"
-	common "LAPP_ACURA_MOM_BACKEND/models/base"
 	model "LAPP_ACURA_MOM_BACKEND/models/log"
 	"LAPP_ACURA_MOM_BACKEND/utils"
 	"LAPP_ACURA_MOM_BACKEND/web/middleware/jwts"
@@ -395,9 +394,6 @@ func RegisterSyncHronousDataCache(party router.Party, httpMethod string, path st
 	party.Handle(httpMethod, path, func(ctx iris.Context) {
 		plant := ctx.FormValue("plantNr")
 		plantNr := utils.ValueToInt(plant, 0)
-		if utils.ValueIsEmpty(plantNr) {
-			plantNr = common.PlantNr
-		}
 		var err error = nil
 		//获取通过iris.WithPostMaxMemory获取的最大上传值大小。
 		maxSize := ctx.Application().ConfigurationReadOnly().GetPostMaxMemory()