From 5cdcde592ae19de697c4bf16dce08838065987e3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 22 八月 2023 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/BarCodeController.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 381d0f1..6e9d2a5 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1579,7 +1579,8 @@
//妫�楠屾墦鍗版暟閲忥紙HQTY锛夊拰鏈墦鍗版暟閲�
string sql = $"select HQty + isnull(HMrbQty,0) - HBarcodeCount as HNotBarcodeCount ,* from Cg_POOrderBillSub where HEntryID = {oItemSub.HSourceEntryID}";
DataSet ds = oCn.RunProcReturn(sql, "tables");
- if (ds.Tables[0].Rows.Count > 0 && Convert.ToInt32(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
+
+ if (ds.Tables[0].Rows.Count > 0 && Convert.ToDouble(ds.Tables[0].Rows[0][0]) < oItemSub.HQty)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1650,7 +1651,7 @@
var HSupName_verify = HBarCode_verify[7]; //鏍￠獙渚涘簲鍟�
var HSourceBillNo_verify = HBarCode_verify[8]; //鏍￠獙閲囪喘璁㈠崟鍙�
- sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}' and HModel = '{HMaterModel_verify}'";
+ sql = $"select * from Gy_Material where HNumber = '{HMaterNumber_verify}' and HName = '{HMaterName_verify}'";
DataSet verifyMatInfo = oCn.RunProcReturn(sql, "tables");
sql = $"select * from Cg_POOrderBillMain where HBillNo = '{HSourceBillNo_verify}'";
--
Gitblit v1.9.1