From e0a8f74603658d4d9dcb581da75aa38d3834ea77 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 17 三月 2023 09:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 72 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 82ee30b..9412611 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -437,6 +437,7 @@
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
List<Model.ClsSc_StationOutBillMain> list = new List<Model.ClsSc_StationOutBillMain>();
@@ -454,8 +455,8 @@
oBill.omodel.HBillNo = msg3 + "- " + j;
oBill.omodel.HBillStatus = 0;
oBill.omodel.HMouldNum = list[i].HMouldNum;
- oBill.omodel.HYear = 2022;
- oBill.omodel.HPeriod = 1;
+ oBill.omodel.HYear = DateTime.Now.Year;
+ oBill.omodel.HPeriod = DateTime.Now.Month;
oBill.omodel.HRemark = list[i].HRemark;
oBill.omodel.HSourceName = list[i].HSourceName;
oBill.omodel.HPieceQty = list[i].HPieceQty;
@@ -508,6 +509,7 @@
oBill.omodel.HWorkTimes = list[i].HWorkTimes;
oBill.omodel.HQCCheckID = list[i].HQCCheckID;
oBill.omodel.HMaker = msg4;
+ oBill.omodel.HEmpNum = msg5;
//string HBillSubType = "3791";
//long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -1218,6 +1220,72 @@
}
#endregion
+ #region 鏍规嵁鍗曟嵁鍙� 鍚屾鎶ラ敊鍒犻櫎鍑虹珯鍗�
+ [Route("Cj_StationOutBill/DelStationOutBill")]
+ [HttpGet]
+ public object DelStationOutBill(string HInterID)
+ {
+ try
+ {
+ DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ DataTable DTable;
+ int num = 0;
+ //鍒ゆ柇鍏ュ簱鏄惁鍚屾
+ DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HInterID='" + HInterID + "' and HRelationQty=0", "Sc_StationOutBillMain").Tables[0];
+ if (DTable.Rows.Count != 0)
+ {
+ num++;
+ }
+ //鍒ゆ柇鏈鎶ュ簾鏄惁鍚屾
+ DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HProcExchInterID='" + DTable.Rows[0]["HProcExchInterID"].ToString() + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
+ if (DTable.Rows.Count != 0)
+ {
+ num++;
+ }
+
+ if (num == 2)
+ {
+ if (!oBill.DeleteBill(long.Parse(HInterID), 0, 0, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏃犻』鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 缂栬緫鍓嶅垽鏂�
[Route("Cj_StationOutBill/set_ShowBillJudge")]
[HttpGet]
--
Gitblit v1.9.1