From 1f10e8620a7a8d768762d094297285daa6496d73 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 18 六月 2022 12:15:29 +0800
Subject: [PATCH] 条码系统 提示更改

---
 WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 9ae9001..26fc827 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -108,9 +108,9 @@
                 bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
                 if (IsBarCodePack == false)
                 {
-                    LogService.Write("绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
+                    LogService.Write($"绠辩爜:{list.packagebarcode}宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
                     objJsonResult.status = -1;
-                    objJsonResult.msg = "绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
+                    objJsonResult.msg = $"绠辩爜:{list.packagebarcode}宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -159,12 +159,13 @@
                 for (int i = 0; i < list.barcodes.Count; i++)
                 {
                     //鍒ゆ柇鏉$爜鏄惁瀛樺湪
-                    bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
+                    bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
                     if (IsBarCodePack == false)
                     {
-                        LogService.Write("鏉$爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
+                        DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where  HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
+                       LogService.Write($"鏉$爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�");
                         objJsonResult.status = -1;
-                        objJsonResult.msg = "鏉$爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
+                        objJsonResult.msg = $"鏉$爜锛歿list.barcodes[i].barcode}锛屽凡瀛樺湪绠辩爜锛歿dt.Rows[0]["HBarCode_Pack"]}涓紝鏈缁戝畾绠辩爜涓猴細{list.packagebarcode},缁戝畾澶辫触,涓嶈兘閲嶅缁戝畾锛�";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }

--
Gitblit v1.9.1