From dbedc3b6b40a3c8ec3caf5639fd083ba7a3fadce Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期三, 16 十一月 2022 20:30:57 +0800
Subject: [PATCH] 条码生成模块增加选源单工序汇报单生成条码，新增生产入库、销售出库扫描源单方法，新增扫描物料条码方法，返回单据列表信息方法
---
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..520edd5 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,12 @@
for (int i = 0; i < list.barcodes.Count; i++)
{
//鍒ゆ柇鏉＄爜鏄惁瀛樺湪
- bool IsBarCode = oBill.IsBarCodePack(list.barcodes[i].barcode);
- if (IsBarCodePack == false)
+ bool IsBarCode = oBill.IsBarCode(list.barcodes[i].barcode);
+ if (IsBarCode == false)
{
- LogService.Write("鏉＄爜宸插瓨鍦�,涓嶈兘閲嶅缁戝畾锛�");
+ DataTable dt = oCN.RunProcReturn("Select HBarCode_Pack from Sc_PackUnionBillSub Where HBarCode='" + list.barcodes[i].barcode + "'", "Sc_PackUnionBillSub").Tables[0];
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