From 55bd8bf046f91378a6eb1da3fa26a3a96e18ccc0 Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期六, 08 五月 2021 19:10:55 +0800
Subject: [PATCH] 1.增加PDA端的，委外工序计划汇报单模块 2.增加PDA端的，委外工序计划转出单模块 3.增加委外工序计划转出单模块
---
WebAPI/Service/LuBaoSevice.cs | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index 98c4fd1..78e912e 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -11,7 +11,7 @@
{
/// <summary>
- /// 鎵爜鏂规硶
+ /// 宸ュ簭姹囨姤鎵爜鏂规硶
/// </summary>
public static ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
{
@@ -27,7 +27,28 @@
public static DataSet GetBarCodeDb(string billBarCode)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessSendWorkList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where HBillType='3712' and 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_Sc_ProcessSendWorkList");
+ return dataSet;
+ }
+
+ /// <summary>
+ /// 濮斿宸ュ簭姹囨姤鎵爜鏂规硶
+ /// </summary>
+ public static ApiResult<DataSet> WWGetHbarCodeDetail(string sBillBarCode)
+ {
+ if (string.IsNullOrEmpty(sBillBarCode))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜涓嶈兘涓虹┖" };
+ sBillBarCode = sBillBarCode.CompareTo("#") > 0 ? sBillBarCode.Split(Convert.ToChar("#"))[0] : sBillBarCode;
+ var dataSet = WWGetBarCodeDb(sBillBarCode);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ澶栨淳宸ュ崟鍙�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet WWGetBarCodeDb(string billBarCode)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_WW_EntrustProcSendWorkBillList where HBillType='3740' and 鍗曟嵁鍙�= '" + billBarCode + "'", "h_v_WW_EntrustProcSendWorkBillList");
return dataSet;
}
@@ -47,10 +68,29 @@
public static DataSet GetProcDb(string sBillNo, string sProcNo)
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_Sc_ProcessSendWorkList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessSendWorkList where HBillType='3712' and 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_Sc_ProcessSendWorkList");
return dataSet;
}
+ /// <summary>
+ /// PDA濮斿姹囨姤鍗曞洖杞︽柟娉�
+ /// </summary>
+ public static ApiResult<DataSet> WWGetProcDetail(string sBillNo, string sProcNo)
+ {
+ if (string.IsNullOrEmpty(sBillNo) || string.IsNullOrEmpty(sProcNo))
+ return new ApiResult<DataSet> { code = -1, msg = "鏉＄爜鍜屾祦杞崱涓嶈兘涓虹┖" };
+ var dataSet = WWGetProcDb(sBillNo, sProcNo);
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "娴佹按鍙锋垨娴佽浆鍗″彿涓虹┖" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+
+ public static DataSet WWGetProcDb(string sBillNo, string sProcNo)
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_WW_EntrustProcSendWorkBillList where HBillType='3740' and 鍗曟嵁鍙�= '" + sBillNo + "' and HprocID='" + sProcNo + "'", "h_v_WW_EntrustProcSendWorkBillList");
+ return dataSet;
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1