Merge pull request 'fix_taitao' (#193) from fix_taitao into develop

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

dao/jit/PackOrderItemLst.dao.go

@@ -298,6 +298,25 @@ type PackOrderItemLstDAO interface {
 	 *
 	 ******************************************************************************/
 	SelectShipOrderBySerialOrderId(serialOrderId string) ([]interface{}, error)
+	/******************************************************************************
+	 *
+	 * @Function Name            : SelectListByOrders
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 通过工单条码查询发运数据
+	*
+	 * @Function Parameters      : serialOrderId
+	 *
+	 * @Return Value             : 发运单ID
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : zhangxin
+	 *
+	 * @Date                     : 2022-03-09
+	 *
+	 ******************************************************************************/
+	SelectListByOrders(serialOrderIds []string) ([]model.PackOrderItemLst, error)
 }
 
 /******************************************************************************

dao/jit/implments/PackOrderItemLst.dao.impl.go

@@ -406,4 +406,18 @@ func (impl *PackOrderItemLstDAOImplement) SelectShipOrderBySerialOrderId(serialO
 	var shipOrderIdLi []interface{}
 	err := session.Where(where, parameters...).Cols(meta.ShipOrderDataLst_ShipOrderId.SortColumnName).Find(&shipOrderIdLi)
 	return shipOrderIdLi, err
+}
+
+/******************************************************************************
+ *
+ * @Reference LAPP_ACURA_MOM_BACKEND/dao/log/PackOrderItemlstDAO.SelectListByOrders
+ *
+ ******************************************************************************/
+func (impl *PackOrderItemLstDAOImplement) SelectListByOrders(serialOrderIds []string) ([]model.PackOrderItemLst, error) {
+	data := make([]model.PackOrderItemLst, 0)
+	err := impl.session.Table(impl.meta.TableName).Where("PlantNr = ? and Status = ?", impl.plantNr, baseModel.PACK_STATUS_CLOSED).In("SerialOrderId", serialOrderIds).Asc("Pos").Find(&data)
+	if err != nil {
+		return nil, grmi.NewDataBaseError(err)
+	}
+	return data, nil
 }

services/pln/implments/CustOrder.service.impl.go

@@ -5,7 +5,6 @@ package implments
 import (
 	baseDal "LAPP_ACURA_MOM_BACKEND/dao/base"
 	jitDal "LAPP_ACURA_MOM_BACKEND/dao/jit"
-	logDal "LAPP_ACURA_MOM_BACKEND/dao/log"
 	meDal "LAPP_ACURA_MOM_BACKEND/dao/me"
 	omDal "LAPP_ACURA_MOM_BACKEND/dao/om"
 	dal "LAPP_ACURA_MOM_BACKEND/dao/pln"
@@ -2877,7 +2876,7 @@ func (impl *CustOrderServiceImplement) CountTarget(user *global.User) (model.Tar
 	result := model.TargetItem{}
 	custOrderDao := dal.NewCustOrderDAO(session, user.PlantNr, user.UserId)
 	serialOrderDao := omDal.NewSerialOrderDAO(session, user.PlantNr, user.UserId)
-	packDao := logDal.NewPackOrderItemlstDAO(session, user.PlantNr, user.UserId)
+	packDao := jitDal.NewPackOrderItemLstDAO(session, user.PlantNr, user.UserId)
 	today := now.Format(grmi.DateOutFormat)
 	start := today + " " + "00:00:00"
 	end := today + " " + "23:59:59"