From 5fcf7136aac0d46a1e02bf2adda0479356ab069d Mon Sep 17 00:00:00 2001
From: zhangxin <Xin.zhang@le-it.com.cn>
Date: Tue, 7 Sep 2021 18:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=9C=AA=E6=B4=BE=E5=B7=A5work=20order=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/om/WorkOrder.dao.go                | 19 +++++++++++++++++++
 dao/om/implments/WorkOrder.dao.impl.go | 26 +++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/dao/om/WorkOrder.dao.go b/dao/om/WorkOrder.dao.go
index 4dfa645..8014df7 100644
--- a/dao/om/WorkOrder.dao.go
+++ b/dao/om/WorkOrder.dao.go
@@ -439,6 +439,25 @@ type WorkOrderDAO interface {
 	 *
 	 ******************************************************************************/
 	ClearOldData(string) error
+	/******************************************************************************
+	 *
+	 * @Function Name            : SelectUnReleaseWorkOrder
+	 *-----------------------------------------------------------------------------
+	 *
+	 * @Description              : 查询产线上所有未派工的工单
+	 *
+	 * @Function Parameters      : workLineId
+	*
+	 * @Return Value             : *[]model.VOmWorkorder
+	 *
+	 * @Return Value             : 执行时发生的错误
+	 *
+	 * @Author                   : zhangxin
+	 *
+	 * @Date                     : 2021-09-07
+	 *
+	 ******************************************************************************/
+	SelectUnReleaseWorkOrder(workLineId string) (*[]model.VOmWorkorder, error)
 }
 
 /******************************************************************************
diff --git a/dao/om/implments/WorkOrder.dao.impl.go b/dao/om/implments/WorkOrder.dao.impl.go
index 0f076a6..e8d5997 100644
--- a/dao/om/implments/WorkOrder.dao.impl.go
+++ b/dao/om/implments/WorkOrder.dao.impl.go
@@ -615,7 +615,7 @@ func (impl *WorkOrderDAOImplement) SelectLockWorkOrder(workLineId string) ([]mod
 		meta.WorkOrderStatus_Status.ColumnName,
 		meta.WorkOrderStatus_Status.ColumnName,
 		meta.WorkOrderStatus_Status.ColumnName)
-	err := session.Where(where, impl.plantNr, workLineId, common.WO_STATUS_LOCKED, common.WO_STATUS_RELEASED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_PlanStartTime.ColumnName).Find(&data)
+	err := session.Where(where, impl.plantNr, workLineId, common.WO_STATUS_LOCKED, common.WO_STATUS_RELEASED, common.WO_STATUS_RUNNING).Asc(meta.WorkOrder_Sort.ColumnName).Find(&data)
 	if err != nil {
 		return nil, err
 	}
@@ -709,4 +709,28 @@ func (impl *WorkOrderDAOImplement) ClearOldData(end string) (err error) {
 		return err
 	}
 	return nil
+}
+
+/******************************************************************************
+ *
+ * @Reference LAPP_LF_MOM_BACKEND/dao/om/WorkOrderDAO.SelectUnReleaseWorkOrder
+ *
+ ******************************************************************************/
+func (impl *WorkOrderDAOImplement) SelectUnReleaseWorkOrder(workLineId string) (*[]model.VOmWorkorder, error) {
+	data := make([]model.VOmWorkorder, 0)
+	session := impl.session.Table(impl.meta.TableName)
+	statusCondition := fmt.Sprintf("%s = %s and %s = %s",
+		meta.WorkOrder_PlantNr.ColumnName,
+		meta.WorkOrderStatus_PlantNr.ColumnName,
+		meta.WorkOrder_WorkOrderId.ColumnName,
+		meta.WorkOrderStatus_WorkOrderId.ColumnName)
+	qtyCondition := fmt.Sprintf("%s = %s and %s = %s",
+		meta.WorkOrder_PlantNr.ColumnName,
+		meta.WorkOrderQty_PlantNr.ColumnName,
+		meta.WorkOrder_WorkOrderId.ColumnName,
+		meta.WorkOrderQty_WorkOrderId.ColumnName)
+	session = session.Join("LEFT", meta.WorkOrderStatus.TableName, statusCondition)
+	session = session.Join("LEFT", meta.WorkOrderQty.TableName, qtyCondition)
+	err := session.Where(fmt.Sprintf("%s = ? and %s = ? and %s = ?", meta.WorkOrder_PlantNr.ColumnName, meta.WorkOrder_UsedResourceId.ColumnName, meta.WorkOrderStatus_Status.ColumnName), impl.plantNr, workLineId, common.WO_STATUS_LOCKED).Asc(meta.WorkOrder_Sort.ColumnName).Find(&data)
+	return &data, err
 }
\ No newline at end of file