From 1142525a181bdfebad871bf4a6191f2f637c94a5 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期三, 24 五月 2023 12:46:04 +0800
Subject: [PATCH] 白坯发布汇总、明细报表：列宽
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 112 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 099cf8e..9f00be0 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -10,6 +10,7 @@
using System.IO;
using System.Web;
using System.Web.Http;
+using System.Windows.Forms;
using WebAPI.Models;
namespace WebAPI.Controllers
@@ -39,6 +40,7 @@
//鍙嶅簭鍒楀寲
string msg2 = "[" + sArray[0].ToString() + "]";
string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
//鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
@@ -118,6 +120,7 @@
double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
+ double HmaterOutqty = list[0].HmaterOutqty;//鐧藉澂鍙戝竷
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HProcExchInterID <= 0)
{
@@ -176,14 +179,6 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HEmpID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
//if (HQCCheckID == 0)
//{
// objJsonResult.code = "0";
@@ -192,14 +187,42 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- //if (HSourceID == 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓嶄负榫欏北姹介厤
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤"&& oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�") //绯荤粺鍙傛暟
+ {
+ if (HSourceID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ else if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鍒ゆ柇鏄惁涓哄宸ヤ綅
+ ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 宸ュ簭ID = " + HProcID + " and 鐗╂枡ID = " + HMaterID + " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'", "h_v_GetStationOutBill_Detail");
+ if (ds != null && ds.Tables[0].Rows.Count <= 1)
+ {
+ if (HEmpID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔鍛樻病鏈夐�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ }
+
//if (HCenterID == 0)
//{
// objJsonResult.code = "0";
@@ -282,6 +305,7 @@
",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
+ ",HmaterOutqty" +
") " +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -291,7 +315,10 @@
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
- ") ");
+ ","+ HmaterOutqty + ") ");
+
+ LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板宸ュ簭鍑虹珯鍗曟嵁锛�" + HBillNo + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else if ("Modify".Equals(eventType))
{
@@ -324,6 +351,9 @@
",HWasterQty=" + HWasterQty +
",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) +
" where HInterID=" + HInterID);
+
+ LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭鍑虹珯鍗曟嵁锛�" + HBillNo + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
else
{
@@ -1590,7 +1620,7 @@
{
try
{
-
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, HDeleteMan))
{
@@ -1603,14 +1633,22 @@
DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
- if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (oSystemParameter.omodel.MES_StationOutBill_DeleteCtl == "Y")
+ {
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
}
+
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
DataSet ds;
@@ -1641,8 +1679,17 @@
return objJsonResult;
}
- //鍐欏叆鍒犻櫎鏃ュ織
- string WorkList = "鍒犻櫎鍑虹珯鍗曪細" + oBill.omodel.HBillNo;
+ ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");
+
+ if (ds.Tables[0].Rows[0][0].ToString()== "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
{
objJsonResult.code = "0";
@@ -1653,6 +1700,10 @@
}
else
{
+ //鍐欏叆鍒犻櫎鏃ュ織
+ LogService.Write("鐢ㄦ埛:" + HDeleteMan + ",鏃ユ湡:" + DateTime.Now + ",鍒犻櫎宸ュ簭鍑虹珯鍗曟嵁:" + oBill.omodel.HBillNo);
+ oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + HDeleteMan + "','" + HComputerName + "','" + "鍒犻櫎宸ュ簭鍑虹珯鍗曟嵁锛�" + oBill.omodel.HBillNo + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鍒犻櫎鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
@@ -2190,6 +2241,7 @@
List<ClsSc_StationOutBillSub_Emp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg2);
List<ClsSc_StationOutBillSub_Emp> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSc_StationOutBillSub_Emp>>(msg3);
+ long HInterID = mainList[0].HInterID;
long HWorkEmpID = subList[0].HWorkEmpID;
long HWorkSourceID = subList[0].HWorkSourceID;
decimal HQty = subList[0].HQty;
@@ -2197,21 +2249,23 @@
decimal HProcPrice = subList[0].HProcPrice;
decimal HMoney = subList[0].HMoney;
long HWorkProcID = mainList[0].HWorkProcID;
-
+ var EntryID = 0;
foreach (ClsSc_StationOutBillSub_Emp oSub in subList)
{
//ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ICMOBillList");
if ((OperationType == 1 || OperationType == 2))//鏂板 && ds.Tables[0].Rows.Count == 0
{
+ EntryID++;
+
string sql = string.Empty;
sql = $@"
Insert into Sc_StationOutBillSub_Emp
(HInterID,HEntryID,HBillNo_bak ,HRemark ,HSourceInterID
,HSourceEntryID ,HSourceBillNo ,HSourceBillType ,HRelationQty ,HRelationMoney
,HWorkEmpID ,HWorkSourceID ,HQty ,HRate ,HProcPrice ,HMoney ,HWorkProcID)
- values(" + 1 + "," + 2 + "," + "'" + mainList[0].HBillNo_bak + "','" + "HRemark" + "'," + 0 + "," + 0 + ",'" + " " + "','" + "HSource" + "'," +
- "0" + "," + 0 + "," + 0 + "," + 0 + "," + 0 + "," + 0 + "," + 0 + "," + 0 + "," + 0 + ")";
+ values(" + HInterID + "," + EntryID + "," + "'" + mainList[0].HBillNo_bak + "','" + mainList[0].HRemark + "'," + 0 + "," + 0 + ",'" + " " + "','" + " " + "'," +
+ "0" + "," + 0 + "," + oSub.HWorkEmpID + "," + oSub.HWorkSourceID + "," + oSub.HQty + "," + oSub.HRate + "," + oSub.HProcPrice + "," + oSub.HMoney + "," + HWorkProcID + ")";
oCN.RunProc(sql);
}
--
Gitblit v1.9.1