From 090e358965800ecf7707fbfc69cef0e018836ae1 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 05 一月 2022 17:33:32 +0800
Subject: [PATCH] 委外发料单+设备器具点检保养规程完善
---
WebAPI/Controllers/Kf_EntrustInBillController.cs | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/WebAPI/Controllers/Kf_EntrustInBillController.cs b/WebAPI/Controllers/Kf_EntrustInBillController.cs
index d8da958..a3059f5 100644
--- a/WebAPI/Controllers/Kf_EntrustInBillController.cs
+++ b/WebAPI/Controllers/Kf_EntrustInBillController.cs
@@ -35,7 +35,7 @@
public bool sRedBlueFlag = false;
public bool SourceFlag = false;
//public string sSourceType = "1601";
- // public bool sRedBlue = false;
+ // public bool sRedBlue = false;
public WebServer webserver = new WebServer();
public DataSet ds = new DataSet();
public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
@@ -82,24 +82,11 @@
try
{
ds = webserver.GetKf_PonderationBillMain_TempList(HBillType, 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;
- }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -119,7 +106,7 @@
[HttpGet]
public Object get_CheckTypeByBarCode_All_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, string sExpressNumber)
{
- oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID,sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
if (oBar == null)
{
objJsonResult.code = "0";
@@ -178,13 +165,14 @@
return objJsonResult;
}
}
+
/// <summary>
/// 鐢熸垚濮斿鍏ュ簱鍗�
/// </summary>
/// <returns></returns>
[Route("Kf_EntrustInBill/set_SaveEntrustInBill_Json")]
[HttpPost]
- public object set_SaveEntrustInBill_Json([FromBody]JObject oMain)
+ public object set_SaveEntrustInBill_Json([FromBody] JObject oMain)
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
@@ -223,7 +211,7 @@
if (webserver.set_SaveEntrustInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鐢熸垚濮斿鍏ュ簱鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�";
objJsonResult.data = null;
@@ -255,7 +243,7 @@
/// <returns></returns>
[Route("Kf_EntrustInBill/set_SaveEntrustInBill_New_Json")]
[HttpPost]
- public object set_SaveEntrustInBill_New_Json([FromBody]JObject oMain)
+ public object set_SaveEntrustInBill_New_Json([FromBody] JObject oMain)
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
@@ -288,7 +276,7 @@
websLsmain.HMainSourceBillType = "1103";
websLsmain.HMangerID = lsmain[0].HMangerID;
websLsmain.HWHID = lsmain[0].HWHID;
- websLsmain.HExplanation = "";
+ websLsmain.HExplanation = lsmain[0].HExplanation;
string sSourceBillType = "1103";
@@ -398,7 +386,7 @@
/// <returns></returns>
[Route("Kf_EntrustInBill/set_SaveEntrustInBackBill_Json")]
[HttpPost]
- public object set_SaveEntrustInBackBill_Json([FromBody]JObject oMain)
+ public object set_SaveEntrustInBackBill_Json([FromBody] JObject oMain)
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
--
Gitblit v1.9.1