From 1a6c5cb19353ef7b56a8bd0a0eb01b623971fd43 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 24 三月 2022 16:07:56 +0800
Subject: [PATCH] 叫料单列表 查询 退料申请单 退料确认页面列表 生产叫料平台 退料单新增 拣料配送单 删除
---
WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs | 131 ++++++++++++++++++
WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs | 79 ++++++++++
WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs | 162 ++++++++++++++++++----
WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs | 38 +++++
4 files changed, 372 insertions(+), 38 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
index f62af96..7e795b8 100644
--- a/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_CallGoodsBillBackController.cs
@@ -76,6 +76,7 @@
}
}
#endregion
+
#region 鍙枡閫�鏂欏崟 鍒犻櫎
[Route("Cj_CallGoodsBillBack/DelCallGoodsBill")]
[HttpGet]
@@ -93,7 +94,7 @@
return objJsonResult;
}
- ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoodsBillList_Delete {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
+ ds = oCN.RunProcReturn($"exec Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill {HInterID},{HEntryID} ", "h_p_JIT_BackGoodsBillList_Delete");
objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
@@ -111,5 +112,40 @@
}
}
#endregion
+
+ #region 鍙枡鍗曞垪琛� (榛樿鏌ヨ)
+ [Route("Cj_CallGoodsBillBack/JIT_BackGoodsList")]
+ [HttpGet]
+ public object JIT_BackGoodsList(string HInterID, string user)
+ {
+ try
+ {
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = new DataTable();
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load");
+
+ 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 = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
index bc179df..3381916 100644
--- a/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_CallGoodsBackRequestBillController.cs
@@ -5,6 +5,8 @@
using Newtonsoft.Json;
using DBUtility;
using System;
+using Newtonsoft.Json.Linq;
+using System.Collections.Generic;
namespace WebAPI.Controllers.SCGL
{
@@ -37,7 +39,7 @@
try
{
//鏌ョ湅鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("JIT_ComplementGoods_Query", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -111,5 +113,132 @@
}
}
#endregion
+
+ #region 閫�鏂欑敵璇峰崟 閫�鏂欑‘璁ら〉闈㈠垪琛�
+ [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList")]
+ [HttpGet]
+ public object JIT_BackGoodsList(string HInterID, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_Load '{HInterID}'", "h_p_JIT_BackGoods_Load");
+
+ 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 閫�鏂欑‘璁� 鍝佽川纭
+ //浼犻�掑弬鏁�
+ public class JIT_BackGoods_PZQR {
+ public int? hmainid = 0;
+ public int? Hsubid = 0;
+ public int? HSupID = 0;
+ public int? HWHID = 0;
+ public string 閫�鏂欏師鍥� { get; set; }
+ public int? 閫�鍥炴暟閲� = 0;
+ }
+
+ [Route("Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_PZQR")]
+ [HttpPost]
+ public object JIT_BackGoodsList_PZQR([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ try
+ {
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+
+ List<JIT_BackGoods_PZQR> listCa = new List<JIT_BackGoods_PZQR>();
+ //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+ listCa = JsonConvert.DeserializeObject<List<JIT_BackGoods_PZQR>>(msg2.ToString());
+
+ int a = 0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ ds = oCN.RunProcReturn($"exec h_p_JIT_BackGoods_QACheck '{listCa[i].hmainid}','{listCa[i].Hsubid}'," +
+ $"{listCa[i].HSupID},{listCa[i].HWHID},'{listCa[i].閫�鏂欏師鍥爙',{listCa[i].閫�鍥炴暟閲弣", "h_p_JIT_BackGoods_QACheck");
+ if (ds.Tables[0].Rows[0][0].ToString() == "1")
+ {
+ a++;
+ }
+ }
+ if (a == listCa.Count)
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else if(a>0&&a<listCa.Count)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈叏閮ㄥ搧璐ㄧ‘璁�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ 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_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS")]
+ [HttpPost]
+ public object JIT_BackGoodsList_CKJS([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ try
+ {
+
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = int.Parse(ds.Tables[0].Rows[0][0].ToString());
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ 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
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
index 60ab4cf..55c617d 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodBillController.cs
@@ -110,12 +110,12 @@
public int? 璋冨嚭浠撳簱id = 0;//璋冨嚭浠撳簱id
public string HMaterialNumberCol { get; set; }
public string HMaterialModelCol { get; set; }
- public string HProcIDCol { get; set; }//HProcID
+ public string HProcID { get; set; }//HProcIDCol
public string HProcNameCol { get; set; }//宸ユ
- public int HOutOrgIDCol = 0;//HOutOrgID
- public string HICMOBillNoCol { get; set; }//HICMOBillNo
- public long HICMOInterIDCol = 0;//HICMOInterID
- public long HICMOEntryIDCol = 0;//HICMOEntryID
+ public int HOutOrgID = 0;//HOutOrgID
+ public string HICMOBillNo { get; set; }// HICMOBillNoCol
+ public long HICMOInterID = 0;// HICMOInterIDCol
+ public long HICMOEntryID = 0;// HICMOEntryIDCol
public long HDeptID = 0;//HDeptID
public double HBHGQtyCol = 0;
public string 閿�鍞鍗曞彿 { get; set; }//HSeOrderNOCol
@@ -230,11 +230,11 @@
oSub.HModel = listCa[i].HMaterialModelCol;
oSub.HWHID = listCa[i].HWHID;
oSub.HProcName = listCa[i].HProcNameCol;
- oSub.HProcID = listCa[i].HProcIDCol;
- oSub.HOutOrgID = listCa[i].HOutOrgIDCol;
- oSub.HICMOBillNo = listCa[i].HICMOBillNoCol;
- oSub.HICMOInterID = listCa[i].HICMOInterIDCol;
- oSub.HICMOEntryID = listCa[i].HICMOEntryIDCol;
+ oSub.HProcID = listCa[i].HProcID;
+ oSub.HOutOrgID = listCa[i].HOutOrgID;
+ oSub.HICMOBillNo = listCa[i].HICMOBillNo;
+ oSub.HICMOInterID = listCa[i].HICMOInterID;
+ oSub.HICMOEntryID = listCa[i].HICMOEntryID;
oSub.HDeptID = listCa[i].HDeptID;
oSub.HPlanQty = listCa[i].璁″垝鍙戞枡鏁伴噺;
oSub.HSeOrderNo = listCa[i].閿�鍞鍗曞彿;
@@ -303,12 +303,12 @@
" (HInterID,HEntryID,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
- ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak" +
+ ",HDeptID,HMaterID,HQty,HProcID,HWHID,HSPID,HBillNo_bak,HOutOrgID" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'" +
- "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'') ", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + oSub.HDeptID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HQty.ToString() + ",'" + oSub.HProcID + "'," + oSub.HWHID.ToString() + ", " + oSub.HSPID.ToString() +",'',"+oSub.HOutOrgID+") ", ref DBUtility.ClsPub.sExeReturnInfo);
//涓昏〃
@@ -369,7 +369,16 @@
//鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
- if (listCa[0].閫�鏂欐暟閲� < 0)
+ int j=0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ if (listCa[i].閫�鏂欐暟閲� > 0)
+ {
+ flag = AddICStockTuiBill(listCa[i], "666601", "涓嶈壇鍝侀��鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+ j = 1;
+ }
+ }
+ if (j == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -377,8 +386,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- flag=AddICStockTuiBill(listCa, "666601", "涓嶈壇鍝侀��鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
if (flag)
{
@@ -408,16 +415,16 @@
}
//鏂板
- public bool AddICStockTuiBill(List<CallGoodsBill> listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn)
+ public bool AddICStockTuiBill(CallGoodsBill listCa,string HBillType,string HBackType,string HOrgID, ref string sReturn)
{
try
{
- Int64 lngBillKey = listCa[0].HSouceInterID == 0 ? 0 : listCa[0].HSouceInterID;
- Int64 lngBillKeyEntry = listCa[0].HSourceEntryID == 0 ? 0 : listCa[0].HSourceEntryID;
- double HQty = (double)(listCa[0].閫�鏂欐暟閲� == 0 ? 0 : listCa[0].閫�鏂欐暟閲�);
- long HDeptWHID = listCa[0].HSTOCKID == 0 ? 0 : listCa[0].HSTOCKID;
- string HTuiResult = listCa[0].閫�鏂欏師鍥� == "" ? "" : listCa[0].閫�鏂欏師鍥�;
+ Int64 lngBillKey = listCa.HSouceInterID == 0 ? 0 : listCa.HSouceInterID;
+ Int64 lngBillKeyEntry = listCa.HSourceEntryID == 0 ? 0 : listCa.HSourceEntryID;
+ double HQty = (double)(listCa.閫�鏂欐暟閲� == 0 ? 0 : listCa.閫�鏂欐暟閲�);
+ long HDeptWHID = listCa.HSTOCKID == 0 ? 0 : listCa.HSTOCKID;
+ string HTuiResult = listCa.閫�鏂欏師鍥� == "" ? "" : listCa.閫�鏂欏師鍥�;
var HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
var HBillInterID = DBUtility.ClsPub.CreateBillID_Prod("6666", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -425,10 +432,10 @@
//鎻掑叆瀛愯〃
oCN.RunProc("Insert into JIT_CallGoodsBackRequestBillSub ( HInterID,HEntryID,HSourceInterID,HSourceEntryID," +
"HSourceBillNo,HSourceBillType, HMaterID, HQty, HSCWHID," +
- " HWHID, HSPID, HResult, HDeptID, HProcID) " +
+ " HWHID, HSPID, HResult, HDeptID, HProcID,HBackReason) " +
$"values({HBillInterID},1,{lngBillKey},{ lngBillKeyEntry}," +
- $"'{listCa[0].HSourceBillNo}',88,{listCa[0].HMaterialID},{HQty},{(listCa[0].璋冨嚭浠撳簱id==null?0:listCa[0].璋冨嚭浠撳簱id)}," +
- $"{HDeptWHID},'','',{listCa[0].HDeptID},'')");
+ $"'{listCa.HSourceBillNo}',88,{listCa.HMaterialID},{HQty},{(listCa.璋冨嚭浠撳簱id==null?0:listCa.璋冨嚭浠撳簱id)}," +
+ $"{HDeptWHID},'','',{listCa.HDeptID},'','{HTuiResult}')");
//鎻掑叆涓昏〃
oCN.RunProc("insert into JIT_CallGoodsBackRequestBillMain(HYear,HPeriod,HInterid,HBillSubType,HBillStatus," +
@@ -478,7 +485,17 @@
//鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
bool flag = false;
- if (listCa[0].閫�鏂欐暟閲� < 0)
+
+ int j = 0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ if (listCa[i].閫�鏂欐暟閲� > 0)
+ {
+ flag = AddICStockTuiBill(listCa[i], "666602", " 浣欓噺閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+ j = 1;
+ }
+ }
+ if (j == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -486,8 +503,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- flag = AddICStockTuiBill(listCa, "666602", " 浣欓噺閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
if (flag)
{
@@ -547,7 +562,16 @@
listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
bool flag = false;
- if (listCa[0].閫�鏂欐暟閲� < 0)
+ int j = 0;
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ if (listCa[i].閫�鏂欐暟閲� > 0)
+ {
+ flag = AddICStockTuiBill(listCa[i], "666603", "鎶ュ簾閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
+ j = 1;
+ }
+ }
+ if (j == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -555,8 +579,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- flag = AddICStockTuiBill(listCa, "666603", "鎶ュ簾閫�鏂�", HOrgID, ref DBUtility.ClsPub.sExeReturnInfo);
if (flag)
{
@@ -688,7 +710,7 @@
{
long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);
- long HOutOrgID = int.Parse(listCa[i].HOutOrgIDCol.ToString());
+ long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
long HWHID = int.Parse(listCa[i].HWHID.ToString());
oCN.RunProc($"exec h_p_JIT_ComplementGoods_Insert {HInterID},'{HBillNo}',{HOrgID},'{user}',{HOutOrgID},{HWHID}");
@@ -732,5 +754,83 @@
}
#endregion
+ #region 鐢熶骇鍙枡骞冲彴 閫�鏂欏崟鏂板
+ [Route("Sc_ComplementGoodBill/Insert_TL_ICStockTuiBill")]
+ [HttpPost]
+ public object Insert_TL_ICStockTuiBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string[] sArray = _value.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string HOrgID = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Cj_CallGoodsBillBack_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+
+ List<CallGoodsBill> listCa = new List<CallGoodsBill>();
+ //鑾峰彇琛ㄦ牸鏁版嵁闆嗗悎
+ listCa = JsonConvert.DeserializeObject<List<CallGoodsBill>>(msg2.ToString());
+ int a = 0;
+ if (listCa.Count > 0)
+ {
+ for (int i = 0; i < listCa.Count; i++)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4602", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //long HOutOrgID = int.Parse(listCa[i].HOutOrgID.ToString());
+ //long HWHID = int.Parse(listCa[i].HWHID.ToString());
+
+ oCN.RunProc($"exec h_p_JIT_GetCallGoodsBillCount_Back {HInterID},'{HBillNo}',{HOrgID},'{user}'");
+ a = 1;
+ }
+
+ if (a == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鐢熸垚閫�鏂欏崟鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚閫�鏂欏崟澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹紝鏃犳硶閫�鏂�!";
+ 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
diff --git a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
index e4e6bb2..07f34a6 100644
--- a/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ComplementGoodsController.cs
@@ -81,10 +81,46 @@
}
#endregion
+ #region 鎷ｆ枡閰嶉�佸崟 鍒犻櫎
+ [Route("Sc_ComplementGoods/DelComplementGoodsList")]
+ [HttpGet]
+ public object DelComplementGoodsList(string HInterID, string HEntryID,string HOrgID, string user)
+ {
+ try
+ {
+ //鍒犻櫎鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_ComplementGoodsBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc($"exec Del_ComplementGoodsBillInfo {HInterID},{HEntryID},{HOrgID}");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ 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
+
#region 閰嶆枡鍗曞垪琛�
[Route("Sc_ComplementGoods/ComplementGoodsBill")]
[HttpGet]
- public object ComplementGoodsBill(string sWhere, string user)
+ public object ComplementGoodsBill(string sWhere)
{
try
{
@@ -96,12 +132,45 @@
objJsonResult.data = new DataTable();
return objJsonResult;
}
- //鍙嶅簭鍒楀寲浼犻�掔殑鍊�
- ComplementGoods com = JsonConvert.DeserializeObject<ComplementGoods>(sWhere.ToString());
+ ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoods_Load '{sWhere}'", "h_p_JIT_ComplementGoods_Load");
- //ds = oCN.RunProcReturn($"exec h_p_JIT_ComplementGoods_Load '{com.MaterialNumber}','{com.MaterialName}','{com.MaterialModel}','{com.HGD}'," +
- // $"'{com.HWHName}','{com.HDeptName}','{com.Organization}','{com.user}','{com.HJLStatus}','{com.HBeginDate}','{com.HEndDate}'", "h_p_JIT_ComplementGoodsBillList_Query");
+ 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_ComplementGoods/ComplementGoodsBill_C")]
+ [HttpGet]
+ public object ComplementGoodsBill_C(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = new DataTable();
+ return objJsonResult;
+ }
+
+ oCN.RunProc($"exec h_p_JIT_ComplementGoodsBill_C_Add '{sWhere}'");
+
+ ds = oCN.RunProcReturn("exec h_p_JIT_GetComplementGoodsBill_C " + sWhere, "h_p_JIT_GetComplementGoodsBill_C");
objJsonResult.code = "1";
objJsonResult.count = 1;
--
Gitblit v1.9.1