From 89ce2bc6b71ea331c219c295074a289d09c808af Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 13 七月 2023 16:06:34 +0800
Subject: [PATCH] 修改车间代码的查询方式,返回正确的车间代码

---
 config.json            |   14 +++++++-------
 kingdee/icInventory.go |    3 ++-
 kingdee/cst.go         |    1 +
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/config.json b/config.json
index b04f638..36ab7dc 100644
--- a/config.json
+++ b/config.json
@@ -4,15 +4,15 @@
     "sql_db_name": "LZGS",
     "sql_username": "sa",
     "sql_password": "basic@2023",
-    "nsq_server": "fai365.com:4150",
+    "nsq_server": "121.31.232.83:4150",
     "nsq_webapi": "http://121.31.232.83:9080/api/nsq/pub?topic=your_topic",
-    "order_topic": "aps.factory.erp.seorder",
-    "inventory_topic": "aps.factory.erp.inventory",
-    "query_topic": "aps.factory.erp.k3resource",
-    "reply_topic": "aps.factory.erp.k3reply",
+    "order_topic": "aps.wangpengfei.erp.seorder",
+    "inventory_topic": "aps.wangpengfei.erp.inventory",
+    "query_topic": "aps.wangpengfei.erp.k3resource",
+    "reply_topic": "aps.wangpengfei.erp.k3reply",
     "cst_webapi": "http://192.168.20.249/cst/local_post.ashx",
-    "cst_query_topic": "aps.factory.erp.cstApply",
-    "cst_reply_topic": "aps.factory.erp.cstReply",
+    "cst_query_topic": "aps.wangpengfei.erp.cstApply",
+    "cst_reply_topic": "aps.wangpengfei.erp.cstReply",
     "interval": 60,
     "debug": false
 }
\ No newline at end of file
diff --git a/kingdee/cst.go b/kingdee/cst.go
index 416d596..9d9e1ab 100644
--- a/kingdee/cst.go
+++ b/kingdee/cst.go
@@ -91,6 +91,7 @@
 		logger.Warn("瑙f瀽璇锋眰澶辫触, %s", err.Error())
 		return err
 	}
+	logger.Debug("鎺ユ敹鍒板垱寤虹敓浜т换鍔″崟璇锋眰, 鍏�%d鏉¤鍗�", len(query))
 
 	for _, q := range query {
 		ret := Commit2CSTService(q)
diff --git a/kingdee/icInventory.go b/kingdee/icInventory.go
index 498eaf2..eb1129b 100644
--- a/kingdee/icInventory.go
+++ b/kingdee/icInventory.go
@@ -20,7 +20,7 @@
 		TOP (100) PERCENT item.FNumber AS FNumber,
 		item.FName AS FName,
 		item.FModel AS FModel,
-		item.FSource AS FSource,
+		ti1.FNumber AS FSource,
 		i.FBatchNo AS FBatchNo,
 		s.FNumber AS FStockNo,
 		s.FName AS FStockName,
@@ -33,6 +33,7 @@
 	LEFT OUTER JOIN t_ICItem AS item ON i.FItemID = item.FItemID
 	LEFT OUTER JOIN t_Stock AS s ON i.FStockID = s.FItemID
 	LEFT OUTER JOIN t_Item AS ti ON item.FUnitID = ti.FItemID
+	LEFT OUTER JOIN t_Item AS ti1 ON item.FSource = ti1.FItemID
 	LEFT OUTER JOIN t_Item AS ti2 ON item.FStoreUnitID = ti2.FItemID
 	LEFT OUTER JOIN t_Item AS ti3 ON LEFT (item.FNumber, 5) = ti3.FNumber
 	AND ti3.FItemClassID = 4

--
Gitblit v1.8.0