Merge remote-tracking branch 'origin/develop' into develop

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

@@ -358,8 +358,8 @@ func (impl *PackOrderItemLstDAOImplement) GetMaxPost(packOrderId string) (int, e
 // GetUnFlushBackData 获取回冲包装单数据
 func (impl *PackOrderItemLstDAOImplement) GetUnFlushBackData(now string) ([]model.BackFlushData, error) {
 	result := make([]model.BackFlushData, 0)
-	sql := `SELECT JIT_PackOrder.*, status.*, JIT_PackOrderItemLst.*, OM_SerialOrder.* FROM ( (SELECT * FROM JIT_PackOrderStatus WHERE Status = 80 AND BackflushedToggle = 0 AND LastModify < ? ) status INNER JOIN JIT_PackOrder ON status.PlantNr = JIT_PackOrder.PlantNr AND status.PackOrderId = JIT_PackOrder.PackOrderId LEFT JOIN JIT_PackOrderItemLst ON status.PlantNr = JIT_PackOrderItemLst.PlantNr AND status.PackOrderId = JIT_PackOrderItemLst.PackOrderId LEFT JOIN OM_SerialOrder ON JIT_PackOrderItemLst.PlantNr = OM_SerialOrder.PlantNr AND JIT_PackOrderItemLst.SerialOrderId = OM_SerialOrder.SerialOrderId ) WHERE OM_SerialOrder.BackFlushFlag = 0 Order By JIT_PackOrderItemLst.PackOrderId, JIT_PackOrderItemLst.Pos;`
-	err := impl.session.Table(impl.meta.TableName).SQL(sql, now).Find(&result)
+	sql := `SELECT JIT_PackOrder.*, status.*, JIT_PackOrderItemLst.*, OM_SerialOrder.* FROM ( (SELECT * FROM JIT_PackOrderStatus WHERE PlantNr = ? AND Status = 80 AND BackflushedToggle = 0 AND LastModify < ? ) status INNER JOIN JIT_PackOrder ON status.PlantNr = JIT_PackOrder.PlantNr AND status.PackOrderId = JIT_PackOrder.PackOrderId LEFT JOIN JIT_PackOrderItemLst ON status.PlantNr = JIT_PackOrderItemLst.PlantNr AND status.PackOrderId = JIT_PackOrderItemLst.PackOrderId LEFT JOIN OM_SerialOrder ON JIT_PackOrderItemLst.PlantNr = OM_SerialOrder.PlantNr AND JIT_PackOrderItemLst.SerialOrderId = OM_SerialOrder.SerialOrderId ) WHERE OM_SerialOrder.BackFlushFlag = 0 Order By JIT_PackOrderItemLst.PackOrderId, JIT_PackOrderItemLst.Pos;`
+	err := impl.session.Table(impl.meta.TableName).SQL(sql, impl.plantNr, now).Find(&result)
 	return result, err
 }
 

etl_task/BackFlushPackOrder.go

@@ -74,7 +74,6 @@ func main() {
 		fmt.Println("连接讴歌数据库失败, error:" + err.Error())
 		return
 	}
-	acuraDB.ShowSQL(true)
 	// 从etl数据库中获取参数
 	var index1 string
 	var index2 string
@@ -163,7 +162,7 @@ func main() {
 		return
 	}
 	index12 = string(tempBytes)
-	filename := "bkfl" + fmt.Sprintf("%d%02d%02d%d", year, int(month), day, 3600*hour+60*minute+second) +  suffix + ".csv"
+	filename := "bkfl" + fmt.Sprintf("%d%02d%02d%d", year, int(month), day, 3600*hour+60*minute+second) + suffix + ".csv"
 	filepath := path.Join(dir, filename)
 	acuraSession := acuraDB.NewSession()
 	defer acuraSession.Close()
@@ -271,7 +270,7 @@ func main() {
 			strconv.Itoa(qty),
 			index11,
 			index12,
-			)
+		)
 		writeLi = append(writeLi, writeStr)
 	}
 	if err = acuraSession.Begin(); err != nil {