From a1ffd509accd21ee8f4010bb827ec7f5ff76e4f1 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 07 六月 2021 16:49:25 +0800
Subject: [PATCH] 修改仓库调用模块，新增生产上料单单据列表数据获取方法模块--合并
---
WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs | 19
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs | 333 ++++++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 132 +-
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs | 323 ++++++++
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 354 +++++++++
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs | 35
/dev/null | 17
WebAPI/Models/Gy_Group.cs | 27
WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs | 20
WebAPI/ListModels.cs | 56 +
WebAPI/DLL/ClsSc_MouldScrapInBill.cs | 413 ++++++++++
WebAPI/Models/Gy_WorkCenter.cs | 29
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 336 ++++++++
WebAPI/Properties/PublishProfiles/API.pubxml.user | 144 +-
WebAPI/WebAPI.csproj | 5
16 files changed, 2,057 insertions(+), 188 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index bb916f3..197e03e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -20,7 +20,7 @@
/// <summary>
- /// 杩斿洖鐝粍鍒楄〃
+ /// 杩斿洖宸ヤ綔涓績鍒楄〃
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -32,13 +32,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere, "h_v_GroupList");
}
else
{
- string sql1 = "select * from h_v_IF_GroupList where 1 = 1 ";
+ string sql1 = "select * from h_v_GroupList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn(sql, "h_v_GroupList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -67,8 +67,352 @@
}
}
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_GroupList where HitemID=" + HInterID, "h_v_GroupList");
+ 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;
+ }
+ }
+
+ [Route("Gy_Group/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+ ds = oCN.RunProcReturn("select * from h_v_GroupLoadTree", "h_v_GroupLoadTree");
+ 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;
+ }
+ }
- //
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ long HParentID = list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HStopflag = list[0].HStopflag == "True" ? "1" : "0";
+ string HUseFlag = list[0].HUseFlag;
+ var HEmpQty = list[0].HEmpQty;
+ var HBarCodeForBase = list[0].HBarCodeForBase;
+ var HDeptID = list[0].HDeptID;
+ var HDeptNumber = "";
+ var HEndFlag = 0;
+ var HLevel = "";
+ var HProcID = "";
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ string sql = "Insert into Gy_Group " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HDeptNumber,HEmpQty" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
+ ",HProcID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HItemID.ToString() +
+ ",'" + HDeptNumber + "'," + HEmpQty +
+ ",'" + HLevel.ToString() + "'," + HEndFlag + "," + HStopflag +
+ ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "','" + HProcID + "')";
+ oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+ var HEmpQty = list[0].HEmpQty;
+ var HBarCodeForBase = list[0].HBarCodeForBase;
+ var HDeptID = list[0].HDeptID;
+ var HProcID = list[0].HProcID;
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDept.HavSameNumber(HItemID, HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_Group set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "'" +
+ ",HDeptID=" + HDeptID +
+ ",HEmpQty=" + HEmpQty +
+ ",HBarCodeForBase='" + HBarCodeForBase + "' " +
+ ", HProcID = '" + HProcID + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Group/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_Group where HItemID=" + HInterID, "Gy_Group");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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("Gy_Group/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
+ DAL.ClsGy_Group_View oDeptHlp = new DAL.ClsGy_Group_View();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ 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;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ 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;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
index ba2b86d..b6c240b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceItemController.cs
@@ -31,11 +31,11 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from Gy_Repair " + sWhere, "Gy_Repair");
+ ds = oCN.RunProcReturn("select HParentID ParentID, * from Gy_Repair" + sWhere, "Gy_Repair");
}
else
{
- string sql1 = "select * from Gy_Repair where 1 = 1 ";
+ string sql1 = "select HParentID ParentID,* from Gy_Repair where 1 = 1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "Gy_Repair");
}
@@ -202,7 +202,7 @@
DAL.ClsGy_Repair_Ctl oDept = new DAL.ClsGy_Repair_Ctl();
DAL.ClsGy_Repair_View oDeptHlp = new DAL.ClsGy_Repair_View();
List<MaintenanceMode> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MaintenanceMode>>(msg1);
- long HItemID = list[0].HItemID;
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -211,8 +211,6 @@
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
-
-
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
objJsonResult.code = "0";
@@ -230,10 +228,13 @@
oCN.RunProc("Insert Into Gy_Repair " +
"(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark) " +
- " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','0'" +
+ " values('" + HNumber + "','"+ HName + "','"+ HHelpCode + "','" + HShortNumber + "','"+ HItemID + "'" +
",'1',0,'" + HStopflag + "','"+ HRemark + "')");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
- oCN.RunProc("Update Gy_Repair set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_Repair set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -281,7 +282,7 @@
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
- long HParentID = list[0].HParentID;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
string HHelpCode = list[0].HHelpCode;
string HRemark = list[0].HRemark;
string HStopflag = list[0].HStopflag;
@@ -362,7 +363,7 @@
{
try
{
- ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_RepairType", "Gy_RepairType");
+ ds = oCN.RunProcReturn("select max(hitemid)+1 hitemid from Gy_Repair", "Gy_Repair");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
index 10ab692..67d491b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Model;
+using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
@@ -23,7 +24,7 @@
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
- [Route("Gy_WorkCenter/list1")]
+ [Route("Gy_WorkCenter/list")]
[HttpGet]
public object list(string sWhere)
{
@@ -31,13 +32,13 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_WorkCenterList " + sWhere, "h_v_Gy_WorkCenterList");
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList " + sWhere, "h_v_WorkCenterList");
}
else
{
- string sql1 = "select * from h_v_Gy_WorkCenterList where 1 = 1 ";
+ string sql1 = "select * from h_v_WorkCenterList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_WorkCenterList");
+ ds = oCN.RunProcReturn(sql, "h_v_WorkCenterList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -66,6 +67,45 @@
}
}
+ /// <summary>
+ /// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from h_v_WorkCenterList where HitemID=" + HInterID, "h_v_WorkCenterList");
+ 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;
+ }
+ }
[Route("Gy_WorkCenter/LoadTree")]
[HttpGet]
@@ -93,8 +133,289 @@
}
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
+ List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
+ long HItemID = list[0].HItemID.ToString() == "" ? 0 : list[0].HItemID;
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HShortNumber;
+ long HParentID = list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HStopflag = list[0].HStopflag=="True"?"1":"0";
+ string HUseFlag = list[0].HUseFlag;
+ var HWorkTimes = list[0].HWorkTimes;
+ var HQty = list[0].HQty;
+ var HBarCodeForBase = list[0].HBarCodeForBase;
+ var HDayMoney = list[0].HDayMoney;
+ var HDeptID = list[0].HDeptID;
+ var HDeptNumber = "";
+ var HEndFlag = 0;
+ var HLevel = "";
+ var HProcID = "";
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ string sql = "Insert into Gy_WorkCenter " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HDeptNumber,HWorkTimes,HQty" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
+ ",HProcID,HDayMoney) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HItemID.ToString() +
+ ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
+ ",'" + HLevel.ToString() + "'," + HEndFlag + "," + HStopflag +
+ ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "','" + HProcID + "'," + HDayMoney + ")";
+ oCN.RunProc(sql, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ if (list[0].HItemID.ToString() != "")
+ {
+ oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ string HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+ var HQty = list[0].HQty;
+ var HBarCodeForBase = list[0].HBarCodeForBase;
+ var HDayMoney = list[0].HDayMoney;
+ var HDeptID = list[0].HDeptID;
+ var HWorkTimes = list[0].HWorkTimes;
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDept.HavSameNumber(HItemID, HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_WorkCenter set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "'"+
+ ",HDeptID=" + HDeptID +
+ ",HQty=" + HQty +
+ ",HWorkTimes=" + HWorkTimes +
+ ",HBarCodeForBase='" + HBarCodeForBase + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_WorkCenter,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鍗曟嵁鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_WorkCenter/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HInterID, "Gy_WorkCenter");
- //
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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("Gy_WorkCenter/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+ DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
+ DAL.ClsGy_WorkCenter_View oDeptHlp = new DAL.ClsGy_WorkCenter_View();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ 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;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_Department where HItemID = " + HItemID, "Gy_Department");
+
+ 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;
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
new file mode 100644
index 0000000..1733451
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -0,0 +1,323 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Sb_EquipDotCheckPlanBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+
+ #region 璁惧鐐规璁″垝琛�
+
+ /// <summary>
+ /// 璁惧鐐规璁″垝琛ㄥ垪琛� list鍒楄〃鏁版嵁鍔犺浇
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckPlanBill/GetEquipDotCheckPlanBillList")]
+ [HttpGet]
+ public object GetEquipDotCheckPlanBillList(string sWhere)
+ {
+ try
+ {
+ ds = Sb_EquipDotCheckPlanBillList_s(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sb_EquipDotCheckPlanBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipDotCheckPlanBillList ", "h_v_Sb_EquipDotCheckPlanBillList");
+ }
+ #endregion
+
+ #region 璁惧鐐规璁″垝琛� 淇濆瓨/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckPlanBill/SaveEquipDotCheckPlanBillList")]
+ [HttpPost]
+ public object SaveEquipDotCheckPlanBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ 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
+ {
+ DAL.ClsSb_EquipDotCheckPlanBill oBill = new DAL.ClsSb_EquipDotCheckPlanBill();
+ List<Model.ClsSb_EquipDotCheckPlanBillMain> lsmain = new List<Model.ClsSb_EquipDotCheckPlanBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sb_EquipDotCheckPlanBillMain(msg2);
+ foreach (Model.ClsSb_EquipDotCheckPlanBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3904";
+ oItem.HBillSubType = "3904";
+
+ //oItem.HInterID =0;
+ //oItem.HBillNo = "";
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //oItem.HMakeDate = "";
+ //oItem.HYear = "";
+ //oItem.HPeriod = "";
+ //oItem.HRemark = "";
+ //oItem.HCycleUnit = "";
+ //oItem.HCheckCycle = "";
+ //oItem.HBeginDate = "";
+ //oItem.HEndDate = "";
+ //oItem.HInnerBillNo = "";
+ //oItem.HExplanation = "";
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_EquipDotCheckPlanBillSub> ls = new List<Model.ClsSb_EquipDotCheckPlanBillSub>();
+ ls = oListModels.getObjectByJson_Sb_EquipDotCheckPlanBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSb_EquipDotCheckPlanBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #region [璁惧鐐规璁″垝琛ㄥ垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckPlanBill/DeltetEquipDotCheckPlanBillList")]
+ [HttpGet]
+ public object DeltetEquipDotCheckPlanBillList(string HInterID)
+ {
+ //缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSb_EquipDotCheckPlanBill oBill = new DAL.ClsSb_EquipDotCheckPlanBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[璁惧鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sb_EquipDotCheckPlanBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipDotCheckPlanBillList where hmainid= " + HID + " ", "h_v_Sb_EquipDotCheckPlanBillList");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁″垝琛�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+ #region[璁惧鐐规璁″垝琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
+ [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai")]
+ [HttpGet]
+ public object Sb_EquipDotCheckPlanBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart ,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID from h_v_Sb_EquipDotCheckPlanBillList_Edit", "h_v_Sb_EquipDotCheckPlanBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ string sql1 = "select 鐐规椤圭洰 HDotCheckItem,鐐规閮ㄤ綅 HDotCheckPart,鍏蜂綋瑕佹眰 HClaim,琛ㄤ綋澶囨敞 HRemark,HManagerID from h_v_Sb_EquipDotCheckPlanBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckPlanBillList_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁″垝锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+
+
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
index 65c6139..a35233a 100644
--- a/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs
@@ -53,7 +53,17 @@
#region 璁惧缁翠慨宸ュ崟鍒楄〃sql璇彞
public static DataSet Sb_EquipRepairWorkBill_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList ", "h_v_Sb_EquipRepairWorkBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairWorkBillList "+sWhere, "h_v_Sb_EquipRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairWorkBillList");
+ }
+
}
#endregion
@@ -93,7 +103,17 @@
#region 璁惧缁翠慨楠屾敹鍗曞垪琛╯ql璇彞
public static DataSet Sb_EquipRepairCheckWorkBill_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList", "h_v_Sb_EquipRepairCheckBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipRepairCheckBillList" + sWhere, "h_v_Sb_EquipRepairCheckBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipRepairCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipRepairCheckBillList");
+ }
+
}
#endregion
@@ -133,7 +153,16 @@
#region 璁惧鏁呴殰鐧昏鍗曞垪琛╯ql璇彞
public static DataSet Sb_EqpConkBookBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList", "h_v_Sb_EquipConkBookBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipConkBookBillList" + sWhere, "h_v_Sb_EquipConkBookBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipConkBookBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sb_EquipConkBookBillList");
+ }
}
#endregion
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index bb6d466..1f91abb 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -2380,13 +2380,13 @@
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //HMaterID = "";//閰嶄欢浠ｇ爜
- //HUnitID = "";//鍗曚綅浠ｇ爜
- //HQty = "";//瀹為檯鐢ㄩ噺
- //HQtyMust = "";//鍗曚綅鐢ㄩ噺
- //HRemark = "";//澶囨敞
-
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
+
oBill.DetailColl.Add(oItemSub);
}
@@ -3113,5 +3113,327 @@
#endregion
+
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗�
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗曞垪琛�
+
+ [Route("Sc_MouldScrapInHouseBill/GetMouldScrapInHouseBill")]
+ [HttpGet]
+ public object GetMouldScrapInHouseBill(string sWhere)
+ {
+ try
+ {
+
+ ds = Sc_GetMouldScrapInHouseBill(sWhere);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList ", "h_v_Sc_MouldScrapInHouseBillList");
+ }
+
+ #endregion
+
+ #region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sc_MouldScrapInHouseBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldScrapInHouseBillList where hmainid= " + HID + " ", "h_v_Sc_MouldScrapInHouseBillList");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ淮淇崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[妯″叿鎶ュ簾鍏ュ簱鍗曠紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁]
+ [Route("Sc_MouldScrapInHouseBill/Sc_MouldScrapInHouseBillListProjectDetai")]
+ [HttpGet]
+ public object Sc_MouldScrapInHouseBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
+ HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
+ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
+ HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
+ FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+
+ //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
+ string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
+ HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
+ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
+ HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
+ FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿鎶ュ簾鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList")]
+ [HttpPost]
+ public object SaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ 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
+ {
+ DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
+ List<Model.ClsSc_MouldStockBillMain> lsmain = new List<Model.ClsSc_MouldStockBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillMain(msg2);
+ foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3831";
+ oItem.HBillSubType = "3831";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_MouldStockBillSub> ls = new List<Model.ClsSc_MouldStockBillSub>();
+ ls = oListModels.getObjectByJson_Gy_MouldScrapInHouseBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿鎶ュ簾鍏ュ簱鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldScrapInHouseBill/DeltetMouldScrapInHouseBill")]
+ [HttpGet]
+ public object DeltetMouldScrapInHouseBill(string HInterID)
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSc_MouldScrapInBill oBill = new DAL.ClsSc_MouldScrapInBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
index 2cd4201..8b3d35b 100644
--- a/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipRepairWorkBill.cs
@@ -114,6 +114,17 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+ string sql = string.Format(@"Insert Into Sb_EquipRepairWorkBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
+ ",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate,HRepairContent,HCycleUnit" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HEquipID.ToString() + "," + omodel.HRepairID.ToString() + "," + omodel.HPlanTimes.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HTimes.ToString() +
+ ", " + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" + omodel.HRepairBeginDate.ToShortDateString() + "','" + omodel.HRepairEndDate.ToShortDateString() + "','" + omodel.HRepairContent + "','" + omodel.HCycleUnit + "'" +
+ ")");
//涓昏〃
oCn.RunProc("Insert Into Sb_EquipRepairWorkBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
@@ -129,6 +140,15 @@
//鎻掑叆瀛愯〃
foreach (Models.ClsSb_EquipRepairWorkBillSub oSub in DetailColl)
{
+ string sql1 = string.Format(@"Insert into Sb_EquipRepairWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation,HEmpID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HRepairID1.ToString() + ",'" + oSub.HManagerID1.ToString() + "','" + oSub.HRepairExplanation + "'," + oSub.HEmpID.ToString() +
+ ")");
oCn.RunProc("Insert into Sb_EquipRepairWorkBillSub " +
" (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
diff --git a/WebAPI/DLL/ClsSc_MouldScrapInBill.cs b/WebAPI/DLL/ClsSc_MouldScrapInBill.cs
new file mode 100644
index 0000000..ab96eac
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_MouldScrapInBill.cs
@@ -0,0 +1,413 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+ public class ClsSc_MouldScrapInBill:DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_MouldStockBillMain omodel = new Model.ClsSc_MouldStockBillMain();
+ public List<Model.ClsSc_MouldStockBillSub> DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+
+ public ClsSc_MouldScrapInBill()
+ {
+ base.MvarItemKeySub = "Sc_MouldStockBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Sc_MouldStockBillMain";
+ base.MvarReportTitle = "妯″叿鎶ュ簾鍏ュ簱鍗�";
+ base.BillType = "3831";
+ base.HBillSubType = "3831";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_MouldScrapInBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MouldStockBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HSecManagerID=" + omodel.HSecManagerID.ToString() +
+ ",HKeeperID=" + omodel.HKeeperID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+ ",HDesignLife,HLeaveLife,HUseLife" +
+ ",HSCSPID,HSPGroupID,HBatchNo" +
+ //",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ //",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ //",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ //",HQtyRel,HNewLifeQty,HNowModel,HNowLife" +
+ //",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+ "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ //"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
+ //"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ //",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ //"," + 0 + "," + oSub.HNewLifeQty.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
+ //"," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
+ ") ");
+ //if (oSub.HBackFlag == "鎶ュ簾鍏ュ簱")
+ //{
+ // oCn.RunProc("exec h_p_Sc_MouldFileChangeStatus " + oSub.HMaterID.ToString() + ",'" + oSub.HNewModel.ToString() + "'," + oSub.HNewLifeQty.ToString() + ",'鎶ュ簾'");
+ //}
+ //else
+ //{
+ // oCn.RunProc("exec h_p_Sc_MouldFileChangeStatus " + oSub.HMaterID.ToString() + ",'" + oSub.HNewModel.ToString() + "'," + oSub.HNewLifeQty.ToString() + ",'鍦ㄥ簱'");
+ //}
+ }
+ //
+ //oCn.RunProcReturn("exec h_p_Sc_MouldFileChangeStatus " + omodel.HInterID.ToString() + ",'鍦ㄥ簱'", "gy_czygl");
+ //foreach (Model.ClsSc_MouldScrapInBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sc_MouldScrapInBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ DataSet Ds;
+ foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ {
+
+ oCn.RunProc("Insert into Sc_MouldStockBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
+ ",HDesignLife,HLeaveLife,HUseLife" +
+ ",HSCSPID,HSPGroupID,HBatchNo" +
+ //",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo" +
+ //",HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ //",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ //",HQtyRel,HNewLifeQty,HNowModel,HNowLife" +
+ //",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
+ "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
+ "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ //"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'" +
+ //"," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ //",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ //"," + 0 + "," + oSub.HNewLifeQty.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
+ //"," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() +
+ ") ");
+ //
+ //if (oSub.HBackFlag == "鎶ュ簾鍏ュ簱")
+ //{
+ // oCn.RunProc("exec h_p_Sc_MouldFileChangeStatus " + oSub.HMaterID.ToString() + ",'" + oSub.HNewModel.ToString() + "'," + oSub.HNewLifeQty.ToString() + ",'鎶ュ簾'");
+ //}
+ //else
+ //{
+ // oCn.RunProc("exec h_p_Sc_MouldFileChangeStatus " + oSub.HMaterID.ToString() + ",'" + oSub.HNewModel.ToString() + "'," + oSub.HNewLifeQty.ToString() + ",'鍦ㄥ簱'");
+ //}
+ }
+ //
+ //foreach (Model.ClsSc_MouldScrapInBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sc_MouldScrapInBill_Qty " + oSub.HICMOInterID, "");
+ // if (Ds.Tables[0].Rows.Count == 0)
+ // return;
+ // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
+ // {
+ // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
+ // return false;
+ // }
+ //}
+ //
+ DataSet Ds;
+ foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ {
+ Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBill_CheckKF " + omodel.HInterID + "," + oSub.HMaterID + "," + oSub.HWHID + "," + oSub.HSPID + ", 1", "gy_czygl");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][0]) == "N")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0][1]) + ", 涓嶅厑璁镐繚瀛橈紒";
+ oCn.RollBack();
+ return false;
+ }
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Sc_MouldStockBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_MouldStockBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
+ omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HManagerID"]);
+ omodel.HSecManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSecManagerID"]);
+ omodel.HKeeperID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HKeeperID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
+
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Sc_MouldStockBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldStockBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
+ oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
+ oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
+ oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLifeQty"]);
+ //oSub.HNewLifeQty = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HNewLifeQty"]);
+ //oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ //oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ //oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ //oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ //oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ //oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+
+ //oSub.HNewModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNewModel"]);
+ //oSub.HWallThickness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWallThickness"]);
+ //oSub.HHardness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHardness"]);
+ //oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLastProdModel"]);
+ //oSub.HDiameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDiameter"]);
+ //oSub.HBackFlag = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBackFlag"]);
+ //oSub.HNowModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNowModel"]);
+ //oSub.HNowLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HNowLife"]);
+
+ //oSub.HMouldType = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldType"]);
+ //oSub.HInitModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HInitModel"]);
+ //oSub.HInitDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HInitDesignLife"]);
+ //oSub.HLifeUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HLifeUnitID"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //鏉＄爜鎵弿璁板綍,鏂板鍒颁骇鍝佸叆搴�
+ public bool AddBill_PDA(ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds;
+ oCn.BeginTran();
+ //鍒犻櫎涓昏〃
+ oCn.RunProc("Delete From Sc_MouldStockBillMain where HInterID=" + omodel.HInterID.ToString());
+ //鎻掑叆瀛愯〃
+ oCn.RunProc("EXEC h_p_Sc_MouldScrapInBillSub_Insert " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'");
+ //鎻掑叆涓昏〃
+ oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
+ ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "',getdate()" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
+ ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
+ ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ") ");
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
+
+
+ }
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 57be746..026d4c5 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -345,7 +345,7 @@
return list;
}
-
+
/// <summary>
/// 澶勭悊鏂板妫�楠屾柟妗堝瓙琛ㄧ殑json
/// </summary>
@@ -744,5 +744,57 @@
return list;
}
+ /// <summary>
+ /// 璁惧鐐规璁″垝 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ // ClsSb_EquipDotCheckPlanBillMain
+ public List<Model.ClsSb_EquipDotCheckPlanBillMain> getObjectByJson_Sb_EquipDotCheckPlanBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipDotCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckPlanBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 璁惧鐐规璁″垝 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ // ClsSb_EquipDotCheckPlanBillSub
+ public List<Model.ClsSb_EquipDotCheckPlanBillSub> getObjectByJson_Sb_EquipDotCheckPlanBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSb_EquipDotCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckPlanBillSub>>(jsonString);
+ return list;
+ }
+
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鎶ュ簾鍏ュ簱鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldStockBillMain> getObjectByJson_Gy_MouldScrapInHouseBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldStockBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(jsonString);
+ return list;
+ }
+
+
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鎶ュ簾鍏ュ簱鍗曞瓙琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldStockBillSub> getObjectByJson_Gy_MouldScrapInHouseBillSub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldStockBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(jsonString);
+ return list;
+ }
+
}
-}
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_Group.cs b/WebAPI/Models/Gy_Group.cs
new file mode 100644
index 0000000..7f3f1ea
--- /dev/null
+++ b/WebAPI/Models/Gy_Group.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_Group
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; } // 浠ｇ爜
+ public string HName { get; set; } //
+ public string HHelpCode { get; set; } //鍔╄鐮�
+ public string HShortNumber { get; set; } //鐭唬鐮�
+ public string HEndFlag { get; set; } //鏈骇鏍囧織
+ public string HStopflag { get; set; } //绂佺敤鏍囧織
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HDeptID { get; set; }
+ public long HEmpQty { get; set; }
+ public long HProcID { get; set; }
+
+ public string HBarCodeForBase { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Gy_WorkCenter.cs b/WebAPI/Models/Gy_WorkCenter.cs
new file mode 100644
index 0000000..37731a1
--- /dev/null
+++ b/WebAPI/Models/Gy_WorkCenter.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class Gy_WorkCenter
+ {
+ public long HItemID { get; set; }
+ public string HNumber { get; set; } // 浠ｇ爜
+ public string HName { get; set; } //
+ public string HHelpCode { get; set; } //鍔╄鐮�
+ public string HShortNumber { get; set; } //鐭唬鐮�
+ public string HEndFlag { get; set; } //鏈骇鏍囧織
+ public string HStopflag { get; set; } //绂佺敤鏍囧織
+ public string HRemark { get; set; } //澶囨敞
+ public string HUseFlag { get; set; } //浣跨敤鏍囧織
+ public long HParentID { get; set; } //鐖剁骇ID
+ public long HDeptID { get; set; }
+ public long HWorkTimes { get; set; }
+ public long HQty { get; set; }
+ public long HProcID { get; set; }
+ public long HDayMoney { get; set; }
+
+ public string HBarCodeForBase { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml b/WebAPI/Properties/PublishProfiles/API.pubxml
deleted file mode 100644
index 515a6ab..0000000
--- a/WebAPI/Properties/PublishProfiles/API.pubxml
+++ /dev/null
@@ -1,17 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-鎮� Web 椤圭洰鐨勫彂甯�/鎵撳寘杩涚▼灏嗕娇鐢ㄦ鏂囦欢銆傛偍鍙互閫氳繃缂栬緫姝� MSBuild 鏂囦欢
-鏉ヨ嚜瀹氫箟璇ヨ繘绋嬬殑琛屼负銆傝嫢瑕佷簡瑙ｄ笌姝ょ浉鍏崇殑璇︾粏淇℃伅锛岃璁块棶 http://go.microsoft.com/fwlink/?LinkID=208121銆�
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <WebPublishMethod>FileSystem</WebPublishMethod>
- <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
- <LastUsedPlatform>x86</LastUsedPlatform>
- <SiteUrlToLaunchAfterPublish />
- <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <ExcludeApp_Data>False</ExcludeApp_Data>
- <publishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</publishUrl>
- <DeleteExistingFiles>True</DeleteExistingFiles>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index ed6adb6..f1ac8a5 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -12,13 +12,13 @@
<ItemGroup>
<File Include="apiapp.json">
<publishTime>04/12/2021 11:33:15</publishTime>
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>04/13/2021 13:28:28</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>04/13/2021 13:28:28</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>05/07/2021 20:31:20</publishTime>
@@ -27,19 +27,19 @@
<publishTime>05/07/2021 20:31:20</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>04/13/2021 13:30:11</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>04/26/2020 09:57:16</publishTime>
@@ -57,7 +57,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/03/2021 10:37:21</publishTime>
+ <publishTime>06/02/2021 13:19:20</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -66,13 +66,13 @@
<publishTime>01/04/2011 13:48:18</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -114,7 +114,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>04/13/2021 13:30:39</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -138,16 +138,16 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>04/13/2021 13:31:08</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>04/13/2021 13:31:24</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>04/13/2021 13:31:12</publishTime>
+ <publishTime>01/28/2015 04:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -171,10 +171,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/07/2021 14:43:50</publishTime>
+ <publishTime>06/02/2021 20:00:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/07/2021 14:43:50</publishTime>
+ <publishTime>06/02/2021 20:00:43</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/04/2021 21:35:21</publishTime>
@@ -192,166 +192,166 @@
<publishTime>03/26/2019 14:23:20</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>06/03/2021 10:37:21</publishTime>
+ <publishTime>06/02/2021 13:19:20</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/13/2021 10:11:33</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/13/2021 13:27:57</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>05/07/2021 20:31:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/13/2021 10:11:34</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/07/2021 14:44:05</publishTime>
+ <publishTime>06/02/2021 20:00:48</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index e2c7c90..e2169aa 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-06-01T07:37:32.2495085Z;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2021-06-04T23:07:32.0541266Z;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,19 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -42,19 +42,19 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>05/31/2021 09:54:31</publishTime>
+ <publishTime>06/02/2021 13:19:20</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -120,7 +120,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -153,10 +153,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/01/2021 15:37:13</publishTime>
+ <publishTime>06/05/2021 07:07:27</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/01/2021 15:37:13</publishTime>
+ <publishTime>06/05/2021 07:07:27</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -168,163 +168,163 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/31/2021 09:54:31</publishTime>
+ <publishTime>06/02/2021 13:19:20</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/20/2021 14:28:50</publishTime>
+ <publishTime>05/25/2021 14:18:16</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/01/2021 15:37:31</publishTime>
+ <publishTime>06/05/2021 07:07:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c421953..8f3578d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -315,6 +315,7 @@
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceModeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_WorkCenterController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CurrencyController.cs" />
@@ -348,6 +349,7 @@
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
<Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
@@ -375,6 +377,7 @@
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
@@ -392,6 +395,8 @@
<Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
<Compile Include="Models\DocumentsView.cs" />
+ <Compile Include="Models\Gy_Group.cs" />
+ <Compile Include="Models\Gy_WorkCenter.cs" />
<Compile Include="Models\MaintenanceAcceptItem.cs" />
<Compile Include="Models\MaintenanceMode.cs" />
<Compile Include="Models\QC_ProcessCheckBillSub.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index f0fb4b6..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>API</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1