From bd0b71f80f02abaa3f6e462277f4fd883ba76c3b Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 16:49:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 3fe47ab..9ae9001 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"
@@ -84,6 +84,7 @@
ds = oCN.RunProcReturn("Select HBarCode barcode,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType from Gy_BarCodeBill where HSourceBillNo='" + list.billno.ToString().Trim() + "' Order by HItemID ", "Gy_BarCodeBill");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
+ LogService.Write("褰撳墠璁㈠崟鏃犵粦瀹氭潯鐮�");
objJsonResult.status = -1;
objJsonResult.msg = "褰撳墠璁㈠崟鏃犵粦瀹氭潯鐮�!";
objJsonResult.data = null;
@@ -95,6 +96,7 @@
if (strList.Count > 0)
{
string Str = String.Join(",", strList.ToArray());
+ LogService.Write("鏉＄爜:" + Str.ToString() + " 涓嶅寘鍚湪璁㈠崟:" + list.billno + "涓�!");
objJsonResult.status = -1;
objJsonResult.msg = "鏉＄爜:" + Str.ToString() + " 涓嶅寘鍚湪璁㈠崟:" + list.billno + "涓�!";
objJsonResult.data = null;
@@ -106,6 +108,7 @@
bool IsBarCodePack = oBill.IsBarCodePack(list.packagebarcode);
if (IsBarCodePack == false)
{
+ LogService.Write("绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
objJsonResult.status = -1;
objJsonResult.msg = "绠辩爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
objJsonResult.data = null;
@@ -114,6 +117,7 @@
ds = oCN.RunProcReturn("Select * from Gy_BarCodeBill where HBarCode='" + list.packagebarcode.ToString().Trim() + "' and HStopflag='1'", "Gy_BarCodeBill");
if (ds != null && ds.Tables[0].Rows.Count > 0)
{
+ LogService.Write("姝ょ鏉＄爜宸蹭綔搴�");
objJsonResult.status = -1;
objJsonResult.msg = "姝ょ鏉＄爜宸蹭綔搴�";
objJsonResult.data = null;
@@ -158,6 +162,7 @@
bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
if (IsBarCodePack == false)
{
+ LogService.Write("鏉＄爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
objJsonResult.status = -1;
objJsonResult.msg = "鏉＄爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�";
objJsonResult.data = null;
@@ -200,14 +205,16 @@
}
if (bResult)
{
+ LogService.Write("鎻愪氦鎴愬姛绠辨潯鐮侊細" + list.packagebarcode);
+ Log.LogSaveInfo("鎻愪氦鎴愬姛绠辨潯鐮侊細" + list.packagebarcode); //璁板綍鎻愪氦鏁版嵁
objJsonResult.status = 0;
objJsonResult.msg = "success";
objJsonResult.data = null;
- Log.LogSaveInfo("鎻愪氦鎴愬姛绠辨潯鐮侊細" + list.packagebarcode); //璁板綍鎻愪氦鏁版嵁
return objJsonResult;
}
else
{
+ LogService.Write("淇濆瓨澶辫触锛�" +DBUtility.ClsPub.sExeReturnInfo);
objJsonResult.status = -1;
objJsonResult.msg = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
--
Gitblit v1.9.1