From f90783cd8f0be70c660385e05c74b7f66a060197 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 22 七月 2025 13:29:29 +0800
Subject: [PATCH] 合并分支
---
WebAPI/Controllers/SCGL/日计划管理/Xs_SendGoodsPlanBillController.cs | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
index 00a6ed8..53ec03c 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Xs_SendGoodsPlanBillController.cs"
@@ -332,6 +332,14 @@
}
oCN.Commit();//缁撴潫浜嬪姟
}
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁涓嶅瓨鍦�,鏃犳硶鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -339,50 +347,8 @@
objJsonResult.data = null;
return objJsonResult;
- //else if (DataType == 2)
- //{
- // var NumData = HInterID.Split(',');
- // //鑾峰彇绯荤粺鍙傛暟
- // string sReturn = "";
- // oSystemParameter.ShowBill(ref sReturn);
-
- // for (int i = 0; i < NumData.Length; i++)
- // {
-
- // ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkBillSortBillList_Left where 1=1 and hmainid=" + NumData[i], "h_v_JIT_Sc_WorkBillSortBillList");
-
- // if (ds.Tables[0].Rows.Count > 0)
- // {
- // if (ds.Tables[0].Rows[0]["鍗曟嵁鐘舵��"].ToString() != "1")
- // {
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "褰撳墠鍗曟嵁涓嶈兘鍒犻櫎锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- // }
-
- // oCN.BeginTran();//寮�鍚簨鍔�
-
- // oCN.RunProc($"delete from Sc_WorkBillSortBillMain where HInterID={ NumData[i]}");
-
- // oCN.Commit();//缁撴潫浜嬪姟
- // }
-
- // }
- // objJsonResult.code = "1";
- // objJsonResult.count = 1;
- // objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鍗曟嵁涓嶅瓨鍦�,鏃犳硶鍒犻櫎锛�";
- objJsonResult.data = null;
- return objJsonResult;
+
}
catch (Exception e)
{
--
Gitblit v1.9.1