From 71c863067a4ad175aac1354a6c555f845dd19f88 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 28 九月 2021 19:07:33 +0800
Subject: [PATCH] 器具编辑改制申请列表+编辑
---
WebAPI/Models/ClsSc_MouldRepairChangeBillSub.cs | 13
WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs | 142 ++++++++
WebAPI/ListModels.cs | 12
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 192 ++++++------
WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs | 34 ++
WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs | 545 ++++++++++++++++++++++++++++++++++
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 4
WebAPI/WebAPI.csproj | 4
8 files changed, 847 insertions(+), 99 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
new file mode 100644
index 0000000..889b21d
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairChangeBillController.cs
@@ -0,0 +1,545 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.MJGL
+{
+ public class Sc_MouldRepairChangeBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DLL.ClsSc_MouldRepairChangeBill BillNew0 = new DLL.ClsSc_MouldRepairChangeBill(); //妯″叿鏀瑰埗鍑哄簱瀵瑰簲鍗曟嵁绫�
+ public DLL.ClsSc_MouldRepairChangeBill BillOld0 = new DLL.ClsSc_MouldRepairChangeBill(); //妯″叿鏀瑰埗鍑哄簱瀵瑰簲鍗曟嵁绫�
+
+ #region 妯″叿鏀瑰埗鐢宠鍗曞垪琛�
+
+ [Route("Sc_MouldRepairChangeBill/Get_MouldRepairChangeBillList")]
+ [HttpGet]
+ public object Get_MouldRepairChangeBillList(string sWhere)
+ {
+ try
+ {
+ ds = Sc_GetMouldRepairChangeHouseBill(sWhere);
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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_GetMouldRepairChangeHouseBill(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairChangeBillList " + sWhere, "h_v_Sc_MouldRepairChangeBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairChangeBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairChangeBillList");
+ }
+
+ }
+
+ #endregion
+
+ #region [妯″叿鏀瑰埗鐢宠鍗曞垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿鏀瑰埗鐢宠鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldRepairChangeBill/set_DeleteBill")]
+ [HttpGet]
+ public object set_DeleteBill(string HInterID)
+ {
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ string s = "";
+ 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;
+ }
+ DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
+ 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;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowDeleteBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "1";
+ 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 [妯″叿鏀瑰埗鐢宠鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldRepairChangeBill/set_CheckBill")]
+ [HttpGet]
+ public object set_CheckBill(int HInterID, string CurUserName)
+ {
+ //string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //瀹℃牳鍓嶅垽鏂槸鍚﹀厑璁�
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldRepairChangeBill/set_AbandonCheck")]
+ [HttpGet]
+ public object set_AbandonCheck(int HInterID, string CurUserName)
+ {
+ //string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鏃犳潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //鍙嶅鏍稿墠鍒ゆ柇
+ string s = "";
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆鍙嶅鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[妯″叿鏀圭敵璇峰崟鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Sc_MouldRepairChnageBill/Sc_MouldRepairChangeHouseBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sc_MouldRepairChangeHouseBillListCheckDetai(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_MouldRepairChangeBillList where hmainid= " + HID + " ", "h_v_Sc_MouldRepairChangeBillList");
+ 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 妯″叿鏀瑰埗鐢宠鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿鏀瑰埗鐢宠鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sc_MouldRepairChangeHouseBill/SaveGetMouldRepairChangeHouseBillList")]
+ [HttpPost]
+ public object SaveGetMouldRepairChangeHouseBillList([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 refSav = sArray[1].ToString();
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSc_MouldRepairChangeBill oBill = new DLL.ClsSc_MouldRepairChangeBill();
+ List<Models.ClsSc_MouldRepairChangeBillMain> lsmain = new List<Models.ClsSc_MouldRepairChangeBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MouldRepairChangeHouseBillMain(msg2);
+ foreach (Models.ClsSc_MouldRepairChangeBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld0.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld0.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld0.omodel.HChecker != "" && BillOld0.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld0.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld0, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3842";
+ oItem.HBillSubType = "3842";
+ //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;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ 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
+ }
+}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index 6a32c6d..f8ad64e 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -238,8 +238,8 @@
}
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3801";
- oItem.HBillSubType = "3801";
+ oItem.HBillType = "3825";
+ oItem.HBillSubType = "3825";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
//oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
diff --git a/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
new file mode 100644
index 0000000..309b6ce
--- /dev/null
+++ b/WebAPI/DLL/ClsSc_MouldRepairChangeBill.cs
@@ -0,0 +1,142 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsSc_MouldRepairChangeBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsSc_MouldRepairChangeBillMain omodel = new Models.ClsSc_MouldRepairChangeBillMain();
+ public List<Models.ClsSc_MouldRepairChangeBillSub> DetailColl = new List<Models.ClsSc_MouldRepairChangeBillSub>();
+
+ public ClsSc_MouldRepairChangeBill()
+ {
+ base.MvarItemKeySub = "Sc_MouldRepairChangeBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Sc_MouldRepairChangeBillMain";
+ base.MvarReportTitle = "妯″叿鏀瑰埗鐢宠鍗�";
+ base.BillType = "3842";
+ base.HBillSubType = "3842";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_MouldRepairChangeBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //鏂板鍗曟嵁
+ 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_MouldRepairChangeBillMain " +
+ "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HDate," +
+ "HMaker,HMakeDate,HInnerBillNo,HRepairID,HDeptID,HRepairBeginDate,HRepairEndDate," +
+ "HCycleUnit,HPlanTimes,HTimes,HChangeNum,HEmpID,HManagerID,HRepairType,HSupID," +
+ "HNewMaterID,HNewName,HNewModel,HNewModel2,HExplanation,HRepairContent,HRemark" +
+ ") " +
+ " values("+omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ",'" + omodel.HMaker + "',getdate()" +
+ ",'" + omodel.HInnerBillNo+"',"+ omodel.HRepairID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HRepairBeginDate + "','" + omodel.HRepairEndDate +
+ "','" + omodel.HCycleUnit + "'," + omodel.HPlanTimes.ToString() + "," + omodel.HTimes.ToString() + "," + omodel.HChangeNum.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() +
+ ",'" + omodel.HRepairType + "'," + omodel.HSupID.ToString() + "," + omodel.HNewMaterID.ToString() + ",'"+ omodel.HNewName + "','" + omodel.HNewModel + "','" + omodel.HNewModel2 + "','" + omodel.HExplanation + "','" + omodel.HRepairContent + "','" + omodel.HRemark+
+ "') ");
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsSc_MouldRepairChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldRepairChangeBillSub " +
+ " (HInterID,HBillNo_bak" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + omodel.HBillNo +
+ "') ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MouldRepairChangeBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HRepairID=" + omodel.HRepairID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HRepairBeginDate='" + omodel.HRepairBeginDate + "'" +
+ ",HRepairEndDate='" + omodel.HRepairEndDate + "'" +
+ ",HCycleUnit='" + omodel.HCycleUnit + "'" +
+ ",HPlanTimes=" + omodel.HPlanTimes.ToString() +
+ ",HTimes=" + omodel.HTimes.ToString() +
+ ",HChangeNum=" + omodel.HChangeNum.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HManagerID=" + omodel.HManagerID.ToString() +
+ ",HRepairType='" + omodel.HRepairID + "'" +
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HNewMaterID=" + omodel.HNewMaterID.ToString() +
+ ",HNewName='" + omodel.HNewName + "'" +
+ ",HNewModel='" + omodel.HNewModel + "'" +
+ ",HNewModel2='" + omodel.HEmpID + "'" +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HRepairContent='" + omodel.HRepairContent + "'" +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Models.ClsSc_MouldRepairChangeBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldRepairChangeBillSub " +
+ " (HInterID,HBillNo_bak" +
+ ") values("
+ + omodel.HInterID.ToString() + ",'" + omodel.HBillNo +
+ "') ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index e00b500..9c55494 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -869,7 +869,17 @@
List<Models.ClsSc_MouldRepairInBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldRepairInBillSub>>(jsonString);
return list;
}
-
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿鏀瑰埗鐢宠鍗曚富琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Models.ClsSc_MouldRepairChangeBillMain> getObjectByJson_Gy_MouldRepairChangeHouseBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Models.ClsSc_MouldRepairChangeBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MouldRepairChangeBillMain>>(jsonString);
+ return list;
+ }
/// <summary>
/// 澶勭悊鏂板妯″叿鏀瑰埗鍑哄簱鍗曚富琛ㄧ殑json
/// </summary>
diff --git a/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
new file mode 100644
index 0000000..114f0e8
--- /dev/null
+++ b/WebAPI/Models/ClsSc_MouldRepairChangeBillMain.cs
@@ -0,0 +1,34 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_MouldRepairChangeBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public int HMouldID; /*鍣ㄥ叿鍐呯爜*/
+ public int HRepairID; /*--鏀瑰埗椤圭洰(Gy_Repair)*/
+ public DateTime HRepairBeginDate; /*--鏀瑰埗寮�濮嬫棩鏈�*/
+ public DateTime HRepairEndDate; /*--鏀瑰埗缁撴潫鏃ユ湡*/
+ public string HRepairContent; /*--鏀瑰埗鍐呭*/
+ public string HCycleUnit; /*--鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)*/
+ public string HPlanTimes; /*--璁″垝鏀瑰埗宸ユ椂*/
+ public string HTimes; /*--瀹為檯鏀瑰埗宸ユ椂*/
+ public int HChangeNum; /*鏀瑰埗鏁伴噺*/
+ public int HEmpID; /*--鐢宠浜�(Gy_Employee)*/
+ public int HManagerID; /*--璐熻矗浜�(Gy_Employee)*/
+ public int HDeptID; /*--鏀瑰埗閮ㄩ棬(Gy_Department)*/
+ public int HSupID; /*--渚涘簲鍟嗭紙Gy_Supplier锛�*/
+ public string HRepairType; /* --鏀瑰埗绫诲瀷锛堝唴閮ㄦ敼鍒讹紝濮斿鏀瑰埗锛�*/
+ public int HNewMaterID; /*--鏀瑰埗鍚庢柊鐗╂枡锛坓y_Material锛�*/
+ public string HNewName; /* --鏀瑰埗鍚庢柊鍚嶇О*/
+ public string HNewModel; /*--鏀瑰埗鍚庢柊瑙勬牸*/
+ public string HNewModel2; /*--鏀瑰埗鍚庢柊鍨嬪彿*/
+ public string HNewBarCode; /*--鏀瑰埗鍚庢柊鏉＄爜*/
+ public string HNewDesignLife; /*--鏂拌璁″鍛�*/
+ public string HExplanation; /* --鏀瑰埗瑕佹眰*/
+ public string HRemark; /* --澶囨敞*/
+ public string HInnerBillNo; /* --鍐呴儴鍗曟嵁鍙�*/
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_MouldRepairChangeBillSub.cs b/WebAPI/Models/ClsSc_MouldRepairChangeBillSub.cs
new file mode 100644
index 0000000..f4012fd
--- /dev/null
+++ b/WebAPI/Models/ClsSc_MouldRepairChangeBillSub.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_MouldRepairChangeBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public string HBillNo_bak; //--鍗曟嵁鍙凤紙澶囦唤锛屼互鍏嶅唴鐮佷涪澶憋紝鎵句笉鍒板搴斾富琛級
+ public int HItemSubID; //--鑷鍒�(GUID)
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index c1266d1..3c5972f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 16:43:40</publishTime>
+ <publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/27/2021 16:17:28</publishTime>
+ <publishTime>09/28/2021 19:05:53</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/27/2021 16:17:28</publishTime>
+ <publishTime>09/28/2021 19:05:53</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/27/2021 16:17:25</publishTime>
+ <publishTime>09/28/2021 19:05:52</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/27/2021 16:17:25</publishTime>
+ <publishTime>09/28/2021 19:05:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 22:52:40</publishTime>
+ <publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/27/2021 16:17:22</publishTime>
+ <publishTime>09/28/2021 19:05:48</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/27/2021 16:17:22</publishTime>
+ <publishTime>09/28/2021 19:05:48</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 15:55:13</publishTime>
+ <publishTime>08/16/2021 17:23:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -51,49 +51,49 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/19/2015 01:02:50</publishTime>
+ <publishTime>03/18/2015 17:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 19:48:56</publishTime>
+ <publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/27/2021 16:17:22</publishTime>
+ <publishTime>09/28/2021 19:05:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/27/2021 16:17:22</publishTime>
+ <publishTime>09/28/2021 19:05:49</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/04/2014 04:33:56</publishTime>
+ <publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/27/2021 16:17:19</publishTime>
+ <publishTime>09/28/2021 19:05:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/27/2021 16:17:19</publishTime>
+ <publishTime>09/28/2021 19:05:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/27/2021 16:17:20</publishTime>
+ <publishTime>09/28/2021 19:05:47</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/27/2021 16:17:20</publishTime>
+ <publishTime>09/28/2021 19:05:47</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/27/2021 16:17:21</publishTime>
+ <publishTime>09/28/2021 19:05:47</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/27/2021 16:17:21</publishTime>
+ <publishTime>09/28/2021 19:05:47</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/16/2015 01:57:08</publishTime>
+ <publishTime>02/15/2015 17:57:08</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -117,13 +117,13 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 18:03:34</publishTime>
+ <publishTime>08/19/2014 10:03:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 21:00:36</publishTime>
+ <publishTime>11/28/2018 13:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -132,7 +132,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 20:58:44</publishTime>
+ <publishTime>11/28/2018 12:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -147,37 +147,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 21:01:26</publishTime>
+ <publishTime>11/28/2018 13:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 21:01:00</publishTime>
+ <publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 12:02:18</publishTime>
+ <publishTime>01/28/2015 04:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 23:26:04</publishTime>
+ <publishTime>02/11/2014 15:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 12:02:32</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>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 12:04:30</publishTime>
+ <publishTime>01/28/2015 04:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -186,184 +186,184 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 19:18:48</publishTime>
+ <publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/27/2021 16:17:30</publishTime>
+ <publishTime>09/28/2021 19:05:56</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/27/2021 16:17:30</publishTime>
+ <publishTime>09/28/2021 19:05:56</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/18/2013 01:03:52</publishTime>
+ <publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>08/09/2021 15:55:23</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/09/2021 15:55:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/27/2021 16:17:34</publishTime>
+ <publishTime>09/28/2021 19:06:03</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6d6663e..5174b5f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -323,6 +323,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdInBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairChangeBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
@@ -393,6 +394,7 @@
<Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairInBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairOutBill.cs" />
@@ -415,6 +417,8 @@
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSc_MouldProdBillMain.cs" />
<Compile Include="Models\ClsSc_MouldProdBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillSub.cs" />
<Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" />
<Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
<Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
--
Gitblit v1.9.1