From 85170f9ab975d8e2dccbbf97f8f4dc7bbf4fafaa Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期五, 24 五月 2024 15:50:34 +0800
Subject: [PATCH] 2.自动组托界面:  (已完成)初始化页面时,若当前托条码存在组托记录,则取第一个子条码中的物料获取组托数量。  同时记录条码中的源单主ID、子ID  (已完成)扫描子条码时,判断当前子条码是否是第一个,如果是的话,根据条码中的物料获取组托数量。   同时记录条码中的源单主ID、子ID  (已完成)自动组托时,组托完成后,将组托数量清空。         同时清空记录的源单主ID、子ID

---
 WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index 6093f7a..e168699 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -31,19 +31,28 @@
         {
             try
             {
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+                //if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                //string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
                 //if (sWhere == null || sWhere.Equals(""))
                 //{
-                //    ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList");
+                //    ds = oCN.RunProcReturn(sql1+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                 //}
                 //else
                 //{
-                //    string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
-                //    string sql = sql1 + sWhere;
-                //    ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
+                //    ds = oCN.RunProcReturn(sql1+ sWhere+ " order by hmainid desc", "h_v_IF_EntrustOrderBillList");
                 //}
 
-                //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
-                bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, true, user);
+                //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄愶紙瀹夌憺锛�
+                bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
                 if (!isCgjl)
                 {
                     sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
@@ -51,11 +60,22 @@
                 string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
                 ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
 
+                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+                //{
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "Sucess锛�";
                 objJsonResult.data = ds.Tables[0];
                 return objJsonResult;
+                //}
+                //else
+                //{
+                //objJsonResult.code = "0";
+                //objJsonResult.count = 0;
+                //objJsonResult.Message = "鏃犳暟鎹�";
+                //objJsonResult.data = null;
+                //return objJsonResult;
+                //}
             }
             catch (Exception e)
             {

--
Gitblit v1.9.1