From 6e6d19fc6421ce3635973eed9695dabe79b0bff4 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:24:27 +0800
Subject: [PATCH] 1
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 14 +-
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 4
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 80 +++----------
WebAPI/DLL/DAL.dll | 0
WebAPI/WebAPI.csproj | 4
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 241 ++++++++++++++++++---------------------
6 files changed, 141 insertions(+), 202 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index bcc10ba..727a50f 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -390,9 +390,9 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Cj_StationOutBill/list")]
+ [Route("Cj_StationOutBill/get_Display")]
[HttpGet]
- public object list(string sWhere)
+ public object get_Display(string sWhere)
{
try
{
diff --git a/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
similarity index 62%
rename from WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs
rename to "WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 41e27fa..9a8a76f 100644
--- a/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -11,166 +11,143 @@
namespace WebAPI.Controllers
{
//宸ュ簭妫�楠屽崟Controller
+ //鏁版嵁搴撲富琛≦C_ProcessCheckBillMain
+ //鏁版嵁搴撳瓙琛≦C_ProcessCheckBillSub
public class QC_ProcessCheckBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
- SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN();
- DataSet ds1;
-
-
+ #region 宸ュ簭妫�楠屽崟淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("QC_ProcessCheckBill/AddBill")]
+ [Route("QC_ProcessCheckBill/set_SaveBill")]
[HttpPost]
- public object AddBill([FromBody] JObject sMainSub)
+ public object set_SaveBill([FromBody] JObject sMainSub)
{
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
- oCN.BeginTran();
- //淇濆瓨涓昏〃
- objJsonResult = AddBillMain(msg1);
- if (objJsonResult.code == "0")
- {
- oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = objJsonResult.Message;
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
- return objJsonResult;
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
}
public json AddBillMain(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string OperationType = sArray[2].ToString().Trim();
+ bool bResult;
try
{
msg2 = "[" + msg2.ToString() + "]";
- List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg2);
- string BillType = "7507";
- long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
- string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ List<Model.ClsQC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2);
+ DAL.ClsQC_ProcessCheckBill BillNew = new DAL.ClsQC_ProcessCheckBill();
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
- double HPeriod = 1;
- long HBillStatus = mainList[0].HBillStatus;
- long HCheckItemNowID = mainList[0].HCheckItemNowID;
- long HCkeckItemNextID = mainList[0].HCheckItemNextID;
- long HCheckFlowID = mainList[0].HCheckFlowID;
- string HRemark = mainList[0].HRemark;//澶囨敞
- string HBacker = mainList[0].HBacker;
- DateTime HBackDate = mainList[0].HBackDate;
- string HBackRemark = mainList[0].HBackRemark;
- string HChecker = mainList[0].HChecker;
- DateTime HCheckDate = mainList[0].HCheckDate;
- string HMaker = mainList[0].HMaker;
- DateTime HMakeDate = mainList[0].HMakeDate;
- string HUpDater = mainList[0].HUpDater;
- DateTime HUpDateDate = mainList[0].HUpDateDate;
- string HCloseMan = mainList[0].HCloseMan;
- DateTime HCloseDate = mainList[0].HCloseDate;
- string HCloseType = mainList[0].HCloseType;
- string HDeleteMan = mainList[0].HDeleteMan;
- DateTime HDeleteDate = mainList[0].HDeleteDate;
- string HMainSourceBillType = mainList[0].HMainSourceBillType;
- long HMainSourceInterID = mainList[0].HMainSourceInterID;
- long HMainSourceEntryID = mainList[0].HMainSourceEntryID;
- string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
- double HPrintQty = mainList[0].HPrintQty;
- long HICMOInterID = mainList[0].HICMOInterID;
- string HICMOBillNo = mainList[0].HICMOBillNo;
- long HProExchInterID = mainList[0].HProcExchInterID;
- long HProExchEntryID = mainList[0].HProcExchEntryID;
- string HProExchBillNo = mainList[0].HProcExchBillNo;
- long HMaterID = mainList[0].HMaterID;
- long HProcID = mainList[0].HProcID;
- long HSourceID = mainList[0].HSourceID;
- long HEmpID = mainList[0].HEmpID;
- double HInStockQty = mainList[0].HInStockQty;
- double HCheckQty = mainList[0].HCheckQty;
- double HRightQty = mainList[0].HRightQty;
- double HBadQty = mainList[0].HBadQty;
- long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
- string HCheckerResult = mainList[0].HCheckerResult;
- string HBarcode = mainList[0].HBarcode;
- string HLBatchNo = mainList[0].HLBatchNo;
- long HCusID = mainList[0].HCusID;
- string HSortBillNo = mainList[0].HSortBillNo;
- string HConTrctBatchNo = mainList[0].HContrctBatchNo;
- long HProdAreaID = mainList[0].HProdAreaID;
- long HProdTypeID = mainList[0].HProdTypeID;
- string HProdStoveNo = mainList[0].HProdStoveNo;
- long HRecipeID = mainList[0].HRecipeID;
- double HDiameter1 = mainList[0].HDiameter1;
- double HDiameter2 = mainList[0].HDiameter2;
- long HRoutingInterID = mainList[0].HRoutingInterID;
- long HPackTypeID = mainList[0].HPackTypeID;
- long HDrawingDireID = mainList[0].HDrawingDireID;
-
- //涓昏〃
- oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
- ",HICMOInterID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
- ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" +
- ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" +
- ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" +
- ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" +
- ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID" +
- ") " +
- " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HBillStatus + "','" + HDate + "','" + HMaker + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
- "," + HICMOInterID + "," + HICMOBillNo + "," + HProExchInterID + "," + HProExchEntryID + ",'" + HProExchBillNo + "'" +
- "," + HMaterID + "," + HProcID + "," + HSourceID + "," + HEmpID + "," + HInStockQty +
- "," + HCheckQty + "," + HRightQty + "," + HBadQty + "," + HFirstCheckEmp + ",'" + HCheckerResult + "'" +
- ",'" + HBarcode + "','" + HLBatchNo + "'," + HCusID + ",'" + HSortBillNo + "','" + HConTrctBatchNo + "'" +
- "," + HProdAreaID + "," + HProdTypeID + ",'" + HProdStoveNo + "'," + HRecipeID + ",'" + HDiameter1 + "'" +
- "," + HDiameter2 + "," + HRoutingInterID + "," + HDrawingDireID + "," + HPackTypeID +
- ") ");
-
-
- //瀛愯〃
- oCN.RunProc("Insert into QC_ProcessCheckBillSub " +
- " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
- ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
- ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
- ",HProcCheckEmp,HProcCheckTime" +
- ") " +
- " values('" + HInterID + "','',0,'" + HCloseMan + "'" +
- ",'','','',0 " +
- ",0,'','',0,0" +
- ",0,0,'','',''"+
- ",0,''" +
- ") ");
- if (objJsonResult.code == "0")
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.Message = s;
objJsonResult.data = null;
return objJsonResult;
}
-
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = null;
- objJsonResult.data = null;
- return objJsonResult;
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ //鍥哄畾璧嬪��=================================
+ BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+ BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+ BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+ BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ BillNew.omodel.HCheckerResult = ClsPub.isStrNull(mainList[0].HCheckerResult);
+ BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ BillNew.omodel.HBillStatus = 1;
+ BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
+ List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
+ BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_ProcessCheckBillSub oSub = new Model.ClsQC_ProcessCheckBillSub();
+ oSub.HEntryID = i+1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
+ oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
+ oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType);
+ oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+ oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
+ oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
+ oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ oSub.HQCRelValue = DBUtility.ClsPub.isStrNull(subList[i].HQCRelValue);
+ oSub.HProcCheckTime = HDate;
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+
+ BillNew.DetailColl.Add(oSub);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (OperationType.Equals("1") || OperationType.Equals("2"))
+ {
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
catch (Exception e)
{
@@ -181,8 +158,10 @@
return objJsonResult;
}
}
+ #endregion
+ #region 宸ュ簭妫�楠屽崟Old
/// <summary>
/// 宸ュ簭妫�楠屽崟鍒楄〃淇敼鎸夐挳鏂规硶
///鍙傛暟锛歴tring sql銆�
@@ -294,7 +273,7 @@
long HPackTypeID = mainList[0].HPackTypeID;
long HDrawingDireID = mainList[0].HDrawingDireID;
-
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -342,7 +321,7 @@
[HttpGet]
public object Delete_Json(long HItemID)
{
- DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
+ DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
try
{
if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true)
@@ -418,7 +397,7 @@
return objJsonResult;
}
}
-
+ #endregion
//
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
similarity index 79%
rename from "WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
rename to "WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 8f68b08..519d595 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -10,7 +10,7 @@
namespace WebAPI.Controllers
{
- //棣栨妫�楠屽崟Controller
+ //棣栦欢妫�楠屽崟Controller
//鏁版嵁搴撲富琛≦C_FirstPieceCheckBillMain
//鏁版嵁搴撳瓙琛≦C_FirstPieceCheckBillSub
public class QC_FirstPieceCheckBillController : ApiController
@@ -20,6 +20,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ #region 棣栦欢妫�楠屽崟淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -84,6 +85,7 @@
BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ BillNew.omodel.HBillStatus = 1;
List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -110,6 +112,7 @@
oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
BillNew.DetailColl.Add(oSub);
}
else
@@ -158,32 +161,36 @@
return objJsonResult;
}
}
+ #endregion
+ #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
/// <summary>
- /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
/// </summary>
- /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
- /// <returns>object</returns>
- [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
+ [Route("QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp")]
[HttpGet]
- public object GetICMOBillList(int hmainid,int OrganizationID)
+ public object get_ICMOBillStatus_Tmp(int HInterID,int HEntryID,string HBillType)
{
try
{
- if (hmainid == 0)
+ if (HInterID == 0 || HEntryID == 0 || HBillType.Equals(""))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�"+ HInterID+ "锛汬EntryID锛�"+ HEntryID + "锛汬BillType锛�"+ HBillType+"锛�";
objJsonResult.data = null;
return objJsonResult;
}
- ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
+ }
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -191,7 +198,7 @@
{
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
}
@@ -200,59 +207,12 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
-
- /// <summary>
- /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
- /// </summary>
- /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
- /// <returns>object</returns>
- [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
- [HttpGet]
- public object GetICMOBillDetail(int hmainid, int OrganizationID)
- {
- try
- {
- if (hmainid == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
- 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 = "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
//
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 55c82d7..0fbcb5f 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 74c1632..853bcad 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -21,7 +21,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>07/20/2021 23:06:07</publishTime>
+ <publishTime>07/21/2021 17:35:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
@@ -48,7 +48,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>07/16/2021 17:42:03</publishTime>
+ <publishTime>07/20/2021 23:27:38</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>07/12/2021 16:12:20</publishTime>
@@ -162,10 +162,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>07/20/2021 23:19:13</publishTime>
+ <publishTime>07/21/2021 17:46:11</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>07/20/2021 23:19:13</publishTime>
+ <publishTime>07/21/2021 17:46:11</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -189,7 +189,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>07/20/2021 23:06:07</publishTime>
+ <publishTime>07/21/2021 17:35:30</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -198,7 +198,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>07/16/2021 17:42:03</publishTime>
+ <publishTime>07/20/2021 23:27:38</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -336,7 +336,7 @@
<publishTime>07/16/2021 17:42:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>07/20/2021 23:19:20</publishTime>
+ <publishTime>07/21/2021 17:46:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index aa59e78..93e6fb5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -374,7 +374,6 @@
<Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
<Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
<Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
@@ -388,7 +387,8 @@
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
- <Compile Include="Controllers\鍝佽川绠＄悊\棣栨妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
+ <Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
--
Gitblit v1.9.1