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/Models/Sc_WorkDemandPlanBillMain.cs | 6
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkDemandPlanBillController.cs | 327 ++++++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/SCGL/日计划管理/Sc_WorkBillSortBillController.cs | 2
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 34 ++--
WebAPI/Models/JIT_Cg_PODemandPlanBillMain.cs | 2
WebAPI/Models/JIT_Cg_PODemandPlanBillSub.cs | 2
WebAPI/WebAPI.csproj | 10
WebAPI/Models/Sc_WorkDemandPlanBillSub.cs | 40 +++++
8 files changed, 397 insertions(+), 26 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();//缁撴潫浜嬪姟
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
index fbf08e6..1d23b35 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkBillSortBillController.cs"
@@ -138,7 +138,7 @@
else if (OperationType == 3)
{
//淇敼
- oCN.RunProc($"update Sc_WorkBillSortBillMain set HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HDate='{omdelMian.HDate}',HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
$", HRemark='{omdelMian.HRemark}', HPrintQty={(omdelMian.HPrintQty == null ? 0 : omdelMian.HPrintQty)}" +
$", HDeptID={omdelMian.HDeptID}, HSeOrderBillNo='{omdelMian.HSeOrderBillNo}', HSourceQty= {(omdelMian.HSourceQty == null ? 0 : omdelMian.HSourceQty)}" +
$", HInStockQty={(omdelMian.HInStockQty == null ? 0 : omdelMian.HInStockQty)}, HMaterID={omdelMian.HMaterID}" +
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
new file mode 100644
index 0000000..fce0d98
--- /dev/null
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_WorkDemandPlanBillController.cs"
@@ -0,0 +1,327 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+
+namespace WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�
+{
+ public class Sc_WorkDemandPlanBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Sc_WorkDemandPlanBillMain omdelMian = new Sc_WorkDemandPlanBillMain();
+ List<Sc_WorkDemandPlanBillSub> omodelsub = new List<Sc_WorkDemandPlanBillSub>();
+
+ #region 瑕佹枡璁″垝鍗� 鍒楄〃
+ [Route("Sc_WorkDemandPlanBill/Sc_WorkDemandPlanBillList")]
+ [HttpGet]
+ public object Sc_WorkDemandPlanBillList(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkDemandPlanBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkDemandPlanBillList where 1=1" + sWhere + "order by hmainid desc ", "h_v_JIT_Sc_WorkDemandPlanBillList");
+
+ 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("Sc_WorkDemandPlanBill/AddWorkDemandPlanBillList")]
+ [HttpPost]
+ public object AddWorkDemandPlanBillList([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain(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;
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+
+ int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ string user = sArray[4].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Cg_PODemandPlanBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Sc_WorkDemandPlanBillMain>(msg2);
+ string BillType = "4609";
+
+
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("insert into Sc_WorkDemandPlanBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType" +
+ ", HBillSubType, HDate, HBillStatus, HMaker, HMakeDate" +
+ ", HProdORGID, HAddress, HDeptID, HSettleCurrId" +
+ ", HRemark, HExplanation)" +
+ $" values({omdelMian.HInterID}, '{omdelMian.HBillNo}', {DateTime.Now.Year}, {DateTime.Now.Month}, '{BillType}'" +
+ $", '{BillType}','{omdelMian.HDate}', 1, '{omdelMian.HMaker}', '{omdelMian.HMakeDate}'" +
+ $", {omdelMian.HProdORGID}, '{omdelMian.HAddress}', {omdelMian.HDeptID}, {omdelMian.HSettleCurrId}" +
+ $", '{omdelMian.HRemark}', '{omdelMian.HExplanation}')");
+ }
+ else if (OperationType == 3)
+ {
+ //淇敼
+ oCN.RunProc($"update Sc_WorkDemandPlanBillMain set HDate='{omdelMian.HDate}',HUpDater='{omdelMian.HMaker}',HUpDateDate=GETDATE()" +
+ $",HProdORGID={omdelMian.HProdORGID},HAddress='{omdelMian.HAddress}',HDeptID={omdelMian.HDeptID}" +
+ $",HSettleCurrId={omdelMian.HSettleCurrId},HRemark='{omdelMian.HRemark}',HExplanation='{omdelMian.HExplanation}'" +
+ $" where HInterID={omdelMian.HInterID}");
+ }
+ //淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub(msg3, hentryid);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ 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;
+ }
+ }
+
+ public json AddBillSub(string msg3, int hentryid)
+ {
+ if (hentryid != -1)
+ {
+ //鑾峰彇琛ㄦ牸鏁版嵁
+ ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkDemandPlanBillList where 鍗曟嵁鍙�='{omdelMian.HBillNo}'", "h_v_JIT_Sc_WorkDemandPlanBillList");
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Sc_WorkDemandPlanBillSub where HInterID='" + omdelMian.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
+ }
+
+
+ omodelsub = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Sc_WorkDemandPlanBillSub>>(msg3);
+ int i = 1;
+ //鎻掑叆瀛愯〃
+ foreach (Models.Sc_WorkDemandPlanBillSub oSub in omodelsub)
+ {
+ oCN.RunProc("insert into Sc_WorkDemandPlanBillSub(HInterID,HEntryID,HLaterReason,HMaterID,HMaterName" +
+ ", HMaterModel, HUnitID, HErpClsID, HQty, HRemark" +
+ ", HProdORGID, HStatus, HFixleadTime, HSourceInterID" +
+ ", HSourceEntryID, HSourceBillNo, HSourceBillType, HDayPlanDate" +
+ ", HRelationQty, HICMOInterID, HICMOEntryID, HICMOBillSEQ, HCloseMan" +
+ ", HEntryCloseDate, HCloseTypeSub, HReciveQty, HCloseStatus, HRemoveQty" +
+ ", HSeOrderBillNo, HUnReciveQty, HICMOBillDate, HICMOBillDeliveryDate, HICMOBillRemark" +
+ ", HICMOBillNote,HICMOEmpID)" +
+ $"values({omdelMian.HInterID}, '{(hentryid == -1 ? i : omodelsub.Count == 1 ? hentryid : i == 1 ? hentryid : (i + ds.Tables[0].Rows.Count - 1))}', '{oSub.HLaterReason}', {(oSub.HMaterID==null?0: oSub.HMaterID)}, '{oSub.HMaterName}'" +
+ $", '{oSub.HMaterModel}',{(oSub.HUnitID == null ? 0: oSub.HUnitID)}, '{oSub.HErpClsID}',{(oSub.HQty == null ? 0: oSub.HQty)}, '{oSub.HRemark}'" +
+ $",{(oSub.HProdORGID == null ? 0: oSub.HProdORGID)}, '{oSub.HStatus}',{(oSub.HFixleadTime == null ? 0: oSub.HFixleadTime)},{oSub.HSourceInterID}" +
+ $",{oSub.HSourceEntryID}, '{oSub.HSourceBillNo}', '{oSub.HSourceBillType}','{oSub.HDayPlanDate}'" +
+ $",{oSub.HRelationQty},{(oSub.HICMOInterID == null ? 0: oSub.HICMOInterID)},{(oSub.HICMOEntryID == null ? 0: oSub.HICMOEntryID)},{(oSub.HICMOBillSEQ == null ? 0: oSub.HICMOBillSEQ)}, '{oSub.HCloseMan}'" +
+ $", '{oSub.HEntryCloseDate}', '{(oSub.HCloseTypeSub == false ? 0 : 1)}',{(oSub.HReciveQty == null ? 0: oSub.HReciveQty)}, '{(oSub.HCloseStatus == false ? 0 : 1)}',{(oSub.HRemoveQty == null ? 0: oSub.HRemoveQty)}" +
+ $", '{oSub.HSeOrderBillNo}',{(oSub.HUnReciveQty == null ? 0: oSub.HUnReciveQty)}, '{oSub.HICMOBillDate}','{oSub.HICMOBillDeliveryDate}', '{oSub.HICMOBillRemark}', " +
+ $"'{oSub.HICMOBillNote}',{(oSub.HICMOEmpID == null ? 0 : oSub.HICMOEmpID)})");
+ i++;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
+ #region 瑕佹枡璁″垝鍗� 鍒犻櫎
+ [Route("Sc_WorkDemandPlanBill/DelWorkDemandPlanBillList")]
+ [HttpGet]
+ public object DelWorkDemandPlanBillList(string HInterID, string HEntryID, string User)
+ {
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_WorkDemandPlanBill_Drop", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkDemandPlanBillList where 1=1 and hmainid=" + HInterID, "h_v_JIT_Sc_WorkDemandPlanBillList");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["鍗曟嵁鐘舵��"].ToString() != "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();//寮�鍚簨鍔�
+
+ if (ds.Tables[0].Rows.Count == 1)
+ {
+ oCN.RunProc($"delete from Sc_WorkDemandPlanBillMain where HInterID={HInterID}");
+ }
+ oCN.RunProc($"delete from Sc_WorkDemandPlanBillSub where HInterID={HInterID} and HEntryID={HEntryID}");
+
+ oCN.Commit();//缁撴潫浜嬪姟
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鎻愭枡璁″垝鍗� 鍏抽棴
+ [Route("Sc_WorkDemandPlanBill/CloseWorkDemandPlanBillList")]
+ [HttpGet]
+ public object CloseWorkDemandPlanBillList(string HInterID, string User)
+ {
+ try
+ {
+ //鍏抽棴鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_WorkDemandPlanBill_Close", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_JIT_Sc_WorkDemandPlanBillList where 1=1 and hmainid=" + HInterID, "h_v_JIT_Sc_WorkDemandPlanBillList");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["鍗曟嵁鐘舵��"].ToString() == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁姝ｅ湪瀹℃牳,涓嶈兘鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();//寮�鍚簨鍔�
+
+ oCN.RunProc($"update Sc_WorkDemandPlanBillMain set HBillStatus=3,HCloseMan='{User}',HCloseDate=getdate() where HInterID={HInterID}");
+
+ oCN.Commit();//缁撴潫浜嬪姟
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Cg_PODemandPlanBillMain.cs b/WebAPI/Models/JIT_Cg_PODemandPlanBillMain.cs
similarity index 86%
rename from WebAPI/Models/Cg_PODemandPlanBillMain.cs
rename to WebAPI/Models/JIT_Cg_PODemandPlanBillMain.cs
index 8b4dc1a..bf1d133 100644
--- a/WebAPI/Models/Cg_PODemandPlanBillMain.cs
+++ b/WebAPI/Models/JIT_Cg_PODemandPlanBillMain.cs
@@ -6,7 +6,7 @@
namespace WebAPI.Models
{
- public class Cg_PODemandPlanBillMain: ClsXt_BaseBillMain
+ public class JIT_Cg_PODemandPlanBillMain: ClsXt_BaseBillMain
{
public string HDocumentStatus { get; set; }
public string HAddress { get; set; }
diff --git a/WebAPI/Models/Cg_PODemandPlanBillSub.cs b/WebAPI/Models/JIT_Cg_PODemandPlanBillSub.cs
similarity index 96%
rename from WebAPI/Models/Cg_PODemandPlanBillSub.cs
rename to WebAPI/Models/JIT_Cg_PODemandPlanBillSub.cs
index f57d183..a2b5f52 100644
--- a/WebAPI/Models/Cg_PODemandPlanBillSub.cs
+++ b/WebAPI/Models/JIT_Cg_PODemandPlanBillSub.cs
@@ -6,7 +6,7 @@
namespace WebAPI.Models
{
- public class Cg_PODemandPlanBillSub : ClsXt_BaseBillSub
+ public class JIT_Cg_PODemandPlanBillSub : ClsXt_BaseBillSub
{
public double? HRelationQty1;
public double? HQty;
diff --git a/WebAPI/Models/Cg_PODemandPlanBillMain.cs b/WebAPI/Models/Sc_WorkDemandPlanBillMain.cs
similarity index 73%
copy from WebAPI/Models/Cg_PODemandPlanBillMain.cs
copy to WebAPI/Models/Sc_WorkDemandPlanBillMain.cs
index 8b4dc1a..14360d1 100644
--- a/WebAPI/Models/Cg_PODemandPlanBillMain.cs
+++ b/WebAPI/Models/Sc_WorkDemandPlanBillMain.cs
@@ -6,14 +6,14 @@
namespace WebAPI.Models
{
- public class Cg_PODemandPlanBillMain: ClsXt_BaseBillMain
+ public class Sc_WorkDemandPlanBillMain: ClsXt_BaseBillMain
{
public string HDocumentStatus { get; set; }
public string HAddress { get; set; }
public string HExplanation { get; set; }
public int HSubORGID;
- public int HSupplierID;
- public int HPURCHASEORGID;
+ public int HDeptID;
+ public int HProdORGID;
public int HSettleCurrId;
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Sc_WorkDemandPlanBillSub.cs b/WebAPI/Models/Sc_WorkDemandPlanBillSub.cs
new file mode 100644
index 0000000..5ea424f
--- /dev/null
+++ b/WebAPI/Models/Sc_WorkDemandPlanBillSub.cs
@@ -0,0 +1,40 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Sc_WorkDemandPlanBillSub: ClsXt_BaseBillSub
+ {
+ public double? HQty;
+ public double? HReciveQty;
+ public double? HRemoveQty;
+ public double? HUnReciveQty;
+ public int? HICMOInterID;
+ public int? HICMOEntryID;
+ public int? HProdORGID;
+ public int? HStockInOrgID;
+ public int? HInStocKOwnerID;
+ public int? HUnitID;
+ public int? HMaterID;
+ public int? HFixleadTime;
+ public int? HICMOBillSEQ;
+ public int? HICMOEmpID;
+ public string HICMOBillNo { get; set; }
+ public string HMaterName { get; set; }
+ public string HMaterModel { get; set; }
+ public string HStatus { get; set; }
+ public string HLaterReason { get; set; }
+ public string HErpClsID { get; set; }
+ public string HICMOBillRemark { get; set; }
+ public string HICMOBillNote { get; set; }
+ public string HSeOrderBillNo { get; set; }
+ public DateTime? HDayPlanDate = DateTime.Parse("1900-01-01 00:00:00");
+ public DateTime? HICMOBillDate = DateTime.Parse("1900-01-01 00:00:00");
+ public DateTime? HICMOBillDeliveryDate = DateTime.Parse("1900-01-01 00:00:00");
+ public bool HCloseStatus;
+ public bool HCloseTypeSub;
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4818f42..e0c7b1e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -359,7 +359,7 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
- <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Cg_PODemandPlanBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
@@ -367,6 +367,7 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_CompleteController..cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkBillSortBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
<Compile Include="Controllers\Sc_PckSplitBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
<Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
@@ -519,8 +520,8 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
- <Compile Include="Models\Cg_PODemandPlanBillMain.cs" />
- <Compile Include="Models\Cg_PODemandPlanBillSub.cs" />
+ <Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
+ <Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
<Compile Include="Models\Cg_PODemandPlanConfigBillSub.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
<Compile Include="Models\ClsQK_PackingBill.cs" />
@@ -546,6 +547,8 @@
<Compile Include="Models\ScanLineCode.cs" />
<Compile Include="Models\Sc_WorkBillSortBillMain.cs" />
<Compile Include="Models\Sc_WorkBillSortBillSub.cs" />
+ <Compile Include="Models\Sc_WorkDemandPlanBillMain.cs" />
+ <Compile Include="Models\Sc_WorkDemandPlanBillSub.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillEmp.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsPay_GroupBalBillMain.cs" />
@@ -820,6 +823,7 @@
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
+ <Folder Include="Views\Sc_WorkDemandPlanBill\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
--
Gitblit v1.9.1