From 18a02e32f0af32b7a1b11ed8843bf0b89a85290d Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 29 十月 2021 17:01:26 +0800
Subject: [PATCH] 条码生成模块增加批次按钮
---
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index f80dfaa..00db2c6 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -31,13 +31,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintainPlan " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintainPlan");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain");
}
else
{
- string sql1 = "select * from h_v_Sc_EquipMaintainPlan where 1 = 1";
+ string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1";
string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -162,36 +162,39 @@
}
//閰嶄欢琛ㄤ綋鏁版嵁
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
- msg4 = msg4.Substring(1, msg4.Length - 2);
- msg4 = msg4.Replace("\\", "");
- msg4 = msg4.Replace("\n", ""); //\n
- //msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>();
- ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4);
- int j = 0;
- foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1)
+ if (msg4 != "undefined" && msg4 != "" && msg4 != "[]")
{
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>();
+ ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4);
+ int j = 0;
+ foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1)
+ {
- j++;
- oItemSub.HEntryID = i;
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
+ j++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
- oBill.DetailColl.Add(oItemSub);
+ oBill.DetailColl.Add(oItemSub);
+ }
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
--
Gitblit v1.9.1