From 0a40c3c64b284488bff08ab93b15340d5bfdc580 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 03 十一月 2025 16:21:36 +0800
Subject: [PATCH] 单品过站接口开发
---
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 5c2a306..05c1b76 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -2512,7 +2512,7 @@
omodel = JsonConvert.DeserializeObject<StationBill>(sMainStr);
//鍒ゆ柇鏄惁鏈夊搴旀祦杞崱淇℃伅骞惰幏鍙�
- ds = oCN.RunProcReturn(@"exec h_p_Sc_ProcessExchangeBillList '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_ProcessExchangeBillList");
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_ProcessExchangeBillList_XW '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_ProcessExchangeBillList");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -2564,7 +2564,7 @@
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-039]鏉＄爜:" + barCode_SN + ",宸插瓨鍦�!";
+ objJsonResult.Message = "[0000-2-039]鏉＄爜:" + barCode_SN + ",宸插嚭绔�!";
objJsonResult.data = null;
return objJsonResult;
}
@@ -2638,7 +2638,7 @@
double HProcPriceRate = 0;//宸ヤ环绯绘暟
int HTemporaryAreaID = 0;//鏆傛斁鍖�
int HShiftsID = 0;
-
+ string HBatchNo = omodel.HBatchNo;
//鑾峰彇褰撳墠鐝
//DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
//if (set.Tables[0].Rows.Count > 0)
@@ -2675,8 +2675,8 @@
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + omodel.HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
- oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)
- values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{barCode_SN}', 1, GETDATE(), '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + "', '', 0, 0)");
+ oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HBatchNo)
+ values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{barCode_SN}', 1, GETDATE(), '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + $"', '', 0, 0,'{HBatchNo}')");
//鎶婃潯鐮佸啓鍏ユ棩蹇楅噷闈�
LogService.CustomWriteLog("鏉＄爜:" + barCode_SN + ",宸ュ簭:" + HProcID + ",鍑虹珯鏃堕棿:" + DateTime.Now, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));
@@ -2769,7 +2769,7 @@
}
else
{
- string sql1 = "select Top 1000 * from h_v_MES_StationOutBillList where 1 = 1 ";
+ string sql1 = "select Top 1000 * from h_v_Sc_SingleStationOutBillList where 1 = 1 ";
string sql = sql1 + sWhere + " order by hmainid desc";
ds = oCN.RunProcReturn(sql, "h_v_Sc_SingleStationOutBillList");
}
--
Gitblit v1.9.1