Merge pull request 'base模块 ArtCheckRule ArtQtyAllocate OpcInfo 增删操作 加入产线和物料校验' (#29) from feature_wms into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_LF_MOM_BACKEND/pulls/29

services/base/implments/ArtCheckRule.service.impl.go

@@ -109,6 +109,24 @@ func (impl *ArtCheckRuleServiceImplement) InsertOne(user *models.Usertab, entity
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
+
+	daoAttribute := dal.NewAttributeDAO(session, user.Pid, user.Userid)
+	recordAttribute, err := daoAttribute.SelectOne(entity.AttriCode)
+	if err != nil {
+		return err
+	}
+	if recordAttribute == nil {
+		return grmi.NewBusinessError("不存在指定物料!")
+	}
 	return nil
 }
 
@@ -183,6 +201,24 @@ func (impl *ArtCheckRuleServiceImplement) UpdateOne(user *models.Usertab, entity
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
+
+	daoAttribute := dal.NewAttributeDAO(session, user.Pid, user.Userid)
+	recordAttribute, err := daoAttribute.SelectOne(entity.AttriCode)
+	if err != nil {
+		return err
+	}
+	if recordAttribute == nil {
+		return grmi.NewBusinessError("不存在指定物料!")
+	}
 	return nil
 }
 

services/base/implments/ArtQtyAllocate.service.impl.go

@@ -113,6 +113,24 @@ func (impl *ArtQtyAllocateServiceImplement) InsertOne(user *models.Usertab, enti
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
+
+	daoAttribute := dal.NewAttributeDAO(session, user.Pid, user.Userid)
+	recordAttribute, err := daoAttribute.SelectOne(entity.AttriCode)
+	if err != nil {
+		return err
+	}
+	if recordAttribute == nil {
+		return grmi.NewBusinessError("不存在指定物料!")
+	}
 	return nil
 }
 
@@ -187,6 +205,24 @@ func (impl *ArtQtyAllocateServiceImplement) UpdateOne(user *models.Usertab, enti
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
+
+	daoAttribute := dal.NewAttributeDAO(session, user.Pid, user.Userid)
+	recordAttribute, err := daoAttribute.SelectOne(entity.AttriCode)
+	if err != nil {
+		return err
+	}
+	if recordAttribute == nil {
+		return grmi.NewBusinessError("不存在指定物料!")
+	}
 	return nil
 }
 

services/base/implments/OpcInfo.service.impl.go

@@ -111,6 +111,16 @@ func (impl *OpcInfoServiceImplement) InsertOne(user *models.Usertab, entity *mod
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
+
 	return nil
 }
 
@@ -185,6 +195,15 @@ func (impl *OpcInfoServiceImplement) UpdateOne(user *models.Usertab, entity *mod
 	if err != nil {
 		return err
 	}
+
+	daoWorkLine := dal.NewWorkLineDAO(session, user.Pid, user.Userid)
+	recordWorkLine, err := daoWorkLine.SelectOne(entity.WorkLineId)
+	if err != nil {
+		return err
+	}
+	if recordWorkLine == nil {
+		return grmi.NewBusinessError("不存在指定产线!")
+	}
 	return nil
 }
 

web/controllers/base/base.go

@@ -1138,11 +1138,11 @@ func RegisterRoutes() {
 		// ArtCheckRule的服务实例
 		var serviceOfArtCheckRule = svr.NewArtCheckRuleService()
 		// ArtCheckRule插入一条
-		// RegisterInsertOneArtCheckRule(artcheckrule, "/insertone", serviceOfArtCheckRule.InsertOne)
+		RegisterInsertOneArtCheckRule(artcheckrule, "/insertone", serviceOfArtCheckRule.InsertOne)
 		// ArtCheckRule插入多条
 		// RegisterInsertArtCheckRule(artcheckrule, "/insert", serviceOfArtCheckRule.Insert)
 		// ArtCheckRule删除一条
-		// RegisterDeleteOneArtCheckRule(artcheckrule, "/deleteone", serviceOfArtCheckRule.DeleteOne)
+		RegisterDeleteOneArtCheckRule(artcheckrule, "/deleteone", serviceOfArtCheckRule.DeleteOne)
 		// ArtCheckRule删除多条
 		// RegisterDeleteArtCheckRule(artcheckrule, "/delete", serviceOfArtCheckRule.Delete)
 		// ArtCheckRule查询多条
@@ -1150,7 +1150,7 @@ func RegisterRoutes() {
 		// ArtCheckRule查询一条
 		RegisterSelectOneArtCheckRule(artcheckrule, "/get", serviceOfArtCheckRule.SelectOne)
 		// ArtCheckRule修改一条
-		// RegisterUpdateOneArtCheckRule(artcheckrule, "/updateone", serviceOfArtCheckRule.UpdateOne)
+		RegisterUpdateOneArtCheckRule(artcheckrule, "/updateone", serviceOfArtCheckRule.UpdateOne)
 		// ArtCheckRule修改多条
 		// RegisterUpdateArtCheckRule(artcheckrule, "/update", serviceOfArtCheckRule.Update)
 
@@ -1159,11 +1159,11 @@ func RegisterRoutes() {
 		// ArtQtyAllocate的服务实例
 		var serviceOfArtQtyAllocate = svr.NewArtQtyAllocateService()
 		// ArtQtyAllocate插入一条
-		// RegisterInsertOneArtQtyAllocate(artqtyallocate, "/insertone", serviceOfArtQtyAllocate.InsertOne)
+		RegisterInsertOneArtQtyAllocate(artqtyallocate, "/insertone", serviceOfArtQtyAllocate.InsertOne)
 		// ArtQtyAllocate插入多条
 		// RegisterInsertArtQtyAllocate(artqtyallocate, "/insert", serviceOfArtQtyAllocate.Insert)
 		// ArtQtyAllocate删除一条
-		// RegisterDeleteOneArtQtyAllocate(artqtyallocate, "/deleteone", serviceOfArtQtyAllocate.DeleteOne)
+		RegisterDeleteOneArtQtyAllocate(artqtyallocate, "/deleteone", serviceOfArtQtyAllocate.DeleteOne)
 		// ArtQtyAllocate删除多条
 		// RegisterDeleteArtQtyAllocate(artqtyallocate, "/delete", serviceOfArtQtyAllocate.Delete)
 		// ArtQtyAllocate查询多条
@@ -1171,7 +1171,7 @@ func RegisterRoutes() {
 		// ArtQtyAllocate查询一条
 		RegisterSelectOneArtQtyAllocate(artqtyallocate, "/get", serviceOfArtQtyAllocate.SelectOne)
 		// ArtQtyAllocate修改一条
-		// RegisterUpdateOneArtQtyAllocate(artqtyallocate, "/updateone", serviceOfArtQtyAllocate.UpdateOne)
+		RegisterUpdateOneArtQtyAllocate(artqtyallocate, "/updateone", serviceOfArtQtyAllocate.UpdateOne)
 		// ArtQtyAllocate修改多条
 		// RegisterUpdateArtQtyAllocate(artqtyallocate, "/update", serviceOfArtQtyAllocate.Update)
 
@@ -1201,11 +1201,11 @@ func RegisterRoutes() {
 		// OpcInfo的服务实例
 		var serviceOfOpcInfo = svr.NewOpcInfoService()
 		// OpcInfo插入一条
-		// RegisterInsertOneOpcInfo(opcinfo, "/insertone", serviceOfOpcInfo.InsertOne)
+		RegisterInsertOneOpcInfo(opcinfo, "/insertone", serviceOfOpcInfo.InsertOne)
 		// OpcInfo插入多条
 		// RegisterInsertOpcInfo(opcinfo, "/insert", serviceOfOpcInfo.Insert)
 		// OpcInfo删除一条
-		// RegisterDeleteOneOpcInfo(opcinfo, "/deleteone", serviceOfOpcInfo.DeleteOne)
+		RegisterDeleteOneOpcInfo(opcinfo, "/deleteone", serviceOfOpcInfo.DeleteOne)
 		// OpcInfo删除多条
 		// RegisterDeleteOpcInfo(opcinfo, "/delete", serviceOfOpcInfo.Delete)
 		// OpcInfo查询多条
@@ -1213,7 +1213,7 @@ func RegisterRoutes() {
 		// OpcInfo查询一条
 		RegisterSelectOneOpcInfo(opcinfo, "/get", serviceOfOpcInfo.SelectOne)
 		// OpcInfo修改一条
-		// RegisterUpdateOneOpcInfo(opcinfo, "/updateone", serviceOfOpcInfo.UpdateOne)
+		RegisterUpdateOneOpcInfo(opcinfo, "/updateone", serviceOfOpcInfo.UpdateOne)
 		// OpcInfo修改多条
 		// RegisterUpdateOpcInfo(opcinfo, "/update", serviceOfOpcInfo.Update)