From 01266e16c1deb87dd6a6b88f51845322bfaa770c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 25 四月 2021 08:44:21 +0800
Subject: [PATCH] 部门基础资料 新增 删除 修改 禁用 反禁用功能
---
WebAPI/DLL/ClsSc_ProcessReport.cs | 2
WebAPI/Models/StationBill.cs | 22 +
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 2
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 240 ++++++++++++++
WebAPI/Controllers/Sc_ProcessMangementController.cs | 318 +++++++++++++++++
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
9 files changed, 892 insertions(+), 81 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 70eee49..7274261 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..0b119b7
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -0,0 +1,240 @@
+锘縰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 = "3791";
+ string HBillSubType = "3791";
+ long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 0;
+ string HMaker = list[0].HMaker;//鍒跺崟浜�
+ string HMouldNum = list[0].HMouldNum;//妯＄┐鍙�
+ int HYear = 2021;
+ double HPeriod = 1;
+ string HRemark = list[0].HRemark;//澶囨敞
+ string HSourceName = list[0].HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ double HPieceQty = list[0].HPieceQty;//杩涚珯PCS鏁�
+ double HWasterQty = list[0].HWasterQty;//鎶ュ簾鏁伴噺
+ double HPlanPieceQty = list[0].HPlanPieceQty;//杩涚珯PNL鏁�
+ double HBadPNL = list[0].HBadPNL;//鎶ュ簾PNL鏁�
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ int HProcPlanInterID = 0;
+ int HProcPlanEntryID = 0;
+ string HProcPlanBillNo = "";
+ long HProcExchInterID = list[0].lngBillKey;
+ long HProcExchEntryID = list[0].lngBillSubKey;
+ string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HProcID = list[0].HProcID;//褰撳墠宸ュ簭ID
+ double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+ double HPlanQty = list[0].HPlanQty;//绉讳氦PNL鏁�
+ DateTime HStationOutTime = list[0].HStationOutTime;//姹囨姤鏃堕棿
+ long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+ long HPayProcID = list[0].HPayProcID;//鏍哥畻宸ュ簭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 HSourceID2 = list[0].HSourceID2;//鐢熶骇璧勬簮2ID
+ long HSourceID3 = list[0].HSourceID3;//鐢熶骇璧勬簮3ID
+ long HSourceID4 = list[0].HSourceID4;//鐢熶骇璧勬簮4ID
+ long HSourceID5 = list[0].HSourceID5;//鐢熶骇璧勬簮5ID
+ long HSupID = 0;
+ double HQty = list[0].HQty;//鍚堟牸鏁伴噺
+ double HPrice = 0;
+ double HMoney = 0;
+ double HBadCount = list[0].HBadCount;//涓嶈壇鏁伴噺
+ long HCenterID = list[0].HCenterID;//宸ヤ綔涓績ID
+ string HProcNo = list[0].HProcNo;//娴佹按鍙�
+ string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ string HSourceNameList = list[0].HSourceNameList;//璁惧娓呭崟
+ long HMainSourceInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HMainSourceBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ string HMainSourceBillType = "3790";
+ bool HLastSubProc = list[0].HLastSubProc;//杞笅宸ュ簭
+ long HEmpID2 = list[0].HEmpID2;//鎿嶄綔鍛�2ID
+ long HEmpID3 = list[0].HEmpID3;//鎿嶄綔鍛�3ID
+ long HEmpID4 = list[0].HEmpID4;//鎿嶄綔鍛�4ID
+ long HEmpID5 = list[0].HEmpID5;//鎿嶄綔鍛�5ID
+ double HDSQty = list[0].HDSQty;//鎶樺集鍒�鏁�
+ double HChongQty = list[0].HChongQty;//NCT鍐叉鏁�
+ double HPriceRate = list[0].HPriceRate;//绯绘暟
+ double HWorkTimes = list[0].HWorkTimes;//宸ユ椂
+ long HQCCheckID = list[0].HQCCheckID;//妫�楠屽憳ID
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert Into Sc_StationOutBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
+ ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
+ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
+ ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID" +
+ ") " +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",'" + HStationOutTime + "'," + HSourceID + "," + HPayProcID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
+ "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
+ "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID +
+ ") ");
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_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 = "鏁伴噺鎺у埗," + ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID + ",1");
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeChangeStatus " + HInterID + " ");
+ oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
+ //鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
+ 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 || HLastSubProc == false)
+ {
+
+ }
+ else if (ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HLastProc"]) == "鏄�")
+ {
+
+ }
+ 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/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 2a2139f..719e7aa 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -128,6 +128,97 @@
}
/// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曚富琛ㄨ鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json")]
+ [HttpGet]
+ public object MES_DetailSc_ProcessReportList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID<=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 = @"select s1.HInterID,s1.HBillNo,s1.HDeptID,s2.HName,s1.HDate,s1.HPlanQty,s1.HICMOBillNo,s1.HRemark,s2.HNumber
+,s1.HMaker,s1.HMakeDate,s1.HChecker,s1.HCheckDate,s1.HUpDater,s1.HUpDateDate,s1.HCloseMan,s1.HCloseDate
+from Sc_ProcessReportMain s1
+ inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;
+
+ ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
+
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇娲惧伐鍗曞叧鑱旇鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json")]
+ [HttpGet]
+ public object MES_h_v_Sc_ProcessSendWorkList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 =@"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠ｇ爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠ｇ爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁￠噺鍗曚綅浠ｇ爜], [璁￠噺鍗曚綅], [HprocID],
+[宸ュ簭浠ｇ爜], [宸ュ簭], [HGroupID], [鐝粍浠ｇ爜], [鐝粍鍚嶇О], [HSourceID], [璧勬簮浠ｇ爜], [鐢熶骇璧勬簮], [HWorkerID], [鑱屽憳浠ｇ爜], [鑱屽憳], [hsubid], [鏁伴噺], [璁″垝寮�宸ユ棩鏈焆,
+[璁″垝瀹屽伐鏃ユ湡], [璁″垝宸ユ椂], [琛ㄤ綋澶囨敞], [HICMOInterID], [鐢熶骇浠诲姟鍗曞彿], [HSeOrderInterID], [閿�鍞鍗曞彿], [琛ㄥご澶囨敞], [鍒跺崟浜篯, [鍒跺崟鏃ユ湡], [瀹℃牳浜篯, [瀹℃牳鏃ユ湡], [淇敼浜篯,
+[淇敼鏃ユ湡], [鍏抽棴浜篯, [鍏抽棴鏃ユ湡], [浣滃簾浜篯, [浣滃簾鏃ユ湡], [婧愬崟涓诲唴鐮乚, [婧愬崟瀛愬唴鐮乚, [婧愬崟鍗曞彿], [婧愬崟绫诲瀷], [琛屽叧闂汉], [HBillType], [HQtyDecimal], [HPriceDecimal]
+from h_v_Sc_ProcessSendWorkList
+where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")";
+
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList");
+
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
/// 杩斿洖鐢熶骇宸ュ簭璁″垝鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -692,7 +783,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
-
+ string UserName;
ListModels oListModels = new ListModels();
try
{
@@ -703,8 +794,8 @@
lsmain = oListModels.getObjectByJson_Reportlist(msg2);
foreach (Model.ClsSc_ProcessReportMain oItem in lsmain)
{
- //oItem.HMaker = "";
- //UserName = oItem.HMaker;
+ UserName = oItem.HMaker;
+ oItem.HMaker = UserName;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
@@ -761,23 +852,19 @@
reportSub.HEntryID = i;
reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
reportSub.HRemark = "";
- reportSub.HCloseMan = "";
+ reportSub.HCloseMan = ReportModel.omodel.HCloseMan;
reportSub.HCloseType = false;
reportSub.HEmpID =0;
reportSub.HICMOBillNo ="";
reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
- reportSub.HEntryID = i;
- reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
reportSub.HRemark = "";
- reportSub.HCloseMan = "";
- reportSub.HCloseType = false;
reportSub.HSourceBillType = "3712";
reportSub.HQty = (double)ItemView.鏁伴噺;
reportSub.HProcID = (long)ItemView.HprocID;
reportSub.HProcNumber = ItemView.宸ュ簭浠ｇ爜;
reportSub.HOutPrice = 0;
reportSub.HOutMoney = 0;
- reportSub.HSourceID = (long)ItemView.HSourceID;
+ reportSub.HSourceID = (long)ItemView.hmainid;
reportSub.HEmpNumber = "";
reportSub.HRelBeginDate = DateTime.Now;
reportSub.HRelEndDate = DateTime.Now;
@@ -787,8 +874,8 @@
reportSub.HSeOrderBillNo = "";
reportSub.HProcPlanInterID = 0;
reportSub.HProcPlanBillNo = "";
- reportSub.HSourceInterID = 0;
- reportSub.HSourceBillNo = "";
+ reportSub.HSourceInterID = (long)ItemView.hmainid;
+ reportSub.HSourceBillNo = ItemView.鍗曟嵁鍙�;
reportSub.HRelationQty = 0;
reportSub.HRelationMoney = 0;
reportSub.HMaterID = (long)ItemView.HMaterID;
@@ -803,7 +890,7 @@
reportSub.HProcPlanEntryID = 0;
reportSub.HProcPlanBillNo = "";
reportSub.HSourceEntryID = 0;
- reportSub.HSourceBillType = "";
+ reportSub.HSourceBillType = "3712";
reportSub.HRelationQty = 0;
reportSub.HRelationMoney = 0;
reportSub.HBadPrirce = 0;
@@ -1067,8 +1154,213 @@
}
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝叧闂姛鑳�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsClose"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("CloseProcessReportList")]
+ [HttpGet]
+ public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
+ var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
+
+ if (IsClose == 0)
+ {
+ if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿叧闂紒锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if(IsClose==1)
+ {
+ if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佹湭鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁告挙閿�鍏抽棴锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ 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 = "鍏抽棴澶辫触鎴栧垯鍙嶅叧闂け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝鏍稿弽瀹℃牳鍔熻兘
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsAudit"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ var a = DBUtility.ClsPub.CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉
+ var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
+ var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
+ if (IsAudit == 0)
+ {
+ if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笉鍏佽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (IsAudit == 1)
+ {
+ if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿弽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ 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 = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSc_ProcessReport.cs b/WebAPI/DLL/ClsSc_ProcessReport.cs
index c0eb34a..b27244c 100644
--- a/WebAPI/DLL/ClsSc_ProcessReport.cs
+++ b/WebAPI/DLL/ClsSc_ProcessReport.cs
@@ -140,7 +140,7 @@
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HGroupID.ToString() +
",'" + omodel.HGroupNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'" +
", " + omodel.HPlanQty.ToString() + "," + omodel.HInStockQty.ToString() + "," + omodel.HSumTimes.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HRemark + "'" +
- ",'" + omodel.HInnerBillNo + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HMaker.ToString() + "',getdate()," + omodel.HSupID.ToString() + ",'" + omodel.HMarker + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessReportSub oSub in DetailColl)
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index 595752f..cb61e50 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -46,6 +46,28 @@
public long HBadPNL { get; set; }
public double HPrice_BHS { get; set; }
public double HMoney_BHS { get; set; }
+ public long HCenterID { get; set; }
+ public string HMouldNum { get; set; }
+ public long lngBillKey { get; set; }
+ public long lngBillSubKey { get; set; }
+ public DateTime HStationOutTime { get; set; }
+ public long HPayProcID { get; set; }
+ public long HSourceID2 { get; set; }
+ public long HSourceID3 { get; set; }
+ public long HSourceID4 { get; set; }
+ public long HSourceID5 { get; set; }
+ public double HBadCount { get; set; }
+ public string HSourceNameList { get; set; }
+ public bool HLastSubProc { get; set; }
+ public long HEmpID2 { get; set; }
+ public long HEmpID3 { get; set; }
+ public long HEmpID4 { get; set; }
+ public long HEmpID5 { get; set; }
+ public double HDSQty { get; set; }
+ public double HChongQty { get; set; }
+ public double HPriceRate { get; set; }
+ public double HWorkTimes { get; set; }
+ public long HQCCheckID { get; set; }
}
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index 98d8e74..768687e 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>03/26/2021 14:35:48</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>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</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>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</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>03/26/2021 14:35:48</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>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</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>03/26/2021 14:35:48</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/25/2021 08:39:33</publishTime>
+ <publishTime>04/22/2021 20:00:19</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/25/2021 08:39:33</publishTime>
+ <publishTime>04/22/2021 20:00:19</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>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/12/2021 11:33:15</publishTime>
+ <publishTime>03/26/2021 14:35:48</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/25/2021 08:39:37</publishTime>
+ <publishTime>04/22/2021 20:00:25</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 85ad453..7e75c52 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