From eedd1a047c306f4971d0e05ac2d5b8143b90af0a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 05 八月 2022 15:45:09 +0800
Subject: [PATCH] 工艺路线 编辑 维护
---
WebAPI/Controllers/OtherInStockController.cs | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 161 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/OtherInStockController.cs b/WebAPI/Controllers/OtherInStockController.cs
index 1e2d1f0..f66269e 100644
--- a/WebAPI/Controllers/OtherInStockController.cs
+++ b/WebAPI/Controllers/OtherInStockController.cs
@@ -42,6 +42,8 @@
public DataSet ds = new DataSet();
public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
public ClsKF_PonderationBillMain_Temp model = new ClsKF_PonderationBillMain_Temp();
+ public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ public WebS.WebService1 oWebs = new WebS.WebService1();
//public double sRelQty = 0;
// private DataBaseServices objDataBaseServices = new DataBaseServices();
private JsonResult objJsonResult = new JsonResult();
@@ -68,8 +70,9 @@
[HttpGet]
public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
{
- oBar = webserver.get_CheckTypeByBarCode(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
- if (oBar == null)
+ string sExpressNumber = "";
+ WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -79,7 +82,7 @@
}
else
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = oBar;
@@ -189,8 +192,8 @@
model.HSourceBillType = oView.HSourceBillType;
model.HRedBlueFlag = false;
model.HPieceQty = 1;
- model.HSTOCKORGID = 0;
- model.HOWNERID = 0;
+ model.HSTOCKORGID = ClsPub.HORGANIZATIONSID;
+ model.HOWNERID = ClsPub.HORGANIZATIONSID;
if (webserver.set_SavePonderationBillMain_Temp_Qty(model, sQty, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
@@ -267,12 +270,67 @@
/// 鐢熸垚鍏朵粬鍏ュ簱鍗�
/// </summary>
/// <returns></returns>
+ //[Route("OtherInStockBill/set_SaveOtherInStockBill_Json")]
+ //[HttpPost]
+ //public object set_SaveOtherInStockBill_Json([FromBody]JObject oMain)
+ //{
+ // var _value = oMain["oMain"].ToString();
+ // string msg1 = _value.ToString();
+
+ // try
+ // {
+ // List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
+ // ListModels oListModels = new ListModels();
+ // lsmain = oListModels.getOtherInBillMainByJson(msg1);
+ // lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ // lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ // string sSourceBillType = lsmain[0].HBillType;
+
+ // WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
+ // websLsmain.HInterID = lsmain[0].HInterID;
+ // websLsmain.HDate = lsmain[0].HDate;
+ // websLsmain.HBillNo = lsmain[0].HBillNo;
+ // websLsmain.HDeptID = lsmain[0].HDeptID;
+ // websLsmain.HEmpID = lsmain[0].HEmpID;
+ // websLsmain.HRemark = lsmain[0].HRemark;
+ // websLsmain.HMaker = lsmain[0].HMaker;
+ // websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+ // websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+
+ // WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
+ // if (webserver.set_SaveOtherInBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
[Route("OtherInStockBill/set_SaveOtherInStockBill_Json")]
[HttpPost]
public object set_SaveOtherInStockBill_Json([FromBody]JObject oMain)
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
+
try
{
List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
@@ -281,11 +339,27 @@
lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
string sSourceBillType = lsmain[0].HBillType;
- if (webserver.set_SaveOtherInBill_New(lsmain[0], sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+
+ WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HEmpID = lsmain[0].HEmpID;
+ websLsmain.HRemark = lsmain[0].HRemark;
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
+ websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HBillType = "1203";//鍥哄畾鍊�
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
+ if (oWebs.set_SaveOtherInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚鍏朵粬鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
objJsonResult.data = null;
return objJsonResult;
}
@@ -344,6 +418,48 @@
// }
//}
+
+ //鍒锋柊琛ㄤ綋 杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃锛堥鏂欏嚭搴撶畝娲佺増锛�
+ [Route("OtherInStockBill/DisBillEntryList_Webs_New_Json1")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ 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[4]
+ };
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
[Route("OtherInBill/Delete_Json")]
[HttpGet]
public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
@@ -380,6 +496,44 @@
}
+
+ [Route("MateBill/Delete_Json1")]
+ [HttpGet]
+ public object Delete_Json1(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)
+ {
+ string sErrMsg = string.Empty;
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ try
+ {
+ if (oWebs.set_DelPonderationBillMain_Temp_InterIDAndSource(HInterID, HMaterID, HAuxPropID, HMTONo, HSourceInterID, HSourceEntryID, sHBillType, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
[Route("OtherInBill/DisBillEntryList_Mate_Webs_Json")]
[HttpGet]
public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
--
Gitblit v1.9.1