From 50de6a1901a72e5a70f405d9a24a54d7a67f4a7f Mon Sep 17 00:00:00 2001
From: wyb <1qaz@123>
Date: 星期五, 21 五月 2021 16:07:15 +0800
Subject: [PATCH] 1. LAYUI版：增加 电脑端 巡检记录单 单据编辑（新增修改删除功能）。 2.LAYUI版：增加 电脑端 首件检验单 单据编辑（新增修改删除功能）。
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 1934 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 1,915 insertions(+), 19 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index a59fcc4..24831dd 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -7,6 +7,8 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+using WebAPI.Service;
+
namespace WebAPI.Controllers
{
public class Sc_ProcessMangementController : ApiController
@@ -112,6 +114,97 @@
string sql1 = "select * from h_v_Sc_ProcessReportList where 1 = 1 ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessReportList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇姹囨姤鍗曚富琛ㄨ鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_DetailSc_ProcessReportList_Json")]
+ [HttpGet]
+ public object MES_DetailSc_ProcessReportList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID<=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 = @"select s1.HInterID,s1.HBillNo,s1.HDeptID,s2.HName,s1.HDate,s1.HPlanQty,s1.HICMOBillNo,s1.HRemark,s2.HNumber
+,s1.HMaker,s1.HMakeDate,s1.HChecker,s1.HCheckDate,s1.HUpDater,s1.HUpDateDate,s1.HCloseMan,s1.HCloseDate
+from Sc_ProcessReportMain s1
+ inner join Gy_Department s2 on s1.HDeptID=s2.HItemID and s1.HInterID=" + HInterID;
+
+ ds = oCN.RunProcReturn(sql1, "Sc_ProcessReportMain");
+
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇娲惧伐鍗曞叧鑱旇鎯呬俊鎭�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessMangement/MES_h_v_Sc_ProcessSendWorkList_Json")]
+ [HttpGet]
+ public object MES_h_v_Sc_ProcessSendWorkList_Json(int HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ string sql1 =@"select [hmainid], [鏃ユ湡], [鍗曟嵁鍙穄, [HDeptID], [閮ㄩ棬浠ｇ爜], [閮ㄩ棬], [HMaterID], [鐗╂枡浠ｇ爜], [鐗╂枡鍚嶇О], [瑙勬牸鍨嬪彿], [HUnitID], [璁￠噺鍗曚綅浠ｇ爜], [璁￠噺鍗曚綅], [HprocID],
+[宸ュ簭浠ｇ爜], [宸ュ簭], [HGroupID], [鐝粍浠ｇ爜], [鐝粍鍚嶇О], [HSourceID], [璧勬簮浠ｇ爜], [鐢熶骇璧勬簮], [HWorkerID], [鑱屽憳浠ｇ爜], [鑱屽憳], [hsubid], [鏁伴噺], [璁″垝寮�宸ユ棩鏈焆,
+[璁″垝瀹屽伐鏃ユ湡], [璁″垝宸ユ椂], [琛ㄤ綋澶囨敞], [HICMOInterID], [鐢熶骇浠诲姟鍗曞彿], [HSeOrderInterID], [閿�鍞鍗曞彿], [琛ㄥご澶囨敞], [鍒跺崟浜篯, [鍒跺崟鏃ユ湡], [瀹℃牳浜篯, [瀹℃牳鏃ユ湡], [淇敼浜篯,
+[淇敼鏃ユ湡], [鍏抽棴浜篯, [鍏抽棴鏃ユ湡], [浣滃簾浜篯, [浣滃簾鏃ユ湡], [婧愬崟涓诲唴鐮乚, [婧愬崟瀛愬唴鐮乚, [婧愬崟鍗曞彿], [婧愬崟绫诲瀷], [琛屽叧闂汉], [HBillType], [HQtyDecimal], [HPriceDecimal]
+from h_v_Sc_ProcessSendWorkList
+where hmainid=(select HSourceID from Sc_ProcessReportSub where HInterID="+HInterID+")";
+
+ ds = oCN.RunProcReturn(sql1, "h_v_Sc_ProcessSendWorkList");
+
}
}
catch (Exception e)
@@ -372,6 +465,180 @@
}
/// <summary>
+ /// 淇濆瓨濮斿娲惧伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWProcessSendWork")]
+ [HttpPost]
+ public object SaveWWProcessSendWork([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
+ {
+ WebAPI.DLL.ClsSc_ProcessSendWork Sendwork = new WebAPI.DLL.ClsSc_ProcessSendWork();
+ List<WebAPI.Models.ClsSc_ProcessSendWorkMain> lsmain = new List<WebAPI.Models.ClsSc_ProcessSendWorkMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WWSendWorkMain(msg2);
+ foreach (WebAPI.Models.ClsSc_ProcessSendWorkMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ if (DBUtility.ClsPub.isStrNull(oItem.HPlanBeginDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欒鍒掑紑宸ユ棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ Sendwork.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.WW_EntrustWorkOrderViewModel> ls = new List<WebAPI.Models.WW_EntrustWorkOrderViewModel>();
+ ls = oListModels.getObjectByJson_WWSendWorkSub(msg3);
+ int i = 0;
+ List<Model.ClsSc_ProcessSendWorkSub> lss = new List<Model.ClsSc_ProcessSendWorkSub>();
+ foreach (WebAPI.Models.WW_EntrustWorkOrderViewModel oItemSub in ls)
+ {
+
+ i++;
+ Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub();
+ sendworksub.HProcID = 0;//--宸ュ簭ID
+ sendworksub.HSourceInterID = (long)oItemSub.hmainid;//婧愬崟id
+ sendworksub.HSourceEntryID = oItemSub.hsubid; //--婧愬崟瀛怚D
+ sendworksub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ sendworksub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
+ sendworksub.HQty = oItemSub.鏁伴噺; //--鏁伴噺
+ sendworksub.HICMOBillNo = ""; //--浠诲姟鍗曞彿
+ sendworksub.HSeOrderBillNo = ""; //--閿�鍞鍗曞彿
+ sendworksub.HSeOrderEntryID = 0; //--閿�鍞瓙ID
+ sendworksub.HSeOrderInterID = 0; //--閿�鍞鍗曚富ID
+ sendworksub.HPlanTimes = 0; //--璁″垝宸ユ椂
+ sendworksub.HPlanEndDate = DateTime.Now; //--璁″垝瀹屽伐鏃ユ湡
+ sendworksub.HPlanBeginDate = DateTime.Now; //--璁″垝寮�宸ユ棩鏈�
+ sendworksub.HQty = (double)oItemSub.鏁伴噺; //--娲惧伐鏁伴噺
+ sendworksub.HWorkerNumber = ""; //--鎿嶄綔宸ヤ唬鐮�
+ sendworksub.HWorkerID = 0; //--鎿嶄綔宸D
+ sendworksub.HGroupNumber = ""; //鐝粍浠ｇ爜
+ sendworksub.HGroupID =0; //--鐝粍ID
+ sendworksub.HSourceNumber = ""; //--鐢熶骇璧勬簮浠ｇ爜
+ //--鐢熶骇璧勬簮ID
+ sendworksub.HProcNumber = ""; //--宸ュ簭浠ｇ爜
+
+ if (oItemSub.鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屽澶栨淳宸ユ暟閲忎笉鑳藉ぇ浜庡澶栧伐鍗曟暟閲忥紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //if (DBUtility.ClsPub.isStrNull(oItemSub.HBatChNo) == "")
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓鎵瑰彿锛�";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
+
+ sendworksub.HEntryID = i;
+ sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sendworksub.HRemark = "";
+ sendworksub.HCloseMan = "";
+ sendworksub.HCloseType = false;
+ lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌娲惧伐鍗曞瓙琛ㄧ殑闆嗗悎閲�
+ foreach (Model.ClsSc_ProcessSendWorkSub Itemsendwork in lss)
+ {
+ Sendwork.DetailColl.Add(Itemsendwork);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Sendwork.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = Sendwork.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = Sendwork.ModifyBill(Sendwork.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;
+ }
+ }
+
+ /// <summary>
/// 杩斿洖濮斿宸ュ崟鍒楄〃
/// </summary>
/// <param name="sWhere"></param>
@@ -386,13 +653,941 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from WW_EntrustWorkOrderBillMain ", "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustWorkOrderBillList ", "h_v_WW_EntrustWorkOrderBillList");
}
else
{
- string sql1 = "select * from WW_EntrustWorkOrderBillMain where 1 = 1 ";
+ string sql1 = "select * from h_v_WW_EntrustWorkOrderBillList where 1 = 1 ";
string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "WW_EntrustWorkOrderBillMain");
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustWorkOrderBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖涓嶅悎鏍艰瘎瀹″垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")]
+ [HttpGet]
+ public object MES_QC_NoPassProdCheckBill_Json(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList ", "h_v_QC_NoPassProdCheckBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// PDA宸ュ簭姹囨姤鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveProcessReport")]
+ [HttpPost]
+ public object SaveProcessReport([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
+ ls = oListModels.getObjectByJson_Report(msg1);
+ int i = 0;
+
+ foreach (Models.Sc_ProcessReportViewModel ItemView in ls)
+ {
+ i++;
+ Model.ClsSc_ProcessReportMain ReportMain = new Model.ClsSc_ProcessReportMain();
+ Model.ClsSc_ProcessReportSub ReportSub = new Model.ClsSc_ProcessReportSub();
+ //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3714";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate=DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear=DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HMaker = ItemView.HEmp;
+ ReportMain.HCloseType = false;
+ ReportMain.HPlanQty = (double)ItemView.HQty;
+ ReportMain.HMainSourceInterID = ItemView.HInterID;
+ ReportMain.HInterID =0;
+ ReportMain.HPeriod = 1;
+ ReportMain.HBillSubType = "3714";
+ ReportMain.HBillStatus = 0;
+ ReportMain.HCheckItemNowID = 0;
+ ReportMain.HCheckItemNextID = 0;
+ ReportMain.HICMOInterID= (long)ItemView.HICMOInterID;
+ ReportMain.HICMOBillNo=ItemView.HICMOBillNo;
+ ReportMain.HDeptID = (long)ItemView.HDeptID;
+ ReportMain.HDeptNumber =ItemView.HDeptNumber;
+ ReportMain.HGroupID = (long)ItemView.HGroupID;
+ ReportMain.HGroupNumber = ItemView.HGroupNumber;
+ ReportMain.HMaterID = (long)ItemView.HMaterID;
+ ReportMain.HMaterNumber = ItemView.HMaterNumber;
+ ReportMain.HUnitID = ItemView.HUnitID;
+ ReportMain.HUnitNumber = ItemView.HUnitNumber;
+ ReportMain.HInStockQty = 0;
+ ReportMain.HSumTimes = 0;
+ ReportMain.HExplanation = "";
+ ReportMain.HInnerBillNo = "";
+ ReportMain.HSupID = 0;
+
+
+
+ //淇濆瓨鍒版眹鎶ュ崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HEmpID = (long)ItemView.HEmpID;
+ ReportSub.HICMOBillNo = ItemView.HICMOBillNo;
+ ReportSub.HICMOInterID = (long)ItemView.HICMOInterID;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3712";
+ ReportSub.HQty = (double)ItemView.HQty;
+ ReportSub.HProcID = ItemView.HProcID;
+ ReportSub.HProcNumber = ItemView.HProcNumber;
+ ReportSub.HOutPrice =0;
+ ReportSub.HOutMoney = 0;
+ ReportSub.HSourceID = (long)ItemView.HSourceID;
+ ReportSub.HEmpNumber = "";
+ ReportSub.HRelBeginDate = DateTime.Now;
+ ReportSub.HRelEndDate = DateTime.Now;
+ ReportSub.HTimes =3;
+ ReportSub.HSeOrderInterID = 0;
+ ReportSub.HSeOrderEntryID =0;
+ ReportSub.HSeOrderBillNo = "";
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceInterID = 0;
+ ReportSub.HSourceBillNo = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HMaterID = (long)ItemView.HMaterID;
+ ReportSub.HMaterNumber = ItemView.HMaterNumber;
+ ReportSub.HCheckQty =0;
+ ReportSub.HBadCount =0;
+ ReportSub.HWasterQty =0;
+ ReportSub.HWasterQty2 =0;
+ ReportSub.HPrice =0;
+ ReportSub.HMoney =0;
+ ReportSub.HProcPlanInterID =0;
+ ReportSub.HProcPlanEntryID =0;
+ ReportSub.HProcPlanBillNo ="";
+ ReportSub.HSourceEntryID =0;
+ ReportSub.HSourceBillType ="";
+ ReportSub.HRelationQty =0;
+ ReportSub.HRelationMoney =0;
+ ReportSub.HBadPrirce =0;
+ ReportSub.HBadMoney =0;
+ ReportSub.HWasterPrice =0;
+ ReportSub.HWasterMoney =0;
+ ReportSub.HQualityRate =0;
+ ReportSub.HSecUnitQty1 =0;
+ ReportSub.HSecUnitRate1=0;
+ ReportSub.HSecUnitQty2=0;
+ ReportSub.HSecUnitRate2=0;
+ ReportSub.HUsingQty=0;
+ ReportSub.HSelfBadCount=0;
+ ReportSub.HPreBadCount=0;
+ ReportSub.HPayMentQty=0;
+ ReportSub.HOtherDeduct=0;
+ ReportSub.HRelPay=0;
+ ReportSub.HOtherItem1="";
+ ReportSub.HOtherItem2="";
+ ReportSub.HOtherItem3="";
+ ReportSub.HOtherItem4="";
+ ReportSub.HOtherItem5="";
+ ReportSub.HPackType="";
+ ReportSub.HCheckEmpID=0;
+ ReportSub.HWeight=0;
+ ReportSub.HBatchNo="";
+
+ //淇濆瓨鍒版眹鎶ュ崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (ReportModel.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = ReportModel.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = ReportModel.ModifyBill(ReportModel.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;
+ }
+ }
+
+ /// <summary>
+ /// 娲惧伐鍗曞彿鑾峰彇淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/getHbarCodeDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetHbarCodeDetail(string sBillBarCode)
+ {
+ var model = LuBaoSevice.GetHbarCodeDetail(sBillBarCode);
+ return model;
+ }
+
+ /// <summary>
+ ///宸ュ簭鍙疯幏寰椾俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/getProcDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> GetProcDetail(string sBillNo, string sProcNo)
+ {
+ var model = LuBaoSevice.GetProcDetail(sBillNo, sProcNo);
+ return model;
+ }
+
+ /// <summary>
+ /// 淇濆瓨宸ュ簭姹囨姤鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveProcessReportList")]
+ [HttpPost]
+ public object SaveProcessReportList([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
+ {
+ WebAPI.DLL.ClsSc_ProcessReport ReportModel = new WebAPI.DLL.ClsSc_ProcessReport();
+ List<Model.ClsSc_ProcessReportMain> lsmain = new List<Model.ClsSc_ProcessReportMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Reportlist(msg2);
+ foreach (Model.ClsSc_ProcessReportMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMaker = UserName;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBillType = "3714";
+ //oItem.HExRate = 1;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HPlanQty) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊～鍐欐淳宸ユ暟閲忥紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ ReportModel.omodel = oItem;
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ msg2 = msg2.Replace("'", "鈥�");
+ List<WebAPI.Models.Sc_ProcessSendWorkViewModel> ls = new List<WebAPI.Models.Sc_ProcessSendWorkViewModel>();
+ ls = oListModels.getObjectByJson_ViewReportlist(msg3);
+ int i = 0;
+ //瀹氫箟姹囨姤鍗曞瓙琛ㄩ泦鍚堢敤浜庡瓨鏀句笅鎺ㄦ淳宸ュ崟鐨勫琛屾暟鎹�
+ List<Model.ClsSc_ProcessReportSub> lsReportSub = new List<Model.ClsSc_ProcessReportSub>();
+ foreach (WebAPI.Models.Sc_ProcessSendWorkViewModel ItemView in ls)
+ {
+
+ i++;
+ Model.ClsSc_ProcessReportSub reportSub = new Model.ClsSc_ProcessReportSub();
+ if (ItemView.鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if ((double)ItemView.鏁伴噺 < ReportModel.omodel.HPlanQty)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸伐搴忔眹鎶ュ崟绱姹囨姤鏁伴噺涓嶈兘澶т簬婧愬崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
+ reportSub.HEntryID = i;
+ reportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ reportSub.HRemark = "";
+ reportSub.HCloseMan = ReportModel.omodel.HCloseMan;
+ reportSub.HCloseType = false;
+ reportSub.HEmpID =0;
+ reportSub.HICMOBillNo ="";
+ reportSub.HICMOInterID = (long)ItemView.HICMOInterID;
+ reportSub.HRemark = "";
+ reportSub.HSourceBillType = "3712";
+ reportSub.HQty = (double)ItemView.鏁伴噺;
+ reportSub.HProcID = (long)ItemView.HprocID;
+ reportSub.HProcNumber = ItemView.宸ュ簭浠ｇ爜;
+ reportSub.HOutPrice = 0;
+ reportSub.HOutMoney = 0;
+ reportSub.HSourceID = (long)ItemView.hmainid;
+ reportSub.HEmpNumber = "";
+ reportSub.HRelBeginDate = DateTime.Now;
+ reportSub.HRelEndDate = DateTime.Now;
+ reportSub.HTimes = 3;
+ reportSub.HSeOrderInterID = 0;
+ reportSub.HSeOrderEntryID = 0;
+ reportSub.HSeOrderBillNo = "";
+ reportSub.HProcPlanInterID = 0;
+ reportSub.HProcPlanBillNo = "";
+ reportSub.HSourceInterID = (long)ItemView.hmainid;
+ reportSub.HSourceBillNo = ItemView.鍗曟嵁鍙�;
+ reportSub.HRelationQty = 0;
+ reportSub.HRelationMoney = 0;
+ reportSub.HMaterID = (long)ItemView.HMaterID;
+ reportSub.HMaterNumber = ItemView.鐗╂枡浠ｇ爜;
+ reportSub.HCheckQty = 0;
+ reportSub.HBadCount = 0;
+ reportSub.HWasterQty = 0;
+ reportSub.HWasterQty2 = 0;
+ reportSub.HPrice = 0;
+ reportSub.HMoney = 0;
+ reportSub.HProcPlanInterID = 0;
+ reportSub.HProcPlanEntryID = 0;
+ reportSub.HProcPlanBillNo = "";
+ reportSub.HSourceEntryID = 0;
+ reportSub.HSourceBillType = "3712";
+ reportSub.HRelationQty = 0;
+ reportSub.HRelationMoney = 0;
+ reportSub.HBadPrirce = 0;
+ reportSub.HBadMoney = 0;
+ reportSub.HWasterPrice = 0;
+ reportSub.HWasterMoney = 0;
+ reportSub.HQualityRate = 0;
+ reportSub.HSecUnitQty1 = 0;
+ reportSub.HSecUnitRate1 = 0;
+ reportSub.HSecUnitQty2 = 0;
+ reportSub.HSecUnitRate2 = 0;
+ reportSub.HUsingQty = 0;
+ reportSub.HSelfBadCount = 0;
+ reportSub.HPreBadCount = 0;
+ reportSub.HPayMentQty = 0;
+ reportSub.HOtherDeduct = 0;
+ reportSub.HRelPay = 0;
+ reportSub.HOtherItem1 = "";
+ reportSub.HOtherItem2 = "";
+ reportSub.HOtherItem3 = "";
+ reportSub.HOtherItem4 = "";
+ reportSub.HOtherItem5 = "";
+ reportSub.HPackType = "";
+ reportSub.HCheckEmpID = 0;
+ reportSub.HWeight = 0;
+ reportSub.HBatchNo = "";
+
+ lsReportSub.Add(reportSub);
+
+ }
+ if (lsReportSub.Count>0)
+ {
+ //鐒跺悗鍦ㄥ惊鐜繚瀛樺埌姹囨姤浣嗗瓙琛�
+ foreach (Model.ClsSc_ProcessReportSub item in lsReportSub)
+ {
+
+ ReportModel.DetailColl.Add(item);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴sReportSub闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ ////淇濆瓨鍓嶅垽鏂�(鍗曟嵁鍙烽噸澶嶏紝绗斿綍椤圭洰)
+ ////淇濆瓨
+ ////淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (ReportModel.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = ReportModel.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = ReportModel.ModifyBill(ReportModel.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;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨涓嶈壇璇勫鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveBadReasonList")]
+ [HttpPost]
+ public object SaveBadReasonList([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.ClsQC_NoPassProdCheckBill oBill = new DLL.ClsQC_NoPassProdCheckBill();
+ List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_NoPassProdCheckMain(msg2);
+ foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ UserName=oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HBillType = "7509";
+ oItem.HBillSubType = "7509";
+ oItem.HBillStatus = 1;
+ oItem.HPeriod = 0;
+ oItem.HGroupName ="";
+ oItem.HSourceID = 0;
+ oItem.HICMOInterID = 0;
+ oItem.HICMOBillNo = "";
+ oItem.HInStockQty = 0;
+ oItem.HCheckQty = 0;
+ oItem.HRightQty = 0;
+ oItem.HBadPNL = 0;
+ oItem.HPlanPNL = 0;
+ oItem.HFirstCheckEmp = 0;
+ oItem.HCheckerResult = "";
+ oItem.HWorkCenterID = 0;
+ oItem.HProcExchInterID = 0;
+ oItem.HProcExchEntryID = 0;
+ oItem.HProcExchBillNo = "";
+ oItem.HOrderProcNo = "";
+ oItem.HProcExchQty = 0;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ //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.ClsQC_NoPassProdCheckBillSub> ls = new List<Model.ClsQC_NoPassProdCheckBillSub>();
+ ls = oListModels.getObjectByJson_NoPassProdCheckSub(msg3);
+ int i = 0;
+ foreach (Model.ClsQC_NoPassProdCheckBillSub oItemSub in ls)
+ {
+ i++;
+ if (string.IsNullOrWhiteSpace(oItemSub.HWasterReasonName))
+ {
+ break;
+ }
+ //灏嗗墠鍙颁复鏃跺瓨鏀剧殑鍊间紶杩囨潵鐨勫�艰祴缁欏搴旂殑涓嶈壇鏁伴噺瀛楁
+ oItemSub.HBadQty = Convert.ToDecimal( oItemSub.HMRBChecker);
+ if (oItemSub.HBadQty<=0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屼笉鑹瘎瀹℃暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty )
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉鑳藉ぇ浜庝笉鑹暟閲忥紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾湭濉啓涓嶈壇鍘熷洜锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItemSub.HSourceEntryID = oBill.omodel.HMainSourceEntryID;
+ oItemSub.HSourceInterID = oBill.omodel.HMainSourceInterID;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false;
+ oItemSub.HBillNo_bak = oBill.omodel.HBillNo;
+ oItemSub.HMRBChecker = "";
+ oItemSub.HSourceBillNo = oBill.omodel.HMainSourceBillNo;
+ oItemSub.HSourceBillType = "3715";
+ oItemSub.HRelationQty = 0;
+ oItemSub.HRelationMoney = 0;
+ oItemSub.HMaterID = oBill.omodel.HMaterID;
+ oItemSub.HUnitID = 0;
+ oItemSub.HMustQty = 0;
+ oItemSub.HDisposeNote = "";
+ oItemSub.HPunishmentBillNo = "";
+ oItemSub.HBadPCSQty = 0;
+ oItemSub.HQCResultID = 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;
+ }
+ }
+
+
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝叧闂姛鑳�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsClose"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("CloseProcessReportList")]
+ [HttpGet]
+ public object CloseProcessReportList(int HInterID,int IsClose,string CurUserName)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();
+ var HCloseMan = ds.Tables[0].Rows[0]["HCloseMan"].ToString();
+
+ if (IsClose == 0)
+ {
+ if (HCloseMan.Trim() != "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿叧闂紒锛侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='" + CurUserName + "' ,HCloseDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else if(IsClose==1)
+ {
+ if (HCloseMan.Trim() == "" || HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佹湭鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁告挙閿�鍏抽棴锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HCloseMan='' ,HCloseDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏃犳硶鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栧垯鍙嶅叧闂け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 姹囨姤鍗曠紪杈戝鏍稿弽瀹℃牳鍔熻兘
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="IsAudit"></param>
+ /// <param name="CurUserName"></param>
+ /// <returns></returns>
+ [Route("AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ DataSet ds;
+ string ModRightNameCheck = "Sc_ProcessReport_check";
+ var a = DBUtility.ClsPub.CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from Sc_ProcessReportMain where HInterID=" + HInterID, "Sc_ProcessReportMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩欎釜鍗曟嵁锛屾棤娉曞鏍革紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var HChecker = ds.Tables[0].Rows[0]["HChecker"].ToString();//鍙栧鏍镐汉
+ var HMaker=ds.Tables[0].Rows[0]["HMaker"].ToString();//鍙栧埗鍗曚汉
+ var HCloseMan=ds.Tables[0].Rows[0]["HCloseMan"].ToString();//鍙栧叧闂汉
+ if (IsAudit == 0)
+ {
+ if (HChecker.Trim() != "" || HChecker.Trim() == HMaker || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笉鍏佽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='" + CurUserName + "' ,HCheckDate=GETDATE() where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (IsAudit == 1)
+ {
+ if (HChecker.Trim() == "" || HChecker.Trim() == CurUserName || HCloseMan != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍搞�佸凡鍏抽棴銆佸凡浣滃簾鐘舵�佷笅涓嶅厑璁稿弽瀹℃牳锛侊紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.RunProc("update Sc_ProcessReportMain set HChecker='' ,HCheckDate=null where HInterID=" + HInterID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "* 鍗曟嵁鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏃犳硶瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭娲惧伐鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcSendWorkBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcSendWorkBillList ", "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcSendWorkBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcSendWorkBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝姹囨姤鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessReportBill_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessReportBillList ", "h_v_WW_EntrustProcessReportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessReportBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessReportBillList");
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ return GetObjectJson(ds);
+ }
+
+ /// <summary>
+ /// 杩斿洖濮斿宸ュ簭璁″垝杞嚭鍗曞垪琛�
+ /// </summary>
+ /// <param name="sqlWhere"></param>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json")]
+ [HttpGet]
+ public object MES_WW_EntrustProcessSendOutBillList_Json(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select top 500 * from h_v_WW_EntrustProcessSendOutBillList ", "h_v_WW_EntrustProcessSendOutBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_WW_EntrustProcessSendOutBillList where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_WW_EntrustProcessSendOutBillList");
}
}
catch (Exception e)
@@ -408,41 +1603,742 @@
/// <summary>
- /// 杩斿洖濮斿宸ュ簭姹囨姤鍗曞垪琛�
+ /// 淇濆瓨濮斿姹囨姤鍗曚俊鎭�
/// </summary>
- /// <param name="sWhere"></param>
+ /// <param name="msg"></param>
/// <returns></returns>
- [Route("Sc_ProcessMangement/MES_Sc_StationOutBillMain_Json")]
- [HttpGet]
- public object MES_Sc_StationOutBillMain_Json(string sWhere)
+ [Route("SaveWW_EntrustProcessReportBill")]
+ [HttpPost]
+ public object SaveWW_EntrustProcessReportBill([FromBody] JObject msg)
{
- DataSet ds;
+ 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
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sWhere == null || sWhere.Equals(""))
+ WebAPI.DLL.ClsWW_EntrustProcessReportBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessReportBill();
+ List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessReportBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WW_EntrustProcessReportBillMain(msg2);
+ foreach (WebAPI.Models.ClsWW_EntrustProcessReportBillMain oItem in lsmain)
{
- ds = oCN.RunProcReturn("select top 500 * from Sc_StationOutBillMain ", "Sc_StationOutBillMain");
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ Sendwork.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.WW_EntrustProcSendWorkViewModel> ls = new List<WebAPI.Models.WW_EntrustProcSendWorkViewModel>();
+ ls = oListModels.getObjectByJson_WW_EntrustProcSendWork(msg3);
+ int i = 0;
+ List<Models.ClsWW_EntrustProcessReportBillSub> lss = new List<Models.ClsWW_EntrustProcessReportBillSub>();
+ foreach (WebAPI.Models.WW_EntrustProcSendWorkViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustProcessReportBillSub sendworksub = new Models.ClsWW_EntrustProcessReportBillSub();
+ sendworksub.HProcID = 0;//--宸ュ簭ID
+ sendworksub.HSourceInterID = (long)oItemSub.hmainid;//婧愬崟id
+ sendworksub.HSourceEntryID = (long)oItemSub.hsubid; //--婧愬崟瀛怚D
+ sendworksub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ sendworksub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
+ sendworksub.HQty = (decimal)oItemSub.鏁伴噺; //--鏁伴噺
+ sendworksub.HICMOBillNo = ""; //--浠诲姟鍗曞彿
+ sendworksub.HSeOrderBillNo = ""; //--閿�鍞鍗曞彿
+ sendworksub.HSeOrderEntryID = 0; //--閿�鍞瓙ID
+ sendworksub.HSeOrderInterID = 0; //--閿�鍞鍗曚富ID
+ sendworksub.HTimes = 0; //--璁″垝宸ユ椂
+ if (oItemSub.鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屽澶栨眹鎶ユ暟閲忎笉鑳藉ぇ浜庡澶栨淳宸ュ崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
+ sendworksub.HEntryID = i;
+ sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sendworksub.HRemark = "";
+ sendworksub.HCloseMan = "";
+ sendworksub.HCloseType = false;
+ lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌娲惧伐鍗曞瓙琛ㄧ殑闆嗗悎閲�
+ foreach (Models.ClsWW_EntrustProcessReportBillSub Itemsendwork in lss)
+ {
+ Sendwork.DetailColl.Add(Itemsendwork);
+ }
}
else
{
- string sql1 = "select * from Sc_StationOutBillMain where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Sendwork.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = Sendwork.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = Sendwork.ModifyBill(Sendwork.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 = null;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
return objJsonResult;
}
- return GetObjectJson(ds);
}
- //
+ /// <summary>
+ /// 濮斿娲惧伐鍗曞彿鑾峰彇淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/WWgetHbarCodeDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> WWGetHbarCodeDetail(string sBillBarCode)
+ {
+ var model = LuBaoSevice.WWGetHbarCodeDetail(sBillBarCode);
+ return model;
+ }
+
+ /// <summary>
+ ///濮斿宸ュ簭鍙疯幏寰椾俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_ProcessMangement/WWgetProcDetail")]
+ [HttpGet]
+ public ApiResult<DataSet> WWGetProcDetail(string sBillNo, string sProcNo)
+ {
+ var model = LuBaoSevice.WWGetProcDetail(sBillNo, sProcNo);
+ return model;
+ }
+
+ /// <summary>
+ /// PDA濮斿宸ュ簭姹囨姤鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWReport")]
+ [HttpPost]
+ public object SaveWWReport([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessReportBill ReportModel = new WebAPI.DLL.ClsWW_EntrustProcessReportBill();
+ List<WebAPI.Models.WWReportViewModel> ls = new List<WebAPI.Models.WWReportViewModel>();
+ ls = oListModels.getObjectByJson_WWReport(msg1);
+ int i = 0;
+
+ foreach (Models.WWReportViewModel ItemView in ls)
+ {
+ i++;
+ Models.ClsWW_EntrustProcessReportBillMain ReportMain = new Models.ClsWW_EntrustProcessReportBillMain();
+ Models.ClsWW_EntrustProcessReportBillSub ReportSub = new Models.ClsWW_EntrustProcessReportBillSub();
+ //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3742";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HMaker = "";
+ ReportMain.HCloseType = false;
+ ReportMain.HPrintQty = 0;
+ ReportMain.HMainSourceBillType = "3740";
+ ReportMain.HMainSourceInterID =0;
+ ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo;
+ ReportMain.HInterID = 0;
+ ReportMain.HPeriod = 1;
+ ReportMain.HBillSubType = "3742";
+ ReportMain.HBillStatus = 0;
+ ReportMain.HCheckItemNowID = 0;
+ ReportMain.HCheckItemNextID = 0;
+ ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
+ ReportMain.HExplanation = "";
+ ReportMain.HInnerBillNo = "";
+ ReportMain.HSupID =Convert.ToInt32( ItemView.HSupID);
+
+
+ //淇濆瓨鍒版眹鎶ュ崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HMaterID = Convert.ToInt32(ItemView.HMaterID);
+ ReportSub.HICMOBillNo = "";
+ ReportSub.HICMOInterID = 0;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3740";
+ ReportSub.HQty = Convert.ToDecimal(ItemView.HQty);
+ ReportSub.HProcID =Convert.ToInt32( ItemView.HProcID);
+ ReportSub.HTimes = 0;
+ ReportSub.HSeOrderInterID = 0;
+ ReportSub.HSeOrderEntryID = 0;
+ ReportSub.HSeOrderBillNo = "";
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceInterID = 0;
+ ReportSub.HSourceBillNo = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HCheckQty = 0;
+ ReportSub.HBadCount = 0;
+ ReportSub.HWasterQty = 0;
+ ReportSub.HWasterQty2 = 0;
+ ReportSub.HPrice = 0;
+ ReportSub.HMoney = 0;
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanEntryID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceEntryID = 0;
+ ReportSub.HSourceBillType = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HBadPrirce = 0;
+ ReportSub.HBadMoney = 0;
+ ReportSub.HWasterPrice = 0;
+ ReportSub.HWasterMoney = 0;
+ ReportSub.HQualityRate = 0;
+ ReportSub.HUsingQty = 0;
+ ReportSub.HSelfBadCount = 0;
+ ReportSub.HPreBadCount = 0;
+ ReportSub.HPayMentQty = 0;
+ ReportSub.HPackType = "";
+ ReportSub.HCheckEmpID = 0;
+ ReportSub.HWeight = 0;
+ ReportSub.HBatchNo = "";
+
+ //淇濆瓨鍒板澶栨眹鎶ュ崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ bResult = ReportModel.AddBill(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;
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨濮斿杞嚭鍗曚俊鎭�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWW_EntrustProcessSendOutBill")]
+ [HttpPost]
+ public object SaveWW_EntrustProcessSendOutBill([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
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessSendOutBill Sendwork = new WebAPI.DLL.ClsWW_EntrustProcessSendOutBill();
+ List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain> lsmain = new List<WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WW_EntrustProcessSendOutBillMain(msg2);
+ foreach (WebAPI.Models.ClsWW_EntrustProcessSendOutBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+ Sendwork.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.WW_EntrustProcSendWorkViewModel> ls = new List<WebAPI.Models.WW_EntrustProcSendWorkViewModel>();
+ ls = oListModels.getObjectByJson_WW_EntrustProcSendWork(msg3);
+ int i = 0;
+ List<Models.ClsWW_EntrustProcessSendOutBillSub> lss = new List<Models.ClsWW_EntrustProcessSendOutBillSub>();
+ foreach (WebAPI.Models.WW_EntrustProcSendWorkViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustProcessSendOutBillSub sendworksub = new Models.ClsWW_EntrustProcessSendOutBillSub();
+ sendworksub.HProcID = 0;//--宸ュ簭ID
+ sendworksub.HSourceInterID = (long)oItemSub.hmainid;//婧愬崟id
+ sendworksub.HSourceEntryID = (long)oItemSub.hsubid; //--婧愬崟瀛怚D
+ sendworksub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ sendworksub.HSourceBillType = oItemSub.HBillType; //--婧愬崟绫诲瀷
+ sendworksub.HQty = (decimal)oItemSub.鏁伴噺; //--鏁伴噺
+ sendworksub.HICMOBillNo = ""; //--浠诲姟鍗曞彿
+ sendworksub.HSeOrderBillNo = ""; //--閿�鍞鍗曞彿
+ sendworksub.HSeOrderEntryID = 0; //--閿�鍞瓙ID
+ sendworksub.HSeOrderInterID = 0; //--閿�鍞鍗曚富ID
+ if (oItemSub.鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(sendworksub.HQty) > Convert.ToInt32(oItemSub.鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屽澶栨眹鎶ユ暟閲忎笉鑳藉ぇ浜庡澶栨淳宸ュ崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
+ sendworksub.HEntryID = i;
+ sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sendworksub.HRemark = "";
+ sendworksub.HCloseMan = "";
+ sendworksub.HCloseType = false;
+ lss.Add(sendworksub);//鍏堟妸鏁版嵁瀛樻斁鍒版淳宸ュ崟瀛愯〃闆嗗悎閲�
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌娲惧伐鍗曞瓙琛ㄧ殑闆嗗悎閲�
+ foreach (Models.ClsWW_EntrustProcessSendOutBillSub Itemsendwork in lss)
+ {
+ Sendwork.DetailColl.Add(Itemsendwork);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (Sendwork.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = Sendwork.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = Sendwork.ModifyBill(Sendwork.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;
+ }
+ }
+
+ /// <summary>
+ /// PDA濮斿宸ュ簭杞嚭鍗曚繚瀛�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWSendOutBill")]
+ [HttpPost]
+ public object SaveWWSendOutBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ ListModels oListModels = new ListModels();
+ try
+ {
+ WebAPI.DLL.ClsWW_EntrustProcessSendOutBill ReportModel = new WebAPI.DLL.ClsWW_EntrustProcessSendOutBill();
+ List<WebAPI.Models.WWSendOutBillViewModel> ls = new List<WebAPI.Models.WWSendOutBillViewModel>();
+ ls = oListModels.getObjectByJson_WWSendOutBill(msg1);
+ int i = 0;
+
+ foreach (Models.WWSendOutBillViewModel ItemView in ls)
+ {
+ i++;
+ Models.ClsWW_EntrustProcessSendOutBillMain ReportMain = new Models.ClsWW_EntrustProcessSendOutBillMain();
+ Models.ClsWW_EntrustProcessSendOutBillSub ReportSub = new Models.ClsWW_EntrustProcessSendOutBillSub();
+ //宸ュ簭杞嚭鍗曚富琛ㄤ繚瀛�
+ ReportMain.HBillType = "3741";
+ ReportMain.HBillNo = ItemView.HBillNo;
+ ReportMain.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ ReportMain.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ ReportMain.HDate = DateTime.Now;
+ ReportMain.HMaker = "";
+ ReportMain.HCloseType = false;
+ ReportMain.HPrintQty = 0;
+ ReportMain.HMainSourceBillType = "3740";
+ ReportMain.HMainSourceInterID = 0;
+ ReportMain.HMainSourceBillNo = ItemView.HWW_BillNo;
+ ReportMain.HInterID = 0;
+ ReportMain.HPeriod = 1;
+ ReportMain.HBillSubType = "3741";
+ ReportMain.HBillStatus = 0;
+ ReportMain.HCheckItemNowID = 0;
+ ReportMain.HCheckItemNextID = 0;
+ ReportMain.HDeptID = Convert.ToInt32(ItemView.HDeptID);
+ ReportMain.HExplanation = "";
+ ReportMain.HInnerBillNo = "";
+ ReportMain.HSupID = Convert.ToInt32(ItemView.HSupID);
+
+
+ //淇濆瓨鍒拌浆鍑哄崟涓昏〃
+ ReportModel.omodel = ReportMain;
+
+
+ ReportSub.HMaterID = Convert.ToInt32(ItemView.HMaterID);
+ ReportSub.HICMOBillNo = "";
+ ReportSub.HICMOInterID = 0;
+ ReportSub.HEntryID = i;
+ ReportSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ ReportSub.HRemark = "";
+ ReportSub.HCloseMan = "";
+ ReportSub.HCloseType = false;
+ ReportSub.HSourceBillType = "3740";
+ ReportSub.HQty = Convert.ToDecimal(ItemView.HQty);
+ ReportSub.HProcID = Convert.ToInt32(ItemView.HProcID);
+ ReportSub.HSeOrderInterID = 0;
+ ReportSub.HSeOrderEntryID = 0;
+ ReportSub.HSeOrderBillNo = "";
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceInterID = 0;
+ ReportSub.HSourceBillNo = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HPrice = 0;
+ ReportSub.HMoney = 0;
+ ReportSub.HProcPlanInterID = 0;
+ ReportSub.HProcPlanEntryID = 0;
+ ReportSub.HProcPlanBillNo = "";
+ ReportSub.HSourceEntryID = 0;
+ ReportSub.HSourceBillType = "";
+ ReportSub.HRelationQty = 0;
+ ReportSub.HRelationMoney = 0;
+ ReportSub.HPackType = "";
+ ReportSub.HBatchNo = "";
+
+ //淇濆瓨鍒板澶栬浆鍑哄崟瀛愯〃
+ ReportModel.DetailColl.Add(ReportSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ bResult = ReportModel.AddBill(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;
+ }
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨濮斿宸ュ崟淇℃伅
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("SaveWWWorkOrder")]
+ [HttpPost]
+ public object SaveWWWorkOrder([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
+ {
+ WebAPI.DLL.ClsWW_EntrustWorkOrderBill WorkOrder = new WebAPI.DLL.ClsWW_EntrustWorkOrderBill();
+ List<Models.ClsWW_EntrustWorkOrderBillMain> lsmain = new List<Models.ClsWW_EntrustWorkOrderBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_WorkOrderMain(msg2);
+ foreach (Models.ClsWW_EntrustWorkOrderBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HDate = DateTime.Now;
+ oItem.HMainSourceInterID = oItem.HInterID;
+ oItem.HInterID = 0;
+
+
+
+ WorkOrder.omodel = oItem;
+
+
+ }
+
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ List<WebAPI.Models.Sc_ProcessPlanViewModel> ls = new List<WebAPI.Models.Sc_ProcessPlanViewModel>();
+ ls = oListModels.getObjectByJson_SendWorkSub(msg3);
+ int i = 0;
+ List<Models.ClsWW_EntrustWorkOrderBillSub> lss = new List<Models.ClsWW_EntrustWorkOrderBillSub>();
+ foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls)
+ {
+
+ i++;
+ Models.ClsWW_EntrustWorkOrderBillSub WorkOrdersub = new Models.ClsWW_EntrustWorkOrderBillSub();
+ WorkOrdersub.HProcID = oItemSub.hprocid.Value;//--宸ュ簭ID
+ WorkOrdersub.HSourceInterID = oItemSub.hmainid.Value; //--婧愬崟id
+ WorkOrdersub.HSourceEntryID = oItemSub.hsubid.Value; //--婧愬崟瀛怚D
+ WorkOrdersub.HSourceBillNo = oItemSub.鍗曟嵁鍙�; //--婧愬崟鍗曞彿
+ WorkOrdersub.HSourceBillType= oItemSub.HBillType; //--婧愬崟绫诲瀷
+ WorkOrdersub.HRelationQty = 0; //--鍏宠仈鏁伴噺
+ WorkOrdersub.HRelationMoney = 0; //--鍏宠仈閲戦
+ WorkOrdersub.HOrderBillNo = ""; //--閿�鍞鍗曞彿
+ WorkOrdersub.HMaterLenModel = ""; //--鏉愯川
+ WorkOrdersub.HMaterQty = 0; //--鏉愯川鏁伴噺
+ WorkOrdersub.HMaterID = oItemSub.HMaterID.Value; //--鐗╂枡
+ WorkOrdersub.HQty = (double)oItemSub.璁″垝鏁伴噺; //--璁㈠崟鏁伴噺
+ WorkOrdersub.HEntrustType = "3739"; //--濮斿绫诲瀷
+ WorkOrdersub.HNextProcName = ""; //--涓嬮亾宸ュ簭
+ WorkOrdersub.HPrice =0; //鍔犲伐璐�
+ WorkOrdersub.HOutQty = 0; //--鍏宠仈鍙戝嚭鏁伴噺
+ WorkOrdersub.HInQty =0; //--鍏宠仈鎺ユ敹鏁伴噺
+ WorkOrdersub.HBackSupDate = DateTime.Now; //--瀹為檯浜よ揣鏃ユ湡
+ WorkOrdersub.HInDate = DateTime.Now; //--浜よ揣鏃ユ湡
+ WorkOrdersub.HWorkProcFlow = ""; //--宸ヨ壓娴�
+ WorkOrdersub.HLeftMater = ""; //--浣欐枡鎯呭喌
+
+ if (oItemSub.璁″垝鏁伴噺 <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (Convert.ToInt32(WorkOrdersub.HQty) > Convert.ToInt32(oItemSub.璁″垝鏁伴噺))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾淳宸ユ暟閲忎笉鑳藉ぇ浜庤鍒掑崟鏁伴噺锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ WorkOrdersub.HEntryID = i;
+ WorkOrdersub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ WorkOrdersub.HRemark = "";
+ WorkOrdersub.HCloseMan = "";
+ WorkOrdersub.HCloseType = false;
+ WorkOrdersub.HSourceBillType = oItemSub.HBillType;
+ lss.Add(WorkOrdersub);//鍏堟妸鏁版嵁瀛樻斁鍒板澶栧伐鍗曞瓙琛ㄩ泦鍚堥噷
+
+
+ }
+ if (lss.Count > 0)
+ {
+ //鐒跺悗鍐嶅惊鐜繚瀛樺埌濮斿宸ュ崟瀛愯〃鐨勯泦鍚堥噷
+ foreach (Models.ClsWW_EntrustWorkOrderBillSub Itemsendwork in lss)
+ {
+ WorkOrder.DetailColl.Add(Itemsendwork);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛乴ss闆嗗悎灏忎簬0";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (WorkOrder.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ bResult = WorkOrder.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = WorkOrder.ModifyBill(WorkOrder.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;
+ }
+ }
+
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1