From ee9e9a2cf7c405637ad7c8f1e262ae39fff8a88a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 20 三月 2023 16:31:52 +0800
Subject: [PATCH] 收料通知单主表添加同步字段
---
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 4
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 135 ++++++++++++++++++++++++++++++++++++++++++++
Model/Model.csproj | 1
Model/车间管理/ClsSc_StationOutBillSub_Emp.cs | 20 ++++++
4 files changed, 156 insertions(+), 4 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index def7f4d..62e79e7 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -714,6 +714,7 @@
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationInBillSub.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub.cs" />
+ <Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Emp.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_StationOutBillSub_Item.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsSc_ABJJDMain.cs" />
<Compile Include="杞﹂棿绠＄悊\ClsWW_EntrustWorkOrderBillMain.cs" />
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillSub_Emp.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillSub_Emp.cs"
new file mode 100644
index 0000000..2cf43e0
--- /dev/null
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBillSub_Emp.cs"
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+
+namespace Model
+{
+ public class ClsSc_StationOutBillSub_Emp : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak; //鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ public Int64 HItemSubID; //鑷鍒�(GUID)
+ public Int64 HWorkEmpID; //鎿嶄綔鍛�(Gy_Employee)
+ public Int64 HWorkSourceID; //鐢熶骇璧勬簮(Gy_Source)
+ public decimal HQty ; //鐢熶骇鏁伴噺
+ public decimal HRate;//鍛樺伐绯绘暟
+ public decimal HProcPrice;//宸ヤ环
+ public decimal HMoney; //閲戦
+ public Int64 HWorkProcID; //宸ュ簭(Gy_Process)
+ }
+}
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 0ce78f0..d6ae83c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -573,13 +573,13 @@
,HMaker,HMakeDate,HChecker,HCheckDate,HOWNERTYPEID,HOWNERID
,HERPInterID,HERPBillType,HPURCHASEORGID,HSTOCKORGID,HREQUIREORGID
,HSTOCKGROUPID,HSENDBILLNO,HLADBILLNO,HPURDEPTID,HPURGROUPID,HSUPPLYID
-,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID)
+,HSETTLEID,HCHARGEID,HBUSINESSTYPE,HSUPPLYADDRESS,HCORRESPONDORGID,HPROVIDERCONTACTID,HCurID,HExRate,HAddress,HWHID,HInnerBillNo)
values(" + mainList[0].HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1103 + "','" +
mainList[0].HBillSubType + "','" + mainList[0].HDate + "','" + mainList[0].HBillNo + "'," + mainList[0].HBillStatus + "," + mainList[0].HSupID +
"," + mainList[0].HManagerID + "," + mainList[0].HEmpID + "," + mainList[0].HDeptID + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker +
"','" + mainList[0].HMakeDate + "','" + mainList[0].HChecker + "','" + mainList[0].HCheckDate + "','" + mainList[0].HOWNERTYPEID + "'," + mainList[0].HOWNERID + "," + mainList[0].HERPInterID + ",'" + mainList[0].HERPBillType + "'," + mainList[0].HPURCHASEORGID + "," + mainList[0].HSTOCKORGID + "," + mainList[0].HREQUIREORGID + "," +
mainList[0].HSTOCKGROUPID + ",'" + mainList[0].HSENDBILLNO + "','" + mainList[0].HLADBILLNO + "'," + mainList[0].HPURDEPTID + "," + mainList[0].HPURGROUPID + "," + mainList[0].HSUPPLYID + "," +
-mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + ")";
+mainList[0].HSETTLEID + "," + mainList[0].HCHARGEID + ",'" + mainList[0].HBUSINESSTYPE + "','" + mainList[0].HSUPPLYADDRESS + "'," + mainList[0].HCORRESPONDORGID + "," + mainList[0].HPROVIDERCONTACTID + "," + mainList[0].HCurID + "," + mainList[0].HExRate + ",'" + mainList[0].HAddress + "'," + mainList[0].HWHID + "," + mainList[0].HInnerBillNo + ")";
oCN.RunProc(sql);
//淇濆瓨涓昏〃
foreach (var oSub in subList)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 9412611..0d824de 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing Model;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
@@ -1639,7 +1640,137 @@
}
#endregion
+ #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曟槑缁嗗垪琛�
+ [Route("Cj_StationOutBill_Detail/get_Display2")]
+ [HttpGet]
+ public object get_Display2(string HMaterID, string HWorkProcID, string HProcExchBillNo)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_GetStationOutBill_Detail where 宸ュ簭ID = " + HWorkProcID + " and 鐗╂枡ID = " + HMaterID + " and 娴佽浆鍗″彿 = '" + HProcExchBillNo + "'" , "h_v_GetStationOutBill_Detail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭鍑虹珯姹囨姤鍗曟槑缁嗕俊鎭幏鍙栧け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
-
+ #region 鏄庣粏 淇濆瓨/缂栬緫鍔熻兘
+ //[Route("Cj_StationOutBill/AddBill_Detail")]
+ //[HttpPost]
+ //public object AddBill_Detail([FromBody] JObject sMain)
+ //{
+ // try
+ // {
+ // var _value = sMain["sMainSub"].ToString();
+ // string msg1 = _value.ToString();
+ // oCN.BeginTran();
+ // //淇濆瓨涓昏〃
+ // objJsonResult = Add_Detail(msg1);
+ // if (objJsonResult.code == "0")
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = objJsonResult.Message;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // oCN.Commit();
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+
+ // }
+ // catch (Exception e)
+ // {
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+
+ //public json Add_Detail(string msg1)
+ //{
+ // string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ // string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ // string msg3 = sArray[1].ToString(); //琛ㄤ綋鏁版嵁
+ // int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ // string user = sArray[3].ToString(); //鐢ㄦ埛鍚�
+ // try
+ // {
+ // 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 HWorkEmpID = subList[0].HWorkEmpID;
+ // long HWorkSourceID = subList[0].HWorkSourceID;
+ // decimal HQty = subList[0].HQty;
+ // decimal HRate = subList[0].HRate;
+ // decimal HProcPrice = subList[0].HProcPrice;
+ // decimal HMoney = subList[0].HMoney;
+ // long HWorkProcID = mainList[0].HWorkProcID;
+
+ // 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)//鏂板
+ // {
+ // //涓昏〃
+ // oCN.RunProc(@"Insert Into Sc_StationOutBillSub_Emp
+ // (HBillNo_bak ,HCloseMan ,HEntryCloseDate ,HCloseType ,HRemark ,HSourceInterID
+ // ,HSourceEntryID ,HSourceBillNo ,HSourceBillType ,HRelationQty ,HRelationMoney
+ // ,HWorkEmpID ,HWorkSourceID ,HQty ,HRate ,HProcPrice
+ // ,HMoney ,HWorkProcID)
+ // values('3710',1," + HInterID + ",'" + HBillNo + "','" + HDate + "'," + HPRDORGID +
+ // "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ // ",'" + HSeOrderBillNo + "'," + HSeOrderInterID + "," + HSeOrderEntryID + "," + HEmpID + "," + HCusID +
+ // "," + HCenterID + ",0,0,0,0," + HBomID + ",'','') ");
+ // }
+ // }
+
+ // objJsonResult.code = "1";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = null;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // catch (Exception e)
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + e.ToString();
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ //}
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1