From 95f65190334bd1baaebe0e6a7312a06b660cd4d1 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 15 五月 2024 10:46:04 +0800
Subject: [PATCH] 优化
---
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 781 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 510 insertions(+), 271 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index 3a3859e..7314c26 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -1,4 +1,5 @@
锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
@@ -6,23 +7,99 @@
using WebAPI.Models;
namespace WebAPI.Controllers
{
+ /**
+ * 鎵捐揣鍗曞崟
+ */
public class Sc_MouldMoveStockStepOutBillController : ApiController
{
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
private json objJsonResult = new json();
public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ public DAL.ClsSc_MouldScrapInBill BillNew0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MouldScrapInBill BillOld0 = new DAL.ClsSc_MouldScrapInBill(); //妯″叿鎶ュ簾鍏ュ簱瀵瑰簲鍗曟嵁绫�
+ /// <summary>
+ /// 鏍规嵁鍖呰鍗� 杩斿洖姝ゅ寘瑁呭崟鍐呯殑鐩稿叧淇℃伅
+ /// </summary>
+ /// <returns></returns>
- #region 鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟鎹垪琛�
-
- [Route("Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBillList")]
+ /// <summary>
+ /// 妫�鍏风淮淇伐鍗曞垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_CheckToolsRepair/GetCheckToolsRepairWorkBillList")]
[HttpGet]
- public object GetMouldMoveStockStepOutBill(string sWhere)
+ public object GetCheckToolsRepairWorkBillList(string sWhere)
{
try
{
- ds = Sc_MouldMoveStockStepOutBill(sWhere);
+ ds = Sc_CheckToolsRepairWorkBillList_s(sWhere);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ 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;
+ }
+ }
+
+ #region sql璇彞
+
+
+ public static DataSet Sc_CheckToolsRepairWorkBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList ", "h_v_Sc_CheckToolsRepairWorkBillList");
+ }
+
+
+
+
+ #region 鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟
+
+ #region 鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟鍒楄〃
+
+ [Route("Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBill")]
+ [HttpGet]
+ public object GetMouldMoveStockStepOutBill(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = Sc_MouldMoveStockStepOutBill(sWhere,Organization);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -39,16 +116,16 @@
}
}
- public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere)
+ public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where (璋冨嚭缁勭粐='" + Organization + "' or 璋冨叆缁勭粐='" + Organization + "')");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMoveStockStepOutBill ", "h_v_Sc_MouldMoveStockStepOutBill");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鍒跺崟鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepOutBill");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ "order by 鍒跺崟鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
}
@@ -56,287 +133,449 @@
#endregion
-
- #region sql璇彞
-
-
- public static DataSet Sc_MouldOtherOutBillList_s(string sWhere)
+ #region[鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
+ [Route("Sc_MouldMoveStockStepOutBill/Sc_MouldMoveStockStepOutBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sc_MouldMoveStockStepOutBillListCheckDetai(string HID)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherOutBillList ", "h_v_Sc_MouldOtherOutBillList");
+ 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_MouldMoveStockStepOutBill where hmainid= " + HID + " ", "h_v_Sc_MouldMoveStockStepOutBill");
+ 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_MouldOtherOutBill/SaveMouldOtherOutBillList")]
-// [HttpPost]
-// public object SaveMouldOtherOutBillList([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();
+ #region[鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
+ [Route("Sc_MouldMoveStockStepOutBill/Sc_MouldMoveStockStepOutBillListProjectDetai")]
+ [HttpGet]
+ public object Sc_MouldMoveStockStepOutBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ DataSet ds1;
+ List<object> list = new List<object>();
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
+ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
+ 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID,璋冨叆缁勭粐浠ｇ爜 HStockOrgCode,璋冨叆缁勭粐 HStockOrgName, HOtherOrgID ,璋冨嚭缁勭粐浠ｇ爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠ｇ爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID,
+ 璋冨叆浠撲綅浠ｇ爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠ｇ爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID,
+ 璋冨嚭浠撲綅浠ｇ爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldMoveStockStepOutBill"), "h_v_Sc_MouldMoveStockStepOutBill");
+
+ }
+ else
+ {
+ //string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
+ string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
+ 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty,
+ 鍗曚环 HPrice, 閲戦 HMoney,HStockOrgID,璋冨叆缁勭粐浠ｇ爜 HStockOrgCode,璋冨叆缁勭粐 HStockOrgName, HOtherOrgID,璋冨嚭缁勭粐浠ｇ爜 HOtherOrgCode,璋冨嚭缁勭粐 HOtherOrgName, HWHID, 璋冨叆浠撳簱浠ｇ爜 HWHCode, 璋冨叆浠撳簱 HWHName,HSPID,
+ 璋冨叆浠撲綅浠ｇ爜 HSPCode, 璋冨叆浠撲綅 HSPName,HSCWHID, 璋冨嚭浠撳簱浠ｇ爜 HSCWHCode, 璋冨嚭浠撳簱 HSCWHName,HSCSPID,
+ 璋冨嚭浠撲綅浠ｇ爜 HSCSPCode, 璋冨嚭浠撲綅 HSCSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID,HUnitID,璁￠噺鍗曚綅浠ｇ爜 HUnitCode,璁￠噺鍗曚綅 HUnitName FROM h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ");
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
+
+ }
+ //鏌ユ眹鎬�
+ ds1 = oCN.RunProcReturn(string.Format(@"select 鐗╂枡浠ｇ爜,max(鐗╂枡鍚嶇О)鐗╂枡鍚嶇О,瑙勬牸鍨嬪彿,max(鍗曟嵁鍙�)鍗曟嵁鍙�,鎵规,sum(瀹炲彂鏁伴噺)瀹炲彂鏁伴噺,
+ hscwhid,max(璋冨嚭浠撳簱浠ｇ爜)璋冨嚭浠撳簱浠ｇ爜,max(璋冨嚭浠撳簱)璋冨嚭浠撳簱,琛ㄤ綋澶囨敞 from h_v_Sc_MouldMoveStockStepOutBill
+ where 1=1 " + sqlWhere + " group by 鐗╂枡浠ｇ爜,瑙勬牸鍨嬪彿,hscwhid,鎵规,琛ㄤ綋澶囨敞"), "h_v_Sc_MouldMoveStockStepOutBill");
+
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ 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_MouldMoveStockStepOutBill/SaveGetMouldMoveStockStepOutBillList")]
+ [HttpPost]
+ public object SaveGetMouldMoveStockStepOutBillList([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 msg4 = sArray[2].ToString();
-// string UserName = "";
-// ListModels oListModels = new ListModels();
-// try
-// {
-// DAL.ClsSc_MouldOtherOutBill oBill = new DAL.ClsSc_MouldOtherOutBill();
-// List<Model.ClsSc_MouldStockBillMain> lsmain = new List<Model.ClsSc_MouldStockBillMain>();
-// msg2 = msg2.Replace("\\", "");
-// msg2 = msg2.Replace("\n", ""); //\n
-// lsmain = oListModels.getObjectByJson_Sc_MouldStockBillMain(msg2);
-// foreach (Model.ClsSc_MouldStockBillMain oItem in lsmain)
-// {
-// //oItem.HMaker = "";
-// UserName = oItem.HMaker; //鍒跺崟浜�
-// oItem.HBillType = "3828";
-// oItem.HBillSubType = "3828";
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁淇濆瓨鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
-// //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 = "";
+ DLL.ClsSc_MouldMoveStockStepOutBill oBill = new DLL.ClsSc_MouldMoveStockStepOutBill();
+ List<Model.ClsSc_MouldMoveStockStepOutBillMain> lsmain = new List<Model.ClsSc_MouldMoveStockStepOutBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MouldMoveStockStepOutBillMain(msg2);
+ foreach (Model.ClsSc_MouldMoveStockStepOutBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3841";
+ oItem.HBillSubType = "3841";
+ //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.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_Sc_MouldStockBillSub(msg3);
-// int i = 0;
-// foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
-// {
+ //oItem.HMainSourceInterID = oItem.HInterID;
-// 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 = "";//澶囨敞
+ //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_MouldStockBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ {
-// oBill.DetailColl.Add(oItemSub);
+ i++;
+ oItemSub.HEntryID = i;
-// }
-// //淇濆瓨
-// //淇濆瓨瀹屾瘯鍚庡鐞�
-// 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_MouldOtherOutBill/DeltetMouldOtherOutBillList")]
-// [HttpGet]
-// public object DeltetMouldOtherOutBillList(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;
-// //}
+ //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);
+ string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
+ oCn.RunProc(sql);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼鎴愬姛
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
+ }
+ 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_MouldMoveStockStepOutBill/DeltetMouldMoveStockStepOutBil")]
+ [HttpGet]
+ public object DeltetMouldMoveStockStepOutBil(string HInterID,string user)
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Delete", 1, false, user))
+ {
+ 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_MouldOtherOutBill oBill = new DAL.ClsSc_MouldOtherOutBill();
-// 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;
-// }
+ 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_MouldMoveStockStepOutBill oBill = new DLL.ClsSc_MouldMoveStockStepOutBill();
+ 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;
+ }
+ //鍒犻櫎鍓嶆煡鎵惧綋鍓嶅崟鎹殑鎵�鏈夊櫒鍏稩D
+ //string swhere = "";
+ //DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
+ //for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
+ //{
+ // swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
+ //}
+ //swhere = swhere.Substring(0, swhere.Length - 1);
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ //鍒犻櫎鎴愬姛淇敼鍣ㄥ叿妗ｆ浣嶇疆
+ //string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
+ string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
+ oCn.RunProc(sql);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
-// 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
+ 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("Sc_MouldOtherOutBill/Sc_MouldOtherOutBillListCheckDetai")]
-// [HttpGet]
-// public ApiResult<DataSet> Sc_MouldOtherOutBillListCheckDetai(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_MouldOtherOutBillList where hmainid= " + HID + " ", "h_v_Sc_MouldOtherOutBillList");
-// 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_MouldOtherOutBill/Sc_MouldOtherOutBillListProjectDetai")]
-// [HttpGet]
-// public object Sc_MouldOtherOutBillListProjectDetai(string sqlWhere)
-// {
-// DataSet ds;
-// try
-// {
-// SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-// if (sqlWhere == null || sqlWhere.Equals(""))
-// {
-// ds = oCN.RunProcReturn(@"select 妯″叿浠ｇ爜 HMaterID,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec ,鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife,鍓╀綑瀵垮懡 HLeaveLife,绱Н浣跨敤瀵垮懡 HUseLife,瀹炲彂鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,妯″叿浠撳簱浠ｇ爜 HWHID,鍙戣揣浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
-//from h_v_Sc_MouldOtherOutBillList", "h_v_Sc_MouldOtherOutBillList_Edit");
-// objJsonResult.code = "0";
-// objJsonResult.count = 1;
-// objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
-// objJsonResult.data = ds.Tables[0];
-// }
-// else
-// {
-// string sql1 = @"select 妯″叿浠ｇ爜 HMaterID,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec ,鎵规 HBatchNo,璁捐瀵垮懡 HDesignLife,鍓╀綑瀵垮懡 HLeaveLife,绱Н浣跨敤瀵垮懡 HUseLife,瀹炲彂鏁伴噺 HQty,鍗曚环 HPrice,閲戦 HMoney,妯″叿浠撳簱浠ｇ爜 HWHID,鍙戣揣浠撳簱 HWHName,琛ㄤ綋澶囨敞 HRemark
-//from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
-// string sql = sql1 + sqlWhere;
-// ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
-// 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 鍣ㄥ叿鍒嗗竷寮忚皟鍑哄崟瀹℃牳/鍙嶅鏍�
+ [Route("Sc_MouldMoveStockStepOutBill/AuditMouldMoveStockStepOutBill")]
+ [HttpGet]
+ public object AuditMouldMoveStockStepOutBill(string HInterID, string user, int flag)
+ {
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldMoveStockStepOutBill_Check", 1, false, user))
+ {
+ 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;
+ }
+ DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (flag == 1)
+ {
+ if (oBill.omodel.HBillStatus == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁宸插鏍革紝鏃犻渶鍐嶆瀹℃牳";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3840' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HBillStatus == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠鍗曟嵁鏈鏍革紝鏃犻渶鍙嶅鏍�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string HCheckDate = DateTime.Now.Date.ToString();
+ oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3840' and HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #region 鍣ㄥ叿鍒嗗竷寮忚皟鍑烘湭璋冨叆鍗曞垪琛⊿c_MouldMoveStockStepOutButNotStepInList
+ [Route("Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutButNotStepInList")]
+ [HttpGet]
+ public object GetMouldMoveStockStepOutButNotStepInList(string sWhere, string Organization)
+ {
+ try
+ {
+ ds = Sc_MouldGetMouldMoveStockStepOutButNotStepInList(sWhere, Organization);
-
+ 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_MouldGetMouldMoveStockStepOutButNotStepInList(string sWhere, string Organization)
+ {
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutButNotStepInList where (璋冨嚭缁勭粐='" + Organization + "' or 璋冨叆缁勭粐='" + Organization + "')");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepOutBill");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutButNotStepInList");
+ }
+
+ }
+
+ #endregion
}
-}
\ No newline at end of file
+}
+#endregion
+#endregion
\ No newline at end of file
--
Gitblit v1.9.1