From d9e96c992590f0453e85cd551941741271cfa6f5 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 22 四月 2021 17:14:41 +0800
Subject: [PATCH] 新增工序出站、进站模块
---
WebAPI/Models/StationBill.cs | 1
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 2
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 208 ++++++++++++++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 130 ++++++------
WebAPI/WebAPI.csproj | 2
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 255 +++++++++++++++++++++++++
WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs | 2
7 files changed, 533 insertions(+), 67 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index a24cb6d..b3e79bb 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -69,7 +69,7 @@
}
/// <summary>
- /// 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇娴佽浆鍗′俊鎭�
+ /// 濮斿宸ュ簭鍙戝嚭鍗曟祦姘村彿鍥炶溅鑾峰彇娴佽浆鍗′俊鎭紙濮斿宸ュ簭鎺ユ敹銆佸伐搴忚繘绔欐帴鏀堕�氱敤锛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index bbb9aa0..db30083 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -124,7 +124,7 @@
string HBarCode = list[0].HBarCode;//鏉″舰鐮�
string HAddr = "";
string HBarCodeMaker = "";
- string BillType = "3791";
+ string BillType = "3793";
double HWasterQty = list[0].HWasterQty;//涓嶅悎鏍兼暟閲�
long HPlanPieceQty = list[0].HPlanPieceQty;//鍙戝嚭浠舵暟
long HBadPNL = list[0].HBadPNL;//鎶ュ簾浠舵暟
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
new file mode 100644
index 0000000..761dd47
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -0,0 +1,255 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //宸ュ簭杩涚珯鎺ユ敹鍗旵ontroller
+ public class Cj_StationInBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ DataSet ds1;
+
+
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationInBill/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ string BillType = "3790";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 0;
+ string HMaker = list[0].HMaker;//鍒跺崟浜�
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HRemark = list[0].HRemark;//澶囨敞
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ int HProcPlanInterID = 0;
+ int HProcPlanEntryID = 0;
+ string HProcPlanBillNo = "";
+ int HProcExchInterID = 0;
+ int HProcExchEntryID = 0;
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮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 HSupID = 0;
+ double HQty = list[0].HQty;//鎺ユ敹鏁伴噺
+ double HPrice = 0;
+ double HMoney = 0;
+ double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
+ string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_StationInBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
+ ",HProcNo,HOrderProcNO" +
+ ") " +
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
+ ",'" + HProcNo + "','" + HOrderProcNO + "'" +
+ ") ");
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
+ //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ 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)
+ {
+
+ }
+ else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ {
+
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationInBill/txtHProcNo_KeyDown")]
+ [HttpGet]
+ public object txtHProcNo_KeyDown(string sBillNo,string sProcNo)
+ {
+ try
+ {
+ if (sBillNo.Equals("") || sProcNo.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //寰楀埌淇℃伅锛堝澶栨爣璁颁负0鏃讹紝娴佽浆鏍囪涓�1鏃讹級
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 涓嬮亾娴佽浆宸ュ簭<>'杞�' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 and 宸ュ簭鍙�='" + sProcNo + "'", "h_v_Sc_ProcessExchangeBillList");
+ //Ds = oCn.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList where 鍗曟嵁鍙�= '" + sBillNo + "' and 宸ュ簭鍙�='" + sProcNo + "' and 濮斿鏍囪=0 and 娴佽浆鏍囪=1 ", "h_v_Sc_ProcessExchangeBillList");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭鍙烽敊璇垨鑰呭綋鍓嶅伐搴忓彿涓嶅厑璁歌繘绔欙紝璇烽噸鏂拌緭鍏ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationInBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationInBillList " + sWhere, "h_v_MES_StationInBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationInBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationInBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
new file mode 100644
index 0000000..41eac07
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -0,0 +1,208 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //宸ュ簭鍑虹珯鍙戝嚭鍗旵ontroller
+ public class Cj_StationOutBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ DataSet ds1;
+
+
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationOutBill/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ string BillType = "3790";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 0;
+ string HMaker = list[0].HMaker;//鍒跺崟浜�
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HRemark = list[0].HRemark;//澶囨敞
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ int HProcPlanInterID = 0;
+ int HProcPlanEntryID = 0;
+ string HProcPlanBillNo = "";
+ int HProcExchInterID = 0;
+ int HProcExchEntryID = 0;
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+ double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮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 HSupID = 0;
+ double HQty = list[0].HQty;//鎺ユ敹鏁伴噺
+ double HPrice = 0;
+ double HMoney = 0;
+ double HPieceQty = list[0].HPieceQty;//鎺ユ敹浠舵暟
+ string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_StationInBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+ ",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
+ ",HProcNo,HOrderProcNO" +
+ ") " +
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
+ ",'" + HProcNo + "','" + HOrderProcNO + "'" +
+ ") ");
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_In " + HInterID + ",1");
+ //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ 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)
+ {
+
+ }
+ else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ {
+
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 杩斿洖宸ュ簭鍑虹珯鍙戝嚭鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cj_StationOutBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList " + sWhere, "h_v_MES_StationOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_MES_StationOutBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index 595752f..02129f6 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -46,6 +46,7 @@
public long HBadPNL { get; set; }
public double HPrice_BHS { get; set; }
public double HMoney_BHS { get; set; }
+ public long HCenterID { get; set; }
}
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 8df242a..9523335 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -11,7 +11,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -20,19 +20,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -50,7 +50,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -59,13 +59,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -131,7 +131,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -164,10 +164,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/21/2021 15:18:36</publishTime>
+ <publishTime>04/22/2021 17:08:09</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/21/2021 15:18:36</publishTime>
+ <publishTime>04/22/2021 17:08:09</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -185,163 +185,163 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>05/21/2020 10:51:50</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/21/2021 13:19:40</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:21</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/21/2021 15:18:46</publishTime>
+ <publishTime>04/22/2021 17:08:27</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 08e9b28..bdf1880 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -330,6 +330,8 @@
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
--
Gitblit v1.9.1