From dbfba094492c2bf3488b16f00e22614df70ac6ad Mon Sep 17 00:00:00 2001
From: zhangxin <xin.zhang@le-it.com.cn>
Date: Thu, 26 May 2022 14:24:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E5=86=B2=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etl_task/BackFlushPackOrder.go | 13 +++++--------
 etl_task/BackFlushShipOrder.go | 23 ++++++++++++-----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/etl_task/BackFlushPackOrder.go b/etl_task/BackFlushPackOrder.go
index 7091371..99e5b0e 100644
--- a/etl_task/BackFlushPackOrder.go
+++ b/etl_task/BackFlushPackOrder.go
@@ -26,11 +26,6 @@ import (
 
 func main() {
 	var err error
-	baseDir, err := utils.GetCurrentPath(".")
-	if err != nil {
-		fmt.Printf("获取当前文件路径失败, error:" + err.Error())
-		return
-	}
 	var plantNr = 100
 	var userId = "BackFlush"
 	now := time.Now()
@@ -165,7 +160,6 @@ func main() {
 		return
 	}
 	index12 = string(tempBytes)
-	dir = path.Join(baseDir, dir)
 	filename := "bkfl" + fmt.Sprintf("%d%02d%02d%d", year, int(month), day, 3600*hour+60*minute+second) + "ACURA.csv"
 	filepath := path.Join(dir, filename)
 	acuraSession := acuraDB.NewSession()
@@ -248,6 +242,9 @@ func main() {
 			return
 		}
 		article := articleLi[0]
+		if !article.BackFlushItemToggle {
+			continue
+		}
 		qadArtId := article.ArtSpec3
 		if qadArtId == "" {
 			fmt.Println("未获取到ERP零件号, 物料ID:" + artId)
@@ -256,8 +253,8 @@ func main() {
 		index6 := fmt.Sprintf("%02d%02d%d", int(month), day, 3600*hour+60*minute+second)
 		index7 := fmt.Sprintf("%02d%02d%d", int(month), day, 3600*hour+60*minute+second)
 		index9 := tempIndex9 + fmt.Sprintf("%d%02d%02d%d", year, int(month), day, 3600*hour+60*minute+second)
-		index11 := now.Format("02/01/06")
-		writeStr := fmt.Sprintf(`"%s","%s",%s,"%s","%s",%s,%s,"%s","%s",%s,%s,"%s"`,
+		index11 := now.Format("01/02/06")
+		writeStr := fmt.Sprintf(`"%s","%s",%s,"%s","%s",%s,%s,"%s","%s",%s,%s,"%s",""`,
 			index1,
 			index2,
 			index3,
diff --git a/etl_task/BackFlushShipOrder.go b/etl_task/BackFlushShipOrder.go
index 0228073..65c106c 100644
--- a/etl_task/BackFlushShipOrder.go
+++ b/etl_task/BackFlushShipOrder.go
@@ -28,11 +28,6 @@ import (
 
 func main() {
 	var err error
-	baseDir, err := utils.GetCurrentPath(".")
-	if err != nil {
-		fmt.Printf("获取当前文件路径失败, error:" + err.Error())
-		return
-	}
 	var plantNr = 100
 	var userId = "backFlush"
 	now := time.Now()
@@ -146,7 +141,6 @@ func main() {
 		return
 	}
 	index8 = string(tempBytes)
-	dir = path.Join(baseDir, dir)
 	filename := "lctr" + fmt.Sprintf("%d%02d%02d%d", year, int(month), day, 3600*hour+60*minute+second) + "ACURA.dat"
 	filepath := path.Join(dir, filename)
 	acuraSession := acraDB.NewSession()
@@ -168,8 +162,8 @@ func main() {
 
 	shipOrderIdLi := make([]interface{}, len(shipOrderDataLi))
 	waitWriteLi := make([]string, 0)
+	var pos = 1
 	for _, shipOrderData := range shipOrderDataLi {
-
 		artQtyMap := make(map[string]int)
 		artErpQtyMap := make(map[string]int, len(artQtyMap))
 		// 查询发运单下的发运数据项 获取到包装单id
@@ -216,18 +210,25 @@ func main() {
 				return
 			}
 			article := articleLi[0]
+			if !article.BackFlushItemToggle {
+				continue
+			}
 			if article.ArtSpec3 == "" {
 				fmt.Println("物料的ERP零件号为空, 物料ID:" + artId)
 				return
 			}
-			artErpQtyMap[artId] = qty
+			artErpQtyMap[article.ArtSpec3] = qty
+		}
+		if len(shipOrderId) < 5 {
+			fmt.Println("发运单号格式错误, 发运单号:" + shipOrderId)
+			return
 		}
-		var pos = 1
+		writeOrderId := shipOrderId[:len(shipOrderId)-5]
 		for artId, qty := range artErpQtyMap {
 			index1 := artId
 			index2 := strconv.Itoa(qty)
 			index3 := now.Format("01/02/06")
-			str := fmt.Sprintf(`"%s",%s,%s,"%s","%s","%s","%s","%s","%s",%s,`,
+			str := fmt.Sprintf(`"%s",%s,%s,"%s","%s","%s","%s","%s","%s",%s`,
 				index1,
 				index2,
 				index3,
@@ -236,7 +237,7 @@ func main() {
 				index6,
 				index7,
 				index8,
-				shipOrderId,
+				writeOrderId,
 				strconv.Itoa(pos),
 				)
 			//str := []string{index1, index2, index3, index4, index5, index6, index7, index8, shipOrderId, strconv.Itoa(pos), "\n"} //需要写入csv的数据，切片类型