From 723208322689b903e7ed2e841f4b23bcc0516d70 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 25 二月 2021 16:08:24 +0800
Subject: [PATCH] 调拨判断库存

---
 WebAPI/Controllers/LookingForBillController.cs       |    2 +-
 WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user |    6 +++---
 WebAPI/Controllers/MoveStockBillController.cs        |   13 +++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/WebAPI/Controllers/LookingForBillController.cs b/WebAPI/Controllers/LookingForBillController.cs
index fff9cbf..89064a8 100644
--- a/WebAPI/Controllers/LookingForBillController.cs
+++ b/WebAPI/Controllers/LookingForBillController.cs
@@ -325,7 +325,7 @@
         {
             try
             {
-                string sWhere = " Where HBarCode = '" + HBarCode.Trim() + "'";
+                string sWhere = " Where 婧愬崟鍙� = '" + HBarCode.Trim() + "'";
                 ds = GetWaitingLookingFor_s(sWhere);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 7169082..0283551 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -320,6 +320,7 @@
                 model.HBarCode = oView.HBarCode;
                 model.HBatchNo = oView.HBatchNo;
                 model.HMTONo = oView.HMTONo;
+                model.HMaker = oView.HMaker;
 
                 model.HWhID = DBUtility.ClsPub.isLong(HWHID);
                 model.HStockPlaceID = DBUtility.ClsPub.isLong(HSPID);
@@ -363,10 +364,14 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                //else
-                //{
-                //    sQty = sRelQty;
-                //}
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "2-搴撳瓨涓嶈冻锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 if (oWebs.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
                 {
diff --git a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
index e140fb8..5487634 100644
--- a/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/WEBAPI.pubxml.user
@@ -157,10 +157,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>02/25/2021 10:51:38</publishTime>
+      <publishTime>02/25/2021 11:42:33</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>02/25/2021 10:51:38</publishTime>
+      <publishTime>02/25/2021 11:42:33</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>02/04/2021 21:35:21</publishTime>
@@ -334,7 +334,7 @@
       <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>02/25/2021 10:52:24</publishTime>
+      <publishTime>02/25/2021 11:42:44</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.1