Merge pull request '修改短包实际数量' (#307) from fix_pack into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/307
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>

dao/log/PackOrderItemlst.dao.go

@@ -99,7 +99,7 @@ type PackOrderItemlstDAO interface {
 	 * @Date                     : 2021-03-24 09:53:49
 	 *
 	 ******************************************************************************/
-	SelectOnePos(string) (*model.PackOrderItemlst, error)
+	SelectOnePos(string,string) (*model.PackOrderItemlst, error)
 	/******************************************************************************
 	 *
 	 * @Function Name            : SelectOneByOrder

dao/log/implments/PackOrderItemlst.dao.impl.go

@@ -104,9 +104,9 @@ func (impl *PackOrderItemlstDAOImplement) SelectOne(packOrderId string, pos int)
  * @Reference LAPP_GAAS_GFrame_BACKEND/dao/log/PackOrderItemlstDAO.SelectOnePos
  *
  ******************************************************************************/
-func (impl *PackOrderItemlstDAOImplement) SelectOnePos(packOrderId string) (*model.PackOrderItemlst, error) {
+func (impl *PackOrderItemlstDAOImplement) SelectOnePos(packOrderId string, artId string) (*model.PackOrderItemlst, error) {
 	var data model.PackOrderItemlst
-	ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and  PackOrderId = ? and  Status = ?",impl.plantNr,packOrderId,bmodel.PACK_STATUS_RELEASED).Asc("Pos").Get(&data)
+	ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and  PackOrderId = ? and  MaterialId = ? and  Status = ?", impl.plantNr, packOrderId, artId, bmodel.PACK_STATUS_RELEASED).Asc("Pos").Get(&data)
 	if err != nil {
 		return nil, grmi.NewDataBaseError(err)
 	}
@@ -123,7 +123,7 @@ func (impl *PackOrderItemlstDAOImplement) SelectOnePos(packOrderId string) (*mod
  ******************************************************************************/
 func (impl *PackOrderItemlstDAOImplement) SelectOneByOrder(serialOrderId string) (*model.PackOrderItemlst, error) {
 	var data model.PackOrderItemlst
-	ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and  SerialOrderId = ?",impl.plantNr,serialOrderId).Asc("Pos").Get(&data)
+	ok, err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and  SerialOrderId = ?", impl.plantNr, serialOrderId).Asc("Pos").Get(&data)
 	if err != nil {
 		return nil, grmi.NewDataBaseError(err)
 	}
@@ -337,4 +337,3 @@ func (impl *PackOrderItemlstDAOImplement) UpdateWhere(predicates []grmi.Predicat
 	}
 	return nil
 }
-

services/log/implments/PackOrder.service.impl.go

@@ -806,7 +806,7 @@ func (self *PackOrderServiceImplement) IsCreatePackOrder(user *models.Usertab, o
 		}
 		//查询该零件对应的包装项位置
 		dao := dal.NewPackOrderItemlstDAO(packsession, user.Pid, user.Userid)
-		infoPos, err := dao.SelectOnePos(packOrderId)
+		infoPos, err := dao.SelectOnePos(packOrderId,artId)
 		if err != nil {
 			return nil, err
 		}
@@ -1122,7 +1122,7 @@ func (self *PackOrderServiceImplement) CheckPackOrderItem(user *models.Usertab,
 	}
 	//查询待检测包装位置
 	dao := dal.NewPackOrderItemlstDAO(packsession, user.Pid, user.Userid)
-	infoPos, err := dao.SelectOnePos(packOrderId)
+	infoPos, err := dao.SelectOnePos(packOrderId,artId)
 	if err != nil {
 		return "", err
 	}
@@ -1247,7 +1247,7 @@ func (self *PackOrderServiceImplement) ClosePackOrderItem(user *models.Usertab,
 	//查询已经关闭的单数
 	items, err := dao.Select([]grmi.Predicate{
 		meta.PackOrderItemlst_PackOrderId.NewPredicate(grmi.Equal, packOrderId),
-		meta.PackOrderItemlst_Status.NewPredicate(grmi.Equal, bmodel.PACK_STATUS_CLOSED),
+		meta.PackOrderItemlst_Status.NewPredicate(grmi.Equal, bmodel.PACK_STATUS_RUNNING),
 	}, nil)
 	if err != nil {
 		return err