From 65253da4cbb0ff0dd4a4d69b8b36360e48428398 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 06 五月 2022 10:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
similarity index 89%
rename from "WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Cg_PODemandPlanBillController.cs"
rename to "WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index 7cbefd5..a5c7176 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -9,17 +9,17 @@
namespace WebAPI.Controllers.SCGL
{
- public class Cg_PODemandPlanBillController : ApiController
+ public class JIT_Cg_PODemandPlanBillController : ApiController
{
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- Cg_PODemandPlanBillMain omdelMian = new Cg_PODemandPlanBillMain();
- List<Cg_PODemandPlanBillSub> omodelsub = new List<Cg_PODemandPlanBillSub>();
+ JIT_Cg_PODemandPlanBillMain omdelMian = new JIT_Cg_PODemandPlanBillMain();
+ List<JIT_Cg_PODemandPlanBillSub> omodelsub = new List<JIT_Cg_PODemandPlanBillSub>();
#region 鎻愭枡璁″垝鍗� 鍒楄〃
- [Route("Cg_PODemandPlanBill/Cg_PODemandPlanBillList")]
+ [Route("JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList")]
[HttpGet]
public object Cg_PODemandPlanBillList(string sWhere, string user)
{
@@ -55,7 +55,7 @@
#endregion
#region 鎻愭枡璁″垝鍗� 娣诲姞/淇敼
- [Route("Cg_PODemandPlanBill/AddPODemandPlanBillList")]
+ [Route("JIT_Cg_PODemandPlanBill/AddPODemandPlanBillList")]
[HttpPost]
public object AddPODemandPlanBillList([FromBody] JObject sMainSub)
{
@@ -101,14 +101,14 @@
return objJsonResult;
}
- omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Cg_PODemandPlanBillMain>(msg2);
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<JIT_Cg_PODemandPlanBillMain>(msg2);
string BillType = "4608";
if (OperationType == 1)//鏂板
{
//涓昏〃
- oCN.RunProc("insert into Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
",HBillSubType,HDate,HBillStatus,HMaker,HMakeDate" +
",HSubORGID ,HAddress,HPURCHASEORGID,HSupplierID ,HSettleCurrId" +
",HRemark,HExplanation)" +
@@ -120,7 +120,7 @@
else if (OperationType == 3)
{
//淇敼
- oCN.RunProc($"update Cg_PODemandPlanBillMain set HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
+ oCN.RunProc($"update JIT_Cg_PODemandPlanBillMain set HDate='{omdelMian.HDate}',HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
$",HSubORGID={omdelMian.HSubORGID},HAddress='{omdelMian.HAddress}',HPURCHASEORGID={omdelMian.HPURCHASEORGID}" +
$",HSupplierID={omdelMian.HSupplierID},HSettleCurrId={omdelMian.HSettleCurrId}" +
$",HRemark='{omdelMian.HRemark}',HExplanation='{omdelMian.HExplanation}' where HInterID={omdelMian.HInterID}");
@@ -159,16 +159,16 @@
//鑾峰彇琛ㄦ牸鏁版嵁
ds = oCN.RunProcReturn($"select * from h_v_JIT_Cg_PODemandPlanBillList where 鍗曟嵁鍙�='{omdelMian.HBillNo}'", "h_v_JIT_Cg_PODemandPlanBillList");
//鍒犻櫎瀛愯〃
- oCN.RunProc("delete from Cg_PODemandPlanBillSub where HInterID='" + omdelMian.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
+ oCN.RunProc("delete from JIT_Cg_PODemandPlanBillSub where HInterID='" + omdelMian.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
}
- omodelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Cg_PODemandPlanBillSub>>(msg3);
+ omodelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JIT_Cg_PODemandPlanBillSub>>(msg3);
int i = 1;
//鎻掑叆瀛愯〃
- foreach (Models.Cg_PODemandPlanBillSub oSub in omodelsub)
+ foreach (Models.JIT_Cg_PODemandPlanBillSub oSub in omodelsub)
{
- oCN.RunProc("insert into Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
+ oCN.RunProc("insert into JIT_Cg_PODemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
", HPURCHASEORGID, HStatus, HFixleadTime, HDayPlanBillNo, HSourceInterID" +
", HSourceEntryID, HSourceBillNo, HSourceBillType, HWorkShopID, HDayPlanDate" +
@@ -199,7 +199,7 @@
#endregion
#region 鎻愭枡璁″垝鍗� 鍒犻櫎
- [Route("Cg_PODemandPlanBill/DelPODemandPlanBillList")]
+ [Route("JIT_Cg_PODemandPlanBill/DelPODemandPlanBillList")]
[HttpGet]
public object DelPODemandPlanBillList(string HInterID, string HEntryID, string User)
{
@@ -232,9 +232,9 @@
if (ds.Tables[0].Rows.Count == 1)
{
- oCN.RunProc($"delete from Cg_PODemandPlanBillMain where HInterID={HInterID}");
+ oCN.RunProc($"delete from JIT_Cg_PODemandPlanBillMain where HInterID={HInterID}");
}
- oCN.RunProc($"delete from Cg_PODemandPlanBillSub where HInterID={HInterID} and HEntryID={HEntryID}");
+ oCN.RunProc($"delete from JIT_Cg_PODemandPlanBillSub where HInterID={HInterID} and HEntryID={HEntryID}");
oCN.Commit();//缁撴潫浜嬪姟
@@ -264,7 +264,7 @@
#endregion
#region 鎻愭枡璁″垝鍗� 鍏抽棴
- [Route("Cg_PODemandPlanBill/ClosePODemandPlanBillList")]
+ [Route("JIT_Cg_PODemandPlanBill/ClosePODemandPlanBillList")]
[HttpGet]
public object ClosePODemandPlanBillList(string HInterID, string User)
{
@@ -295,7 +295,7 @@
oCN.BeginTran();//寮�鍚簨鍔�
- oCN.RunProc($"update Cg_PODemandPlanBillMain set HBillStatus=3,HCloseMan='{User}',HCloseDate=getdate() where HInterID={HInterID}");
+ oCN.RunProc($"update JIT_Cg_PODemandPlanBillMain set HBillStatus=3,HCloseMan='{User}',HCloseDate=getdate() where HInterID={HInterID}");
oCN.Commit();//缁撴潫浜嬪姟
--
Gitblit v1.9.1