From 7979637f7696039b6cfd35a5b74d92a97b07f204 Mon Sep 17 00:00:00 2001
From: louwenzhi <Wenzhi.lou@le-it.com.cn>
Date: Fri, 8 Apr 2022 10:47:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/jit/PackOrderItemLst.dao.go               | 19 +++++++++++++++++++
 .../implments/PackOrderItemLst.dao.impl.go    | 14 ++++++++++++++
 .../pln/implments/CustOrder.service.impl.go   |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/dao/jit/PackOrderItemLst.dao.go b/dao/jit/PackOrderItemLst.dao.go
index 388d604..203a580 100644
--- a/dao/jit/PackOrderItemLst.dao.go
+++ b/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)
 }
 
 /******************************************************************************
diff --git a/dao/jit/implments/PackOrderItemLst.dao.impl.go b/dao/jit/implments/PackOrderItemLst.dao.impl.go
index 8afde77..414e011 100644
--- a/dao/jit/implments/PackOrderItemLst.dao.impl.go
+++ b/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
 }
\ No newline at end of file
diff --git a/services/pln/implments/CustOrder.service.impl.go b/services/pln/implments/CustOrder.service.impl.go
index 6bc0e74..67c6eb9 100644
--- a/services/pln/implments/CustOrder.service.impl.go
+++ b/services/pln/implments/CustOrder.service.impl.go
@@ -2877,7 +2877,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"

From 8a2eee87704063ecbf0866e9c76fb8d084e2a1e7 Mon Sep 17 00:00:00 2001
From: louwenzhi <Wenzhi.lou@le-it.com.cn>
Date: Fri, 8 Apr 2022 10:48:45 +0800
Subject: [PATCH 2/2] no message

---
 services/pln/implments/CustOrder.service.impl.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/pln/implments/CustOrder.service.impl.go b/services/pln/implments/CustOrder.service.impl.go
index 67c6eb9..91d7f95 100644
--- a/services/pln/implments/CustOrder.service.impl.go
+++ b/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"