From 63b1ffb7ad679887662c6c360a4cedb42c1cf5da Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 04 八月 2025 22:21:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 6 +++---
BaseSet/BaseSet.csproj | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index 520e1fe..7e74db1 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BaseSet</RootNamespace>
<AssemblyName>BaseSet</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 0af2208..cd7a5aa 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1577,9 +1577,9 @@
",@HGroupID = " + ordrlist[0].HGroupID +
",@HSourceInterID = " + HSourceInterID +
",@HSourceEntryID = " + HSourceEntryID +
- ",@HBarCodeType = " + HSelectBarCodeType +
- ",@HSourceBillNo = " + ordrlist[0].HBillNo +
- ",@HMaker = " + UserName
+ ",@HBarCodeType = N'" + HSelectBarCodeType + "'"+
+ ",@HSourceBillNo = N'" + ordrlist[0].HBillNo + "'"+
+ ",@HMaker = N'" + UserName + "'"
, "h_p_SC_BarCode_Transfer");
if ((bool)ds1.Tables[0].Rows[0]["returntype"] == true)
--
Gitblit v1.9.1