From c5d2c26dd476ff15a3d25ccf6d4b9725a1604790 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 12 五月 2023 11:20:26 +0800
Subject: [PATCH] 用户权限判断修改，新增销售出库校验系统参数-是否进行源单对应条码核对
---
WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs | 554 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 509 insertions(+), 45 deletions(-)
diff --git a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
index b8e2758..330401d 100644
--- a/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
+++ b/WebAPI/Controllers/MJJY/Mj_PDA_MoudlCheckController.cs
@@ -17,13 +17,16 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- DataSet ds;
+ public WebS.WebService1 oWebs = new WebS.WebService1();
+ //public WebS.ClsGy_BarCodeBill_WMS_Model_View ds = new WebS.ClsGy_BarCodeBill_WMS_Model_View();
+ public Model.ClsKF_PonderationBillMain_Temp omodel = new Model.ClsKF_PonderationBillMain_Temp();
public DAL.ClsSc_MouldDotCheckBill BillNew = new DAL.ClsSc_MouldDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldDotCheckBill BillOld = new DAL.ClsSc_MouldDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldMaintainBill BillNew1 = new DAL.ClsSc_MouldMaintainBill(); //瀵瑰簲鍗曟嵁绫�
public DAL.ClsSc_MouldMaintainBill BillOld1 = new DAL.ClsSc_MouldMaintainBill(); //瀵瑰簲鍗曟嵁绫�
+ DataSet ds;
#region 妯℃不鍏风偣妫�璁板綍鍗�
@@ -32,6 +35,68 @@
[HttpGet]
public object txtHBarCode_KeyDown(string HBarCode)
{
+ //try
+ //{
+ // if (HBarCode == null || HBarCode.Equals(""))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //寰楀埌淇℃伅
+ // ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
+ // //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
+ // //鍐欏叆淇℃伅
+ // if (ds == null )
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏈煡璇㈠埌妯″叿淇℃伅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // omodel.HInterID = HInterID;
+ // omodel.HBillType = "3796";
+ // omodel.HMaker = DBUtility.ClsPub.CurUserName;
+ // omodel.HMaterID = Convert.ToInt64(ds.Tables[0].Rows[0]["HMaterID"]);
+ // omodel.HQty = 0;
+ // omodel.HBarCode = Convert.ToString(ds.Tables[0].Rows[0]["HBarCode"]);
+ // omodel.HWhID = HWHID;
+ // omodel.HStockPlaceID = HSPID;
+ // omodel.HSourceBillNo = "1";
+ // omodel.HSourceBillType = "1";
+ // omodel.HSourceEntryID = 0;
+ // omodel.HSourceInterID = 0;
+ // if (set_SavePonderationBillMain_Temp(omodel, ref DBUtility.ClsPub.sErrInfo))
+ // {
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鎵爜鎴愬姛锛�";
+ // objJsonResult.data = ds.Tables[0];
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀛樺叆缂撳瓨琛ㄥけ璐ワ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ //}
+ //catch (Exception e)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
try
{
if (HBarCode == null || HBarCode.Equals(""))
@@ -44,8 +109,9 @@
}
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HBarCode = '" + HBarCode + "'", "h_v_IF_Mould");
+ //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
//鍐欏叆淇℃伅
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ if (ds == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -53,11 +119,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
@@ -68,7 +137,118 @@
return objJsonResult;
}
}
+
+
+ [Route("EquipMaintainBill/txtHBarCode")]
+ [HttpGet]
+ public object txtHBarCode(string HBarCode)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList where 鏉″舰鐮� = '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
+ //ds = oWebs.get_InfoByBarCode(HBarCode, ref DBUtility.ClsPub.sErrInfo);
+ //鍐欏叆淇℃伅
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ 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;
+ }
+ }
+
+ public bool set_SavePonderationBillMain_Temp(Model.ClsKF_PonderationBillMain_Temp oMain, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ DAL.ClsGy_BarCodeBill_View oBar = new DAL.ClsGy_BarCodeBill_View();
+ dal.oModel = oMain;
+ if (!oBar.GetInfoByNumber_View(oMain.HBarCode))
+ {
+ sErrMsg = "鏃犳晥鏉＄爜";
+ return false;
+ }
+ else
+ {
+ if (oBar.omodel_View.HBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ if (!dal.IsBarCode_Pack(oMain.HBarCode, oMain.HInterID, oMain.HBillType))
+ {
+ sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ return false;
+ }
+ if (dal.AddNew_More(ref sErrMsg))
+ {
+ //sErrMsg = "淇濆瓨鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ //sErrMsg = "淇濆瓨澶辫触锛�";
+ return false;
+ }
+ }
+ else
+ {
+ if (oBar.omodel_View.HBarCodeType == "鍞竴鏉＄爜")
+ {
+ if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType))
+ {
+ sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ return false;
+ }
+ //鍒ゆ柇鏉＄爜涓存椂琛ㄤ腑鏄惁瀛樺湪(璋冩嫧鍗曞悓涓�鏉＄爜鐩稿悓璋冨叆璋冨嚭浠撳簱浠撲綅鍙厑璁告壂鎻忎竴娆★紝閿�鍞嚭搴撳悓涓�鏉＄爜鍚屼竴浠撳簱浠撲綅鍙厑璁告壂鎻忎竴娆�) 涓镐簳
+ //if (!dal.IsBarCode(oMain.HBarCode, oMain.HInterID, oMain.HErpClsID, oMain.HBillType,oMain.HWhID,oMain.HStockPlaceID,oMain.HSCWHID,oMain.HOutStockPlaceID,oMain.))
+ //{
+ // sErrMsg = "瀛樺湪鐩稿悓鏉＄爜锛岃鍕块噸澶嶆壂鎻忥紒";
+ // return false;
+ //}
+ }
+ if (dal.AddNew(ref sErrMsg))
+ {
+ //sErrMsg = "淇濆瓨鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ //sErrMsg = "淇濆瓨澶辫触锛�";
+ return false;
+ }
+ }
+ }
+ //dal.oCn.CnClose();
+ //dal.oCn.CnDispose();
+ //oBar.
+ }
#endregion
+
+
#region 妯℃不鍏风偣妫�璁板綍鎻愪氦
@@ -112,6 +292,7 @@
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HMouldID = DBUtility.ClsPub.isLong(lsmain[0].HMouldID);
//oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
//oItem.HPeriod = 0;
//oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
@@ -141,6 +322,289 @@
ls = oListModels.getObjectByJson_Gy_MouldDotCheckBillSub(msg2);
int i = 0;
foreach (Models.ClsSc_MouldDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oItemSub.HDotCheckItemID = DBUtility.ClsPub.isLong(ls[0].HDotCheckItemID);
+ oItemSub.HDotCheckItem = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckItem);
+ oItemSub.HDotCheckPart = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckPart);
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 璁惧鐐规璁板綍鎻愪氦
+
+ [Route("Sb_EquipDotCheckBill/savebill")]
+ [HttpPost]
+ public object savebill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ string UserName = "";
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipDotCheckBill oBill = new DLL.ClsSb_EquipDotCheckBill();
+ List<Models.ClsSb_EquipDotCheckBillMain> lsmain = new List<Models.ClsSb_EquipDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_EquipCheckBillMain(msg2);
+ foreach (Models.ClsSb_EquipDotCheckBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HEquipID = DBUtility.ClsPub.isLong(lsmain[0].HEquipID);
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //瀛愯〃浣撴暟鎹�
+
+ List<Models.ClsSb_EquipDotCheckBillSub> ls = new List<Models.ClsSb_EquipDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_Gy_EquipDotCheckBillSub(msg2);
+ int i = 0;
+ foreach (Models.ClsSb_EquipDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ oItemSub.HDotCheckItemID = DBUtility.ClsPub.isLong(ls[0].HDotCheckItemID);
+ oItemSub.HDotCheckItem = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckItem);
+ oItemSub.HDotCheckPart = DBUtility.ClsPub.isStrNull(ls[0].HDotCheckPart);
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+ #region 璁惧缁翠慨璁板綍鎻愪氦
+
+ [Route("Sb_EquipRepairWorkBill/savebill1")]
+ [HttpPost]
+ public object savebill1([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+
+ string UserName = "";
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipRepairWorkBill oBill = new DLL.ClsSb_EquipRepairWorkBill();
+ List<Models.ClsSb_EquipRepairWorkBillMain> lsmain = new List<Models.ClsSb_EquipRepairWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.wxmain(msg2);
+ foreach (Models.ClsSb_EquipRepairWorkBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HEquipID = DBUtility.ClsPub.isLong(lsmain[0].HEquipID);
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //瀛愯〃浣撴暟鎹�
+
+ List<Models.ClsSb_EquipRepairWorkBillSub> ls = new List<Models.ClsSb_EquipRepairWorkBillSub>();
+ ls = oListModels.wxsub(msg2);
+ int i = 0;
+ foreach (Models.ClsSb_EquipRepairWorkBillSub oItemSub in ls)
{
i++;
@@ -214,44 +678,44 @@
#region 鏍规嵁妯℃不鍏锋潯鐮佹煡鎵炬ā鍏锋。妗堜俊鎭�
[Route("Mj_PDA_MouldMaintainBill/txtHBarCodeMaintain_KeyDown")]
[HttpGet]
- public object txtHBarCodeMaintain_KeyDown(string HBarCode)
- {
- try
- {
- if (HBarCode == null || HBarCode.Equals(""))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- //寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
- //鍐欏叆淇℃伅
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌妯″叿淇℃伅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- objJsonResult.code = "1";
- 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;
- }
- }
+ //public object txtHBarCodeMaintain_KeyDown(string HBarCode)
+ //{
+ // try
+ // {
+ // if (HBarCode == null || HBarCode.Equals(""))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // //寰楀埌淇℃伅
+ // ds = oCN.RunProcReturn("select top 1 * from h_v_IF_Mould where HNumber= '" + HBarCode + "'", "h_v_IF_Mould");
+ // //鍐欏叆淇℃伅
+ // if (ds == null || ds.Tables[0].Rows.Count == 0)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏈煡璇㈠埌妯″叿淇℃伅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // objJsonResult.code = "1";
+ // 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 妯℃不鍏蜂繚鍏昏褰曟彁浜�
--
Gitblit v1.9.1