查询工艺操作使用po过滤

dao/om/SerialOrderOPDetailRecvDataLst.dao.go

@@ -252,7 +252,7 @@ type SerialOrderOPDetailRecvDataLstDAO interface {
 	 * @Date                     : 2021-12-09
 	 *
 	 ******************************************************************************/
-	GetOpRecvDataByPO(serialOrderId string) ([]model.OperationDetailTraceData, error)
+	GetOpRecvDataByPO(serialOrderId string, poId string) ([]model.OperationDetailTraceData, error)
 }
 
 /******************************************************************************

dao/om/implments/SerialOrderOPDetailRecvDataLst.dao.impl.go

@@ -393,7 +393,7 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) SelectOPCReadData(serial
  * @Reference LAPP_ACURA_MOM_BACKEND/dao/om/SerialOrderOPDetailRecvDataLstDAO.GetOpRecvDataByPO
  *
  ******************************************************************************/
-func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) GetOpRecvDataByPO(serialOrderId string) ([]model.OperationDetailTraceData, error) {
+func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) GetOpRecvDataByPO(serialOrderId string, poId string) ([]model.OperationDetailTraceData, error) {
 	data := make([]model.OperationDetailTraceData, 0, 10)
 	detailCondition := fmt.Sprintf("%s = %s and %s = %s and %s = %s and %s = %s and %s = %s",
 		meta.SerialOrderOPDetailRecvDataLst_PlantNr.ColumnName,
@@ -429,10 +429,11 @@ func (impl *SerialOrderOPDetailRecvDataLstDAOImplement) GetOpRecvDataByPO(serial
 		Join("LEFT", baseMeta.OPCComRule.TableName, opcCondition).
 		Join("LEFT", baseMeta.Operation.TableName, operationCondition).
 		Join("LEFT", baseMeta.TightenWrenchRuleInfo.TableName, tightenWrenchCondition)
-	parameters := []interface{}{impl.plantNr, serialOrderId}
-	where := fmt.Sprintf("%s = ? and %s = ?",
+	parameters := []interface{}{impl.plantNr, serialOrderId, poId}
+	where := fmt.Sprintf("%s = ? and %s = ? and %s = ?",
 		meta.SerialOrderOPDetailRecvDataLst_PlantNr.ColumnName,
-		meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName)
+		meta.SerialOrderOPDetailRecvDataLst_SerialOrderId.ColumnName,
+		meta.SerialOrderOPDetailRecvDataLst_PO.ColumnName)
 
 	err := session.Select("OM_SerialOrderOPDetailRecvDataLst.*,OM_SerialOrderOPDetail.*,OPCComRule.*,Operation.*,TightenWrenchRuleInfo.*").Where(where, parameters...).Asc(meta.SerialOrderOPDetailRecvDataLst_StepNo.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_OriginPos.ColumnName).Asc(meta.SerialOrderOPDetailRecvDataLst_CreateTime.ColumnName).Find(&data)
 	if err != nil {