From ce58bfdb73054fa181e0731d60f4c2e74798cabb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 13 十月 2025 09:23:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/条码管理/WEBSController.cs | 390 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 324 insertions(+), 66 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 2b95002..fe66b91 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -72,7 +72,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- else if (DBUtility.ClsPub.isLong(ds2.Tables[0].Rows[0]["HBack"])==1)
+ else if (DBUtility.ClsPub.isLong(ds2.Tables[0].Rows[0]["HBack"]) == 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -111,6 +111,8 @@
#endregion
#region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ #region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇 鍒ゆ柇閲戣澏璐﹀彿鏄惁姝ｇ‘
/// <summary>
/// 杩涘叆妯″潡鏃惰繘琛岀敤鎴锋潈闄愬垽鏂�
@@ -184,6 +186,48 @@
return objJsonResult;
}
}
+
+ #endregion
+
+ #region 鐢ㄦ埛妯″潡鏉冮檺鍒ゆ柇
+
+ /// <summary>
+ /// 杩涘叆妯″潡鏃惰繘琛岀敤鎴锋潈闄愬垽鏂�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/CheckModRight_ERP_Json")]
+ [HttpGet]
+ public object CheckModRight_ERP_Json(string ModRightName, string HUserName)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 3, false, HUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夊搴旀ā鍧楁潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "妯″潡鏉冮檺鍒ゆ柇寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
#endregion
@@ -381,12 +425,50 @@
{
Int64 HWhID = 0;
HWhID = DBUtility.ClsPub.isLong(HBarCode.Replace("HWH", ""));
- ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HSPFlag from Gy_Warehouse with(nolock) where HStopflag=0 and HItemID=" + HWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Warehouse");
+ ds = oCn.RunProcReturn("exec h_p_Gy_Warehouse_PDA " + HWhID.ToString() + "," + HStockOrgID.ToString(), "h_p_Gy_Warehouse_PDA");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
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 = "杩斿洖浠撳簱淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇PDA浠撳簱鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetWarehouseList_Json")]
+ [HttpGet]
+ public object GetWarehouseList_Json(string Warehouse, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_Gy_WarehouseList_PDA '" + Warehouse + "'," + HStockOrgID.ToString(), "h_p_Gy_WarehouseList_PDA");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍浠撳簱璁板綍锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -432,7 +514,7 @@
sHWhID = DBUtility.ClsPub.isLong(sArray[0]);
}
- if(HWhID==0)
+ if (HWhID == 0)
{
ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HItemID=" + sHSPID.ToString() + " and HWHID=" + sHWhID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "h_v_IF_StockPlace");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -990,13 +1072,13 @@
/// <returns></returns>
[Route("WEBSController/GetEquipList_Json")]
[HttpGet]
- public object GetEquipList_Json(string Equip,int HCenterID)
+ public object GetEquipList_Json(string Equip, int HCenterID)
{
try
{
- if (HCenterID !=0)
+ if (HCenterID != 0)
{
- ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName,HCenterID from h_v_Gy_EquipFileBill where HCenterID='"+HCenterID+"' and ( HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%')", "h_v_Gy_EquipFileBill");
+ ds = oCn.RunProcReturn("select HInterID,HEquipFileNumber,HName,HSourceID,HSourceName,HCenterID from h_v_Gy_EquipFileBill where HCenterID='" + HCenterID + "' and ( HEquipFileNumber like '%" + Equip + "%' or HName like '%" + Equip + "%')", "h_v_Gy_EquipFileBill");
}
else
{
@@ -1567,7 +1649,7 @@
try
{
- if(sFIFOCtl == "Y")
+ if (sFIFOCtl == "Y")
{
//鏇存柊鍏堣繘鍏堝嚭涓存椂琛ㄧ姸鎬�
oCn.RunProc("EXEC h_p_WMS_UPDateICInventory_FIFO_Tmp " + HInterID.ToString() + ",'" + HBillType + "'");
@@ -1990,7 +2072,7 @@
{
try
{
- ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere+"'", "h_p_Kf_ICStockBillQueryList_New");
+ ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillQueryList_New '" + HBillType + "','" + HBillNo + "','" + HSourceBillNo + "','" + HMaker + "'," + HStockOrgID.ToString() + ",'" + sWhere + "'", "h_p_Kf_ICStockBillQueryList_New");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -2511,6 +2593,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1202";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveProductInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -2652,6 +2735,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1201";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SavePOStockInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -2811,7 +2895,7 @@
websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
websLsmain.HStockStyle = lsmain[0].HStockStyle;
websLsmain.HBillSubType = lsmain[0].HBillSubType;
- if(lsmain[0].HMainSourceBillType== "1241")
+ if (lsmain[0].HMainSourceBillType == "1241")
{
websLsmain.HMainSourceBillType = "鍏ュ簱鐢宠鍗�";
}
@@ -2877,6 +2961,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1203";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveOtherInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -2973,7 +3058,7 @@
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
- if(sSourceType== "3710")
+ if (sSourceType == "3710")
{
sSourceType = "3720";
}
@@ -3031,6 +3116,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1204";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveMateOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -3271,6 +3357,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1205";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveSellOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -3355,7 +3442,7 @@
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
-
+
if (oWebs.set_SaveEntrustOutBill_New(websLsmain, sSourceType, ref DBUtility.ClsPub.sErrInfo))
{
@@ -3410,6 +3497,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1211";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveEntrustOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -3548,6 +3636,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1206";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveOtherOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -3685,6 +3774,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1254";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveMateReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -3744,6 +3834,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1255";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveEntrustReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -4031,6 +4122,7 @@
websLsmain.HInterID = lsmain[0].HInterID;
websLsmain.HBillNo = lsmain[0].HBillNo;
websLsmain.HBillType = "1207";
+ websLsmain.HMaker = lsmain[0].HMaker;
websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
@@ -4325,6 +4417,10 @@
{
websLsmain.HMainSourceBillType = "閫�鏂欓�氱煡鍗�";
}
+ else if (lsmain[0].HMainSourceBillType == "1201")
+ {
+ websLsmain.HMainSourceBillType = "閲囪喘鍏ュ簱鍗�";
+ }
else
{
websLsmain.HMainSourceBillType = "鎵嬪伐褰曞叆";
@@ -4406,6 +4502,10 @@
if (lsmain[0].HMainSourceBillType == "3720")
{
websLsmain.HMainSourceBillType = "鐢熶骇鐢ㄦ枡娓呭崟";
+ }
+ else if (lsmain[0].HMainSourceBillType == "1204")
+ {
+ websLsmain.HMainSourceBillType = "鐢熶骇棰嗘枡鍗�";
}
else
{
@@ -4952,7 +5052,7 @@
lsmain = oListModels.getObjectByJson_Kf_TrolleyPositionBillMain(msg2);
foreach (Model.ClsKf_TrolleyPositionBillMain oItem in lsmain)
- {
+ {
DBUtility.ClsPub.CurUserName = oItem.HMaker;
oItem.HBillType = "10004";
oItem.HBillSubType = "10004";
@@ -4994,7 +5094,7 @@
bool bResult;
if (OperationType == "1")
{
- bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -5263,7 +5363,7 @@
{
if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N") //绯荤粺鍙傛暟鏄惁涓虹鏈変簯妯″紡,N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡
{
- if(HSourceBillType == "1214")
+ if (HSourceBillType == "1214")
{
//閲嶆柊鍚屾鐢熶骇鍙戞枡閫氱煡鍗�
Kf_MateOutRequestBillController obill = new Kf_MateOutRequestBillController();
@@ -5840,7 +5940,7 @@
sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo, HMaker);
SourceFlag = true;
}
- else if(oSystemParameter.omodel.WMS_CampanyName == "妫シ" && HSourceBillType == "1241")
+ else if (oSystemParameter.omodel.WMS_CampanyName == "妫シ" && HSourceBillType == "1241")
{
//鑷姩鍖呰绾垮悓姝ラ噾铦剁敓浜у叆搴撶敵璇峰崟
sJXCode = Kf_OtherInBill_SK(sBarCode, HCustom1);
@@ -5895,7 +5995,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- }
+ }
#endregion
@@ -5975,7 +6075,7 @@
{
if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
- sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
+ sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOutOrgID, HBillNo, HMaker);
SourceFlag = true;
}
else
@@ -6695,8 +6795,8 @@
objJsonResult.Message = "鏍￠獙妯″紡锛屾壂鎻忔潯鐮佸け璐ワ紒" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
- }
}
+ }
else
{
objJsonResult.code = "0";
@@ -6881,7 +6981,7 @@
{
//鑾峰彇绯荤粺鍙傛暟
string sErrMsg = "";
- if (oSystemParameter.ShowBillByOrgID(HStockOrgID,ref sErrMsg) == true)
+ if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
{
string sSourceBarCodeCtl = "N"; //鏍￠獙-鏄惁杩涜婧愬崟瀵瑰簲鏉＄爜鏍稿锛�'Y'涓烘牳瀵癸級
if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBillCheck_SourceBarCodeCtl.ToUpper() == "Y")
@@ -7524,15 +7624,64 @@
}
}
else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鏍￠獙妯″潡 杩斿洖婧愬崟鍒楄〃淇℃伅
+ /// <summary>
+ /// 婧愬崟鍒楄〃淇℃伅锛屾牴鎹崟鎹被鍨嬨�佺粍缁嘔D杩斿洖婧愬崟鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetCheckBillList_Json")]
+ [HttpGet]
+ public object GetCheckBillList_Json(string HBillType, Int64 HStockOrgID, string HBillNo, string HMater, string HCustom)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_GetCheckBillList '" + HBillType + "'," + HStockOrgID.ToString() + ",'" + HBillNo + "','" + HMater + "','" + HCustom + "'", "h_p_WMS_GetCheckBillList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍婧愬崟淇℃伅锛�";
objJsonResult.data = null;
return objJsonResult;
}
+ else
+ {
+ List<object> columnNameList = new List<object>();
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇婧愬崟鍗曟嵁淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
}
-
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇婧愬崟鍗曟嵁淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#endregion
@@ -7552,13 +7701,20 @@
{
try
{
- WebS.ClsGy_BarCodeBill_WMS_Model WebSoBarModel = new WebS.ClsGy_BarCodeBill_WMS_Model();
- WebSoBarModel = oWebs.get_PackBarCode_PackUnionBill(HInterID, HBillNo, HBillType, HBarCode_Pack, HMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
- if (WebSoBarModel == null)
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode_Pack + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddPackBarCode_PackUnionBill");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.Message = "鎵弿鎵樻潯鐮佸彂鐢熼敊璇紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
@@ -7566,8 +7722,8 @@
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鎴愬姛";
- objJsonResult.data = WebSoBarModel;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
}
@@ -7688,7 +7844,7 @@
string sErrMsg = "";
if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
{
- string sMaterialCtl = "Y"; //缁勬墭鏃舵墭鏉＄爜瀵瑰簲鐗╂枡涓庨渶瑕佺粍鎵樼殑鏉＄爜瀵瑰簲鐗╂枡瑕佷竴鑷达紙Y涓洪渶涓�鑷达級
+ string sMaterialCtl = "Y"; //缁勬墭鐗╂枡鏄惁涓�鑷存帶鍒讹紙Y涓烘帶鍒讹級
string sSourceBillTypeCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟绫诲瀷鎺у埗锛圷涓烘帶鍒讹級
string sSourceBillNoCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟鎺у埗锛圷涓烘帶鍒讹級
sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
@@ -8148,7 +8304,7 @@
string HIPAddress = ""; //IP
string HModCaption = "WMS-鎷嗙锛堟媶鎵橈級妯″潡"; //妯″潡鍚�
ds = oCn.RunProcReturn("exec h_p_Sc_PackUnionBill_Delete_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBarCode_Pack + "','" + HMaker + "','" + ComputerName + "','" + HIPAddress + "','" + HModCaption + "'", "h_p_Sc_PackUnionBill_Delete_New");
-
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鎴愬姛";
@@ -8719,7 +8875,8 @@
try
{
ds = oCn.RunProcReturn("select * from Gy_BarCodeBill where HBarcode='" + HBarCode + "'", "Gy_BarCodeBill");
- if (ds.Tables[0].Rows.Count == 0) {
+ if (ds.Tables[0].Rows.Count == 0)
+ {
DAL.ClsGy_BarCodeBill_View dal = new DAL.ClsGy_BarCodeBill_View();
string sErrMsg = "";
oSystemParameter.ShowBill(ref sErrMsg);
@@ -9514,7 +9671,7 @@
try
{
- ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_WorkShop " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HQty.ToString() + ",'" + HSourceBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "'," + HStockOrgID.ToString() + ",'" + HMaker + "'," + DBUtility.ClsPub.BoolToString(SourceFlag) + ",'" + sBatchNoCtl + "','" + sMustQtyCtl + "'", "h_p_WMS_AddBarCode_WorkShop");
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_WorkShop_TestByLLJ " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBarCode + "'," + HQty.ToString() + ",'" + HSourceBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "'," + HStockOrgID.ToString() + ",'" + HMaker + "'," + DBUtility.ClsPub.BoolToString(SourceFlag) + ",'" + sBatchNoCtl + "','" + sMustQtyCtl + "'", "h_p_WMS_AddBarCode_WorkShop");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -9550,14 +9707,14 @@
}
}
else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
}
+ }
#endregion
@@ -9621,7 +9778,7 @@
public object MaterialLowerBill_MaterInv(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID)
{
try
- {
+ {
ds = oCn.RunProcReturn("exec h_p_Kf_MaterialInventory " + HInterID + "," + HBillType + "," + HStockOrgID, "h_p_Kf_MaterialInventory");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -9668,7 +9825,7 @@
{
try
{
- ds = oCn.RunProcReturn("select * from h_v_Gy_MouldIsUsed where 灏忚溅鏉＄爜='" + HCarBarCode + "'" , "h_v_Gy_MouldIsUsed");
+ ds = oCn.RunProcReturn("select * from h_v_Gy_MouldIsUsed where 灏忚溅鏉＄爜='" + HCarBarCode + "'", "h_v_Gy_MouldIsUsed");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -9762,12 +9919,12 @@
/// <returns></returns>
[Route("WEBSController/GetGy_BarCodeBill_QiaoYi_PDA_Json")]
[HttpGet]
- public object GetGy_BarCodeBill_QiaoYi_PDA_Json(string sBarCode, string sBarCodeOutDate, string sCustomerName, string sSellOutBillNo)
+ public object GetGy_BarCodeBill_QiaoYi_PDA_Json(string sBarCode)
{
try
{
- //ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi '" + sBarCode+ "'", "h_p_Gy_BarCodeBillList_QiaoYi");
- ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi2 '" + sBarCode + "','" + sBarCodeOutDate + "','" + sCustomerName + "','" + sSellOutBillNo + "'", "h_p_Gy_BarCodeBillList_QiaoYi2");
+ ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi '" + sBarCode + "'", "h_p_Gy_BarCodeBillList_QiaoYi");
+ //ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBillList_QiaoYi2 '" + sBarCode + "','" + sBarCodeOutDate + "','" + sCustomerName + "','" + sSellOutBillNo + "'", "h_p_Gy_BarCodeBillList_QiaoYi2");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -9967,14 +10124,14 @@
try
{
ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeBillList_APP_HaiCheng " +
- "@HBillNo = N'" + HBillNo + "', " +
- "@HNumber = N'" + HNumber + "', " +
- "@HName = N'" + HName + "', " +
+ "@HBillNo = N'" + HBillNo + "', " +
+ "@HNumber = N'" + HNumber + "', " +
+ "@HName = N'" + HName + "', " +
"@HICMOBillNo = N'" + HICMOBillNo + "'," +
"@HProcID = N'" + HProcID + "', " +
"@HDeptID = N'" + HDeptID + "'"
, "h_p_MES_ProcessExchangeBillList_PDA_QiaoYi");
- if((bool)ds.Tables[1].Rows[0]["returntype"] == false)
+ if ((bool)ds.Tables[1].Rows[0]["returntype"] == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -9989,7 +10146,8 @@
objJsonResult.Message = "褰撳墠鎵�杈撳叆杩囨护鏉′欢锛屾病鏈夎繑鍥炰换浣曠粨鏋滐紒";
objJsonResult.data = null;
return objJsonResult;
- }else
+ }
+ else
{
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
@@ -10029,7 +10187,7 @@
{
try
{
- ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi '" + HInterID+ "'", "h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi");
+ ds = oCn.RunProcReturn("exec h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi '" + HInterID + "'", "h_p_MES_ProcessExchangeSubBillList_PDA_QiaoYi");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -10151,7 +10309,7 @@
string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
columnNameList.Add(JsonConvert.DeserializeObject(ColmString)); //鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- if (HDATA=="HSPE")
+ if (HDATA == "HSPE")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -10160,7 +10318,7 @@
objJsonResult.list = columnNameList;
return objJsonResult;
}
- else if (HDATA == "HICM")
+ else if (HDATA == "HICM")
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -10169,7 +10327,7 @@
objJsonResult.list = columnNameList;
return objJsonResult;
}
- else
+ else
{
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -10666,13 +10824,13 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
- return objJsonResult;
+ return objJsonResult;
}
catch (Exception e)
{
@@ -10692,7 +10850,7 @@
/// <returns></returns>
[Route("WEBSController/UpdateKf_ICInvBal")]
[HttpGet]
- public object UpdateKf_ICInvBal( )
+ public object UpdateKf_ICInvBal()
{
try
{
@@ -10728,7 +10886,7 @@
try
{
ds = oCn.RunProcReturn("exec h_p_Kf_SellOutBarTraceReport '" + HBeginDate.ToShortDateString() + "','" + HEndDate.ToShortDateString() + "','" + HBarCode + "'," + HStockOrgID.ToString() + ",'" + HWhere + "'", "h_p_Kf_SellOutBarTraceReport");
-
+
List<object> columnNameList = new List<object>();
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -10906,7 +11064,7 @@
"and HMaker = '" + HMaker + "' " +
"and HOrgID = " + HStockOrgID;
DataSet ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBillMain");
- if(ds!=null && ds.Tables[0].Rows.Count > 0)
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -10957,7 +11115,7 @@
/// <returns></returns>
[Route("WEBSController/Gy_getCusBarCodeBill_rushBarCode")]
[HttpGet]
- public object Gy_getCusBarCodeBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID,string HBarCode_Pre)
+ public object Gy_getCusBarCodeBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID, string HBarCode_Pre)
{
DataSet ds;
try
@@ -11144,7 +11302,7 @@
[HttpGet]
public object Gy_getCusBarCodeBill_submitRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
{
-
+
DataSet ds;
try
{
@@ -11323,7 +11481,7 @@
return objJsonResult;
}
//=============================================================================================================================================
-
+
//寮�鍚簨鍔�
oCn.BeginTran();
@@ -11673,7 +11831,7 @@
{
string sql = "exec h_p_Gy_BarCodeConfirmBill_rushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HMaker + "'," + HStockOrgID + ",'" + HBarCode + "'";
ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_rushBarCode");
- if(ds==null || ds.Tables[0].Rows.Count == 0)
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -12150,7 +12308,7 @@
#region 妫シ鍏朵粬鍏ュ簱鎵爜
- public string Kf_OtherInBill_SK(string sBarCode,string HCustom1)
+ public string Kf_OtherInBill_SK(string sBarCode, string HCustom1)
{
string HReturnResult;
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
@@ -12203,7 +12361,8 @@
//鐢熶骇杩斾慨鐢宠
model.Add("FBillTypeID", new JObject() { ["FNumber"] = "SCRKSQ004" }); //鍗曟嵁绫诲瀷
}
- else {
+ else
+ {
//鏍囧噯鐢熶骇鍏ュ簱鐢宠鍗�
model.Add("FBillTypeID", new JObject() { ["FNumber"] = "SCRUSQD" }); //鍗曟嵁绫诲瀷
}
@@ -12373,7 +12532,7 @@
return "鍙戠敓寮傚父锛屽叆搴撶敵璇峰崟鍗曞彿:" + ",瀹℃牳澶辫触" + result2;
}
}
- }
+ }
}
}
@@ -12391,7 +12550,7 @@
//鑾峰彇鍏ュ簱鐢宠鍗曞崟鎹彿
string HBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FBILLNO"]);
//鍖呰绾跨敓鎴愮殑鐢熶骇鍏ュ簱鐢宠鍗曞弬涓庤嚜鍔ㄥ鏍�
- if (HBillNo.Substring(0,2) == "RK" )
+ if (HBillNo.Substring(0, 2) == "RK")
{
//鑾峰彇鍏ュ簱鐢宠鍗曞崟鎹姸鎬�
string HBillStatus = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["FDOCUMENTSTATUS"]);
@@ -12458,7 +12617,7 @@
//鎵ц鏇存柊璇彞
oCn.RunProc(sql);
}
-
+
}
}
@@ -12472,5 +12631,104 @@
return HReturnResult;
}
#endregion
+
+
+ #region 缁戝畾灏忚溅浠撳簱浠撲綅
+ /// <summary>
+ /// 缁戝畾灏忚溅浠撳簱浠撲綅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/BindCarAndWH")]
+ [HttpGet]
+ public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString(), "h_p_bindingCarintoWh");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鐗╂枡鏉＄爜锛屽啓鍏ヤ复鏃惰〃澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ 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 = "鎵弿鐗╂枡鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ }
+ #endregion
+
+ //杞Щ妯″潡
+ [Route("WEBSController/CheckHW")]
+ [HttpGet]
+ public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
+ {
+ try
+ {
+ if (HCarBarCode1 == null) HCarBarCode1 = "";
+ if (HCarBarCode2 == null) HCarBarCode2 = "";
+ string sql = $"exec Transfer_Operation {HWhID},{HSPID},{HWhID2},{HSPID2},'{HBarCode}','{HCarBarCode1}','{HCarBarCode2}','{UserID}'";
+ ds = oCn.RunProcReturn(sql, "Transfer_Operation");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鐗╂枡鏉＄爜锛屽啓鍏ヤ复鏃惰〃澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ 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 = "鎵弿鐗╂枡鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
}
}
--
Gitblit v1.9.1