From 8e82aa3bf721908fdb44d9fb06eb4772e4f126d7 Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期二, 26 七月 2022 09:59:30 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MateOutController.cs | 90 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 1001a89..8c1d146 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -128,8 +128,10 @@
//WebS.WebService1 oWebs1 = new WebS.WebService1();
//WebSoBar = oWebs1.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
- Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
- WebSoBar = get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ //Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebSoBar = oWebs.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
//oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
@@ -469,6 +471,7 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillType = "1204";//鍥哄畾鍊�
if (webserver.set_SaveMateOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
@@ -498,7 +501,7 @@
}
}
/// <summary>
- /// 鐢熸垚鐢熶骇棰嗘枡鍗�(绾㈠瓧)
+ /// 鐢熸垚鐢熶骇閫�鏂欏崟
/// </summary>
/// <returns></returns>
[Route("MateOut/set_SaveMateOutBackBill_Json")]
@@ -533,6 +536,7 @@
websLsmain.HEmpID = lsmain[0].HEmpID;
websLsmain.HRemark = lsmain[0].HRemark;
websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillType = "1244";//鍥哄畾鍊�
if (webserver.set_SaveMateOutBackBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
@@ -761,6 +765,85 @@
}
}
+ //鍒锋柊琛ㄤ綋 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃锛堥鏂欏嚭搴撶畝娲佺増锛�
+ [Route("MateOutBill/DisBillEntryList_Webs_New_Json1")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ ds = oWebs.GetBillEntry_TmpList(HBillID, HBillNo, HBillType,ref sMouldManagerCtl,ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = new
+ {
+ list = ds.Tables[0],
+ list2 = ds.Tables[5]
+ };
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //鍒锋柊琛ㄤ綋 杩斿洖鏉＄爜搴撳瓨淇℃伅
+ [Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
+ [HttpGet]
+ public object GetBillEntry_TmpList_Pack(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ ds = oWebs.Get_ICInventoryByMaterIDList(HBarCode, sHWHID, sHSPID, HOWNERID, sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ 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;
+ }
+ }
+
[Route("MateOutBill/Delete_Json")]
[HttpGet]
public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -973,5 +1056,6 @@
return objJsonResult;
}
}
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1