From 8a536f8137bda55c91f8c972b367138c95d8ebc9 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 22 九月 2022 12:14:09 +0800
Subject: [PATCH] 批量出站汇报单递入制单人

---
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs |    3 ++-
 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs  |   39 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 230984b..6b5ed79 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -415,7 +415,44 @@
         #endregion
 
 
-       
+
+        #region 宸ュ簭杩涚珯鎺ユ敹鍗曟牴鎹墿鏂欎唬鐮佹ā绯婂洖杞︽煡璇�
+        [Route("Cj_StationInBill/GetMessageByMaterNumber")]
+        [HttpGet]
+        public object GetMessageByMaterNumber(string HMaterNumber)
+        {
+            try
+            {
+                //寰楀埌淇℃伅
+                ds = oCN.RunProcReturn("select top 1 * from gy_material  where hnumber like '%" + HMaterNumber + "%'", "gy_material");
+                //鍐欏叆淇℃伅
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌鐗╂枡淇℃伅锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+
 
         #region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�
         [Route("Cj_StationInBill/get_Display")]
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 5993416..7d1c3d9 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -489,7 +489,7 @@
                     oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
                     oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
                     oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
-                    oBill.omodel.HLastSubProc = list[i].HLastSubProc;
+                    oBill.omodel.HLastSubProc = true;
                     oBill.omodel.HEmpID2 = list[i].HEmpID2;
                     oBill.omodel.HEmpID3 = list[i].HEmpID3;
                     oBill.omodel.HEmpID4 = list[i].HEmpID4;
@@ -499,6 +499,7 @@
                     oBill.omodel.HPriceRate = list[i].HPriceRate;
                     oBill.omodel.HWorkTimes = list[i].HWorkTimes;
                     oBill.omodel.HQCCheckID = list[i].HQCCheckID;
+                    oBill.omodel.HMaker = msg4;
 
                     //string HBillSubType = "3791";
                     //long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D

--
Gitblit v1.9.1