From 2770c9950e43fc502ec37c966f4707ad071ad5fc Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 19 三月 2026 16:00:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/条码管理/WEBSController.cs | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 b5586c1..b984b00 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"
@@ -5259,7 +5259,7 @@
/// </summary>
/// <returns></returns>
[Route("WEBSController/set_SaveQCPOStockInCheckBill_Json")]
- [HttpPost]
+ [HttpGet]
public object set_SaveQCPOStockInCheckBill_Json(Int64 HInterID, string HBillNo, string HSourceBillType, string HSourceBillNo, Int64 HSourceInterID, string sHSourceEntryID, Int64 HFirstCheckEmp, string HMaker)
{
try
@@ -5395,16 +5395,16 @@
oSub.HBadQty = Pub_Class.ClsPub.isDoule(Ds.Tables[1].Rows[i]["HBadQty"]);
oCn.RunProc("Insert Into QC_POStockInCheckBillSub " +
- "(HInterID,HEntryID,,HBillNo_bak,HRemark" +
+ "(HInterID,HEntryID,HBillNo_bak,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue" +
- "HResult,HProcCheckEmp,HProcCheckTime" +
- "HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
+ ",HResult,HProcCheckEmp,HProcCheckTime" +
+ ",HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty" +
") " +
" values(" + oMain.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oMain.HBillNo + "','" + oSub.HRemark + "'" +
", " + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
", " + oSub.HQCCheckClassID.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCRelValue + "'" +
- ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + "',getdate()" +
+ ",'" + oSub.HResult + "'," + oSub.HProcCheckEmp.ToString() + ",getdate()" +
", " + oSub.HMaterID.ToString() + "," + oSub.HInStockQty.ToString() + "," + oSub.HCheckQty.ToString() + "," + oSub.HRightQty.ToString() + "," + oSub.HBadQty.ToString() +
") ");
}
@@ -5692,7 +5692,6 @@
if (isSuccess == 1)
{
string result = InvokeHelper.Save("QM_InspectBill", sJson); //淇濆瓨
-
sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
HReturn = result.ToString();
@@ -5716,6 +5715,24 @@
else
{
sRemark = sRemark + sJson;
+ // 鎻愪氦鍜屼繚瀛樺崟鎹�
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ var json = new
+ {
+ Ids = fID,
+ };
+
+ result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//瀹℃牳
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCn.RollBack();
+ sErrMsg = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ return false;
+ }
oCn.Commit();
}
}
@@ -14895,7 +14912,7 @@
[HttpGet]
public object get_BarCode_PackUnionCarryUp(int sInterID, string HBillType, string sBillNo, string sHBarCode_Pack, string sMaker, int HStockOrgID)
{
- var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, HBillType, sBillNo, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ var oBar = oWebs.get_BarCode_PackUnionCarryUp(sInterID, sBillNo, HBillType, sHBarCode_Pack, sMaker, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
if (oBar == null)
{
objJsonResult.code = "0";
@@ -14932,7 +14949,7 @@
else
{
objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
objJsonResult.data = oDs.Tables[0];
return objJsonResult;
--
Gitblit v1.9.1