From 2eb2ec9a874154abda42c54b56ed0317a6ce81c4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 22 三月 2023 16:42:45 +0800
Subject: [PATCH] 页面优化
---
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 1056 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 1,004 insertions(+), 52 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index ac6d135..62bbee0 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -58,7 +59,7 @@
long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
int HBillStatus = 0;
- string HMaker = list[0].HMaker;//鍒跺崟浜�
+ string HMaker = user;//鍒跺崟浜�
string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
int HYear = 2021;
double HPeriod = 1;
@@ -99,7 +100,7 @@
double HMoney = 0;
double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
- long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
@@ -115,6 +116,7 @@
double HPriceRate = list[0].HPriceRate;//绯绘暟
double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+ long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HProcExchInterID <= 0)
{
@@ -132,7 +134,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HProcNo <= 0)
+ if (HProcNo == "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -156,14 +158,14 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HGroupID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HGroupID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇鐝粍娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HProcID == 0)
{
@@ -181,30 +183,30 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HQCCheckID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HSourceID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- if (HCenterID == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ヤ綔涓績娌℃湁閫夋嫨锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (HQCCheckID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "妫�楠屽憳娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //if (HSourceID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熶骇璧勬簮娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //if (HCenterID == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "宸ヤ綔涓績娌℃湁閫夋嫨锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (HQty + HWasterQty <= 0)
{
objJsonResult.code = "0";
@@ -213,14 +215,15 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HWorkTimes <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+
+ //if (HWorkTimes <= 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "宸ユ椂蹇呴』澶т簬0锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//if (HEmpID2 == 0 )
//{
// objJsonResult.code = "0";
@@ -253,10 +256,13 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ var num = 0;
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
if ("Add".Equals(eventType))
{
+ num = 1;
if (!AllowbillNo(HBillNo))
{
oCN.RollBack();
@@ -274,7 +280,7 @@
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
- ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
") " +
" values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -283,11 +289,12 @@
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
"," + 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 +
+ "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
") ");
}
else if ("Modify".Equals(eventType))
{
+ num = 2;
oCN.RunProc("UpDate Sc_StationOutBillMain set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
@@ -356,21 +363,60 @@
objJsonResult.data = null;
return objJsonResult;
}
- oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ","+ num + "");
oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
" inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
- if (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc == false)
+ //鍒ゆ柇鏄惁鏄柊澧�
+ if ("Add".Equals(eventType))
{
-
+ //鍒ゆ柇鏄惁鏄湯閬撳伐搴�
+ if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "鏄�")
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string Return = "";
+ if (oSystemParameter.ShowBill(ref Return))
+ {
+ //鍒ゆ柇鏈亾 鐢熶骇姹囨姤姹囨姤 鏄惁鍕鹃��
+ if (oSystemParameter.omodel.MES_StationOutBill_LastAutoICMOReport == "Y") //绯荤粺鍙傛暟
+ {
+ //鍚屾鐢熶骇姹囨姤鍗�
+ objJsonResult= (json)SaveICMOReportBill(HInterID.ToString(), user, HBillNo, HPRDOrgID.ToString());
+ if (objJsonResult.count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒ゆ柇鏈亾 鐢熶骇鍏ュ簱 鏄惁鍕鹃��
+ else if (oSystemParameter.omodel.MES_StationOutBill_AutoStockIn == "Y") //绯荤粺鍙傛暟
+ {
+ //鍚屾鐢熶骇鍏ュ簱鍗�
+ objJsonResult=(json)SaveProcdutInBill(HBillNo);
+ if (objJsonResult.count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+ }
}
- else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "鏄�")
- {
- }
+
+
oCN.Commit();
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
@@ -392,6 +438,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -399,6 +446,713 @@
return objJsonResult;
}
}
+
+ #region 鏈亾宸ュ簭 鐢熶骇姹囨姤
+ public object SaveICMOReportBill(string InterID, string user, string BillNo, string OrganizationID)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //鑾峰彇缁勭粐浠ｇ爜
+ string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
+ //鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
+ DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
+ if (ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鐢熶骇姹囨姤鍗曡繃绋嬩腑娌℃湁鏌ヨ鍒板嚭绔欏崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DataRow dr = ds.Tables[0].Rows[0];
+
+ //淇濆瓨
+ //oCN.BeginTran();
+ DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
+ if (DsTable.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸插叆搴�,璇蜂笉瑕侀噸澶嶅叆搴�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鐢熶骇姹囨姤鍗曚富琛�
+ oCN.RunProc("Insert Into Sc_ICMOReportBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
+ ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
+ ",HGroupID,HDeptID,HDeptNumber" +
+ ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
+ ") " +
+ " values('3711','3711'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ ",DATENAME(YEAR,GETDATE()),0,'','" + dr["HEmpID"].ToString() + "','" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() +
+ "','" + dr["HGroupID"].ToString() + "',0,''" +
+ ",'" + BillNo.ToString() + "'," + InterID.ToString() + ", 0,'3791'" +
+ ") ");
+ //鐢熶骇姹囨姤鍗曞瓙琛�
+ oCN.RunProc("Insert into Sc_ICMOReportBillSub " +
+ " (HInterID,HEntryID,HMaterID,HMaterNumber" +
+ ",HQty,HUnitID,HUnitNumber,HTimes,HSourceID" +
+ ",HQtyMust,HWorkerID,HWorkerNumber,HBadCount,HWasterQty," +
+ "HCloseMan,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HICMOInterID,HICMOBillNo,HBarCode" +
+ ") values("
+ + HInterID.ToString() + ",1," + dr["HMaterID"].ToString() + ",'" + dr["浜у搧浠ｇ爜"].ToString() + "'" +
+ "," + dr["鍚堟牸鏁伴噺"].ToString() + ",0,'',0,0" +
+ "," + dr["鎺ユ敹鏁伴噺"].ToString() + "," + dr["HEmpID"].ToString() + ",'" + dr["鎿嶄綔鍛樹唬鐮�"].ToString() + "'," + dr["涓嶈壇鏁伴噺"].ToString() + "," + dr["鎶ュ簾鏁伴噺"].ToString() +
+ ",'',0,''" +
+ "," + InterID.ToString() + ",0,'" + BillNo.ToString() + "','3791',0,0" +
+ ",0,0,''" +
+ "," + dr["HICMOInterID"].ToString() + ",'" + dr["浠诲姟鍗�"].ToString() + "',''" +
+ ") ");
+ //鍚屾閲戣澏
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鏍规嵁浠诲姟鍗曟煡鎵惧埌閲戣澏鐨勭敓浜ц鍗�
+ DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERP_StationOutBillList_LastProc where HICMOEntryID=" + dr["HICMOEntryID"].ToString(), "h_v_TOERP_StationOutBillList_LastProc");
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+
+ JObject model = new JObject();
+ model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
+ model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
+ model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
+ model.Add("FBillNo", HBillNo);
+
+ JArray Fentity = new JArray();
+
+ foreach (DataRow item in ds.Tables[0].Rows)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FIsNew", false);// 婧愬崟绫诲瀷
+ FentityModel.Add("FReportType", new JObject() { ["Fnumber"] = dr1["FREPORTTYPENUMBER"].ToString() });//鐢熶骇姹囨姤绫诲瀷
+ FentityModel.Add("FSrcBillType", "PRD_MO");// 婧愬崟绫诲瀷
+ FentityModel.Add("FProductType", "1");// 浜у搧绫诲瀷
+ FentityModel.Add("FSrcBillNo", item["浠诲姟鍗�"].ToString());// 婧愬崟缂栧彿
+ FentityModel.Add("FSrcInterId", dr1["FMOID"].ToString());// 婧愬崟鍐呯爜
+ FentityModel.Add("FSrcEntryId", dr1["FMOENTRYID"].ToString());// 婧愬崟鍒嗗綍鍐呯爜銆�
+ FentityModel.Add("FSRCENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());// 婧愬崟鍒嗗綍琛屽彿
+ FentityModel.Add("FUNITID", new JObject() { ["Fnumber"] = dr1["FUNITNUMBER"].ToString() });//鍗曚綅
+ FentityModel.Add("FTimeUnitId", "1");//鏃堕棿鍗曚綅
+ FentityModel.Add("FWorkshipId", new JObject() { ["Fnumber"] = dr1["FWorkShopNUM"].ToString() }); // 鐢熶骇杞﹂棿
+ FentityModel.Add("FStandHourUnitId", "3600"); // 鍗曚綅鏍囧噯宸ユ椂鍗曚綅
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = dr1["FMaterialNUM"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
+ FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
+ FentityModel.Add("FFinishQty", item["鎺ユ敹鏁伴噺"].ToString());//瀹屾垚鏁伴噺1
+ FentityModel.Add("FQuaQty", item["鍚堟牸鏁伴噺"].ToString());//鍚堟牸鏁伴噺1FFailQty
+ FentityModel.Add("FFailQty", item["涓嶈壇鏁伴噺"].ToString());//涓嶅悎鏍兼暟閲�
+ FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 鍏ュ簱缁勭粐
+ FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
+ FentityModel.Add("FMOID", dr1["FMOID"].ToString());//
+ FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());//
+ FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
+ FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());//
+ FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
+ FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
+ FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
+ FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
+ FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
+ //FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
+ FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
+ FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
+ FentityModel2.Add("FEntity_Link_FFlowLineId", "PRD_MO2MORPT");
+ FentityModel2.Add("FEntity_Link_FRuleId", "3");
+ FentityModel2.Add("FEntity_Link_FSTableId", "0");
+ FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MOENTRY");
+ FentityModel2.Add("FEntity_Link_FSBillId", dr1["FMOID"].ToString());
+ FentityModel2.Add("FEntity_Link_FSId", dr1["FMOENTRYID"].ToString());
+ FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["鍚堟牸鏁伴噺"].ToString());
+ FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["鍚堟牸鏁伴噺"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FEntity_Link", Fentity2);
+ FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
+ Fentity.Add(FentityModel);
+ }
+ model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+
+ string result = InvokeHelper.Save("PRD_MORPT", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("宸ュ簭姹囨姤鍗曞叆搴撻敊璇痡sonRoot:" + jsonRoot);
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"宸ュ簭姹囨姤鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{dr["鍗曟嵁鍙�"].ToString()}" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦瀹℃牳
+ 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("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+
+ //oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏈亾宸ュ簭 鐢熶骇鍏ュ簱
+ public object SaveProcdutInBill(string BillNo)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID("1202", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("1202", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ ////鍒ゆ柇鍏ュ簱鐨勫悎鏍兼暟閲忔槸鍚︿负0
+ //var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
+
+ //if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
+ //{
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 2;
+ // objJsonResult.Message = "鍚堟牸鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //淇濆瓨
+ //oCN.BeginTran();
+
+ //鍚屾閲戣澏
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc_Mes '" + BillNo + "'", "h_p_TOERPProcduct_LastProc_Mes");
+ DataRow dr1 = ds1.Tables[0].Rows[0];
+ if (double.Parse(dr1[0].ToString()) <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈壘鍒板搴旂殑鐢熶骇姹囨姤鍗曡褰�;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ JObject model = new JObject();
+ model.Add("FBillType", new JObject() { ["FNumber"] = "SCRKD01_SYS" }); //鍗曟嵁绫诲瀷
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ model.Add("FStockOrgId", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //搴撳瓨缁勭粐浠ｇ爜
+ model.Add("FPrdOrgId", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //鐢熶骇缁勭粐浠ｇ爜
+ model.Add("FOwnerTypeId0", "BD_OwnerOrg");
+ model.Add("FOwnerId0", new JObject() { ["FNumber"] = dr1["HPrdOrgNumber"].ToString() }); //
+ model.Add("FIsEntrust", "false");//
+ model.Add("FCurrId", new JObject() { ["FNumber"] = "PRE001" }); //
+ model.Add("FBillNo", BillNo);
+
+ JArray Fentity = new JArray();
+
+ foreach (DataRow item in ds1.Tables[0].Rows)
+ {
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FSrcEntryId", item["HSourceEntryID"].ToString());// 婧愬崟鍒嗗綍鍐呯爜銆�
+ FentityModel.Add("FIsNew", "false");// 婧愬崟绫诲瀷
+ FentityModel.Add("FMaterialId", new JObject() { ["FNumber"] = item["HMaterNumber"].ToString() }); // 鐗╂枡缂栫爜
+ FentityModel.Add("FCheckProduct", "false");//
+ FentityModel.Add("FInStockType", "1");//
+ FentityModel.Add("FProductType", "1");//
+ FentityModel.Add("FUNITID", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//鍗曚綅
+ FentityModel.Add("FMustQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FRealQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FCostRate", "100");//
+ FentityModel.Add("FBaseUnitId", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//鍗曚綅
+ FentityModel.Add("FBaseMustQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FBaseRealQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
+ FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //鎵瑰彿
+ FentityModel.Add("FISBACKFLUSH", "true");//
+ FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); // 鐢熶骇杞﹂棿
+ FentityModel.Add("FMOBILLNO", item["HMOBillNo"].ToString());//
+ FentityModel.Add("FMoId", item["HICMOInterID"].ToString());//鐢熶骇璁㈠崟鍐呯爜
+ FentityModel.Add("FMoEntryId", item["HMOEntryID"].ToString());//
+ FentityModel.Add("FMoEntrySeq", item["HMOEntrySEQ"].ToString());//鐢熶骇璁㈠崟琛屽彿
+ FentityModel.Add("FStockUnitId", new JObject() { ["FNumber"] = item["HUnitNumber"].ToString() });//搴撳瓨鍗曚綅
+ FentityModel.Add("FStockRealQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FSrcBillType", "PRD_MORPT");//
+ FentityModel.Add("FSrcBillNo", item["HSourceBillNo"].ToString());//
+ FentityModel.Add("FSrcInterId", item["HSourceInterID"].ToString());//
+ FentityModel.Add("FBasePrdRealQty", item["鏁伴噺"].ToString());//
+ FentityModel.Add("FIsFinished", "false");//
+ FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT01_SYS" }); //
+ FentityModel.Add("FSrcEntrySeq", item["HSourceSeQ"].ToString());// 婧愬崟鍒嗗綍琛屽彿
+ FentityModel.Add("FMOMAINENTRYID", item["HMOEntryID"].ToString());//
+ FentityModel.Add("FKeeperTypeId", "BD_KeeperOrg");
+ FentityModel.Add("FKeeperId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
+ FentityModel.Add("FIsOverLegalOrg", "false");//
+ FentityModel.Add("F_bsv_Base1", new JObject() { ["FNumber"] = item["HBZBS"].ToString() });//
+ FentityModel.Add("F_BSV_TEXT", item["HLZKH"].ToString());//
+ FentityModel.Add("F_BSV_TEXT1", item["HWYID"].ToString());//
+ //鎵瑰彿
+ //FFLOWID FFLOWLINEID FRULEID FSTABLENAME
+ //f6e6eec3 - 5267 - 4f02 - 8593 - b633da508a72 3 PRD_MO2MORPT T_PRD_MOENTRY
+ //涓氬姟娴佺▼鍥撅細FEntity_Link_FFlowId
+ //鎺ㄨ繘璺嚎锛欶Entity_Link_FFlowLineId
+ //杞崲瑙勫垯锛欶Entity_Link_FRuleId
+ //婧愬崟琛ㄥ唴鐮侊細FEntity_Link_FSTableId
+ //婧愬崟琛細FEntity_Link_FSTableName
+ //婧愬崟鍐呯爜锛欶Entity_Link_FSBillId
+ //婧愬崟鍒嗗綍鍐呯爜锛欶Entity_Link_FSId
+ //鍘熷鎼哄甫閲忥細FEntity_Link_FBaseQuaQtyOld
+ //淇敼鎼哄甫閲忥細FEntity_Link_FBaseQuaQty
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
+ FentityModel2.Add("FEntity_Link_FFlowLineId", "5");
+ FentityModel2.Add("FEntity_Link_FRuleId", "PRD_MORPT2INSTOCK");
+ FentityModel2.Add("FEntity_Link_FSTableName", "T_PRD_MORPTENTRY");
+ FentityModel2.Add("FEntity_Link_FSTableId", "0");
+ FentityModel2.Add("FEntity_Link_FSBillId", item["HSourceInterID"].ToString());
+ FentityModel2.Add("FEntity_Link_FSId", item["HSourceEntryID"].ToString());
+ FentityModel2.Add("FEntity_Link_FBasePrdRealQtyOld", item["鍏宠仈鏁伴噺"].ToString());
+ FentityModel2.Add("FEntity_Link_FBasePrdRealQty", item["鏁伴噺"].ToString());
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FEntity_Link", Fentity2);
+ FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
+ Fentity.Add(FentityModel);
+
+
+ //Fentity.Add(FentityModel);
+ }
+ model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ //["IsDeleteEntry"] = "true",
+ //["SubSystemId"] = "",
+ //["IsVerifyBaseDataField"] = "false",
+
+
+ ["IsDeleteEntry"] = "true",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "true",
+ ["IsEntryBatchFill"] = "false",
+ ["ValidateFlag"] = "true",
+ ["NumberSearch"] = "true",
+ ["IsAutoAdjustField"] = "false",
+ ["InterationFlags"] = "",
+ ["IgnoreInterationFlag"] = "",
+
+
+
+
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+
+ string result = InvokeHelper.Save("PRD_INSTOCK", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鐢熶骇鍏ュ簱閿欒jsonRoot:" + jsonRoot);
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鐢熶骇鍏ュ簱鍗曞悓姝ラ噾铦朵簯澶辫触锛佸崟鍙�:{HBillNo.ToString()}" + result + jsonRoot;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦瀹℃牳
+ 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("PRD_INSTOCK", JsonConvert.SerializeObject(json));//鎻愪氦
+ //result2 = InvokeHelper.Audit("PRD_INSTOCK", JsonConvert.SerializeObject(json));//鎻愪氦
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鐢熶骇鍏ュ簱鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+
+ //oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-鎵归噺鍑虹珯鍗曚繚瀛樻寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationOutBill/AddBill_Mul")]
+ [HttpPost]
+ public object AddBill_Mul([FromBody] JObject oMain)
+ {
+
+
+ string UserName = "";
+
+
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ 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>();
+
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ ListModels oListModels = new ListModels();
+ list = oListModels.getObjectByJson_Sc_StationOutBillMain(msg2);
+ int i = 0;
+ int j = 0;
+ foreach (Model.ClsSc_StationOutBillMain oItemSub in list)
+ {
+ DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+ j++;
+ oBill.omodel.HInterID = list[i].HInterID;
+ oBill.omodel.HBillNo = msg3 + "- " + j;
+ oBill.omodel.HBillStatus = 0;
+ oBill.omodel.HMouldNum = list[i].HMouldNum;
+ 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;
+ oBill.omodel.HWasterQty = list[i].HWasterQty;
+ oBill.omodel.HPlanPieceQty = list[i].HPlanPieceQty;
+ oBill.omodel.HBadPNL = list[i].HBadPNL;
+ oBill.omodel.HICMOInterID = list[i].HICMOInterID;
+ oBill.omodel.HICMOBillNo = list[i].HICMOBillNo;
+ oBill.omodel.HProcExchInterID = list[i].HProcExchInterID;
+ oBill.omodel.HProcExchEntryID = list[i].HProcExchEntryID;
+ oBill.omodel.HProcExchBillNo = list[i].HProcExchBillNo;
+ oBill.omodel.HMaterID = list[i].HMaterID;
+ oBill.omodel.HProcID = list[i].HProcID;
+ oBill.omodel.HICMOQty = list[i].HICMOQty;
+ oBill.omodel.HPlanQty = list[i].HPlanQty;
+ oBill.omodel.HStationOutTime = list[i].HStationOutTime;
+ oBill.omodel.HSourceID = list[i].HSourceID;
+ oBill.omodel.HPayProcID = list[i].HPayProcID;
+ oBill.omodel.HGroupID = list[i].HGroupID;
+ oBill.omodel.HDeptID = list[i].HDeptID;
+ oBill.omodel.HEmpID = list[i].HEmpID;
+ oBill.omodel.HBarCode = list[i].HBarCode;
+ oBill.omodel.HAddr = list[i].HAddr;
+ //oBill.omodel.HBarCodeMaker = list[i].HBarCodeMaker;
+ oBill.omodel.HBarCodeMaker = msg4;
+ oBill.omodel.HSourceID2 = list[i].HSourceID2;
+ oBill.omodel.HSourceID3 = list[i].HSourceID3;
+ oBill.omodel.HSourceID4 = list[i].HSourceID4;
+ oBill.omodel.HSourceID5 = list[i].HSourceID5;
+ oBill.omodel.HSupID = list[i].HSupID;
+ oBill.omodel.HQty = list[i].HQty;
+ oBill.omodel.HPrice = list[i].HPrice;
+ oBill.omodel.HMoney = list[i].HMoney;
+ oBill.omodel.HBadCount = list[i].HBadCount;
+ oBill.omodel.HCenterID = list[i].HCenterID;
+ oBill.omodel.HProcNo = list[i].HProcNo;
+ oBill.omodel.HOrderProcNO = list[i].HOrderProcNO;
+ oBill.omodel.HSourceNameList = list[i].HSourceNameList;
+ oBill.omodel.HMainSourceInterID = list[i].HMainSourceInterID;
+ oBill.omodel.HMainSourceBillNo = list[i].HMainSourceBillNo;
+ oBill.omodel.HMainSourceBillType = list[i].HMainSourceBillType;
+ oBill.omodel.HLastSubProc = true;
+ oBill.omodel.HEmpID2 = list[i].HEmpID2;
+ oBill.omodel.HEmpID3 = list[i].HEmpID3;
+ oBill.omodel.HEmpID4 = list[i].HEmpID4;
+ oBill.omodel.HEmpID5 = list[i].HEmpID5;
+ oBill.omodel.HDSQty = list[i].HDSQty;
+ oBill.omodel.HChongQty = list[i].HChongQty;
+ oBill.omodel.HPriceRate = list[i].HPriceRate;
+ 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
+ //string HBillNo = msg3 + "- " + i;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ //int HBillStatus = 0;
+ //string HMaker = list[0].HMaker;//鍒跺崟浜�
+ //string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
+ //int HYear = 2021;
+ //double HPeriod = 1;
+ //string HRemark = list[0].HRemark;//澶囨敞
+ //string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ //double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
+ //double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
+ //double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
+ //double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
+ //long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ //string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ //int HProcPlanInterID = 0;
+ //int HProcPlanEntryID = 0;
+ //string HProcPlanBillNo = "";
+ //long HProcExchInterID = list[0].HProcExchInterID;
+ //long HProcExchEntryID = list[0].HProcExchEntryID;
+ //string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ //long HMaterID = list[0].HMaterID;//浜у搧ID
+ //long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
+ //double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ //double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
+ //DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
+ //long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ //long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭ID
+ //long HGroupID = list[0].HGroupID;//鐝粍ID
+ //long HDeptID = 0;
+ //long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
+ //string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+ //string HAddr = "";
+ //string HBarCodeMaker = "";
+ //long HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
+ //long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
+ //long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
+ //long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
+ //long HSupID = 0;
+ //double HQty = list[0].HQty;//鍚堟牸鏁伴噺
+ //double HPrice = 0;
+ //double HMoney = 0;
+ //double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
+ //long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ //long HProcNo = list[0].HProcNo;//娴佹按鍙�
+ //string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ //string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
+ //long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ //string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ //string HMainSourceBillType = "3790";
+ //bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
+ //long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
+ //long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
+ //long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
+ //long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
+ //double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
+ //double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
+ //double HPriceRate = list[0].HPriceRate;//绯绘暟
+ //double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
+ //long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.RunProc($"update Sc_StationOutBillMain set HMaker='{msg4}' where HInterID={oBill.omodel.HInterID}");
+ i++;
+ //if (bResult)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ // //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ //閫掑叆鐗╂枡淇℃伅 杩斿洖鏈畬鍏ㄦ眹鎶ョ殑娴佽浆鍗�
+ [Route("LEMS/Sc_StationOutBill_Mul_RYQ")]
+ [HttpGet]
+ public object Sc_StationOutBill_Mul_RYQ(String HMaterName, Int64 HOrgID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds = oCN.RunProcReturn("exec h_p_CJGXPLHB_Query '" + HMaterName + "'," + HOrgID + "", "h_p_CJGXPLHB_Query");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //閫変腑缃戞牸閲岄潰鐨勬煇涓�琛屾祦杞崱 杩斿洖璇ユ祦杞崱鐨勮繘鍑虹珯鎯呭喌
+ [Route("LEMS/Mul_RYQ_DisPlayBillList")]
+ [HttpGet]
+ public object Mul_RYQ_DisPlayBillList(String HBillNo,String HProcName)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds = oCN.RunProcReturn("exec h_P_Mul_RYQ_DisPlayBillList '" + HBillNo + "','" + HProcName + "'", "h_P_Mul_RYQ_DisPlayBillList");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
private bool AllowbillNo(string HBillNo)
{
@@ -418,6 +1172,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
{
@@ -439,11 +1194,20 @@
ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
}
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
//}
@@ -621,6 +1385,126 @@
return Result_Ob;
}
+
+
+
+
+ [Route("Cj_StationOutBill/UploadFile2")]
+ [HttpPost]
+ public object UploadFile2()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/" + HBillNo);
+ //string path = @"D:\\Files\\"+ HBillNo;
+ dynamic dyResult = UpLoadFile1(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UpLoadFile1(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + fileurl.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
/// <summary>
/// 杈撳嚭json缁撴灉 杩斿洖2涓�� result (杈撳嚭succes鐨勫��) returnval (杈撳嚭str鐨勫��)
/// </summary>
@@ -784,6 +1668,72 @@
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/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)
{
@@ -1149,5 +2099,7 @@
}
#endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1