From 6731f533b1abf47aec884cc10d66a2d6e790fd13 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期四, 08 四月 2021 21:26:10 +0800
Subject: [PATCH] LAYUI版本PDA模式：增加工序汇报单编辑模块
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 211 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 182 insertions(+), 29 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 2b9db17..b2b315a 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
@@ -251,31 +253,50 @@
List<WebAPI.Models.Sc_ProcessPlanViewModel> ls = new List<WebAPI.Models.Sc_ProcessPlanViewModel>();
ls = oListModels.getObjectByJson_SendWorkSub(msg3);
int i = 0;
- Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub();
+ List<Model.ClsSc_ProcessSendWorkSub> lss = new List<Model.ClsSc_ProcessSendWorkSub>();
foreach (WebAPI.Models.Sc_ProcessPlanViewModel oItemSub in ls)
{
-
- //foreach (var item in collection)
- //{
- //}
- //i++;
- //if (oItemSub.HQty <= 0)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉澶т簬0鏃犳硶淇濆瓨锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- //}
- //if (oItemSub.HQty > oItemSub.HRelationQty)
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "淇濆瓨澶辫触锛佺" + i.ToString() + "琛屾暟閲忎笉鑳藉ぇ浜庢湭鍏宠仈鏁伴噺锛�";
- // objJsonResult.data = 1;
- // return objJsonResult;
- //}
+ i++;
+ Model.ClsSc_ProcessSendWorkSub sendworksub = new Model.ClsSc_ProcessSendWorkSub();
+ sendworksub.HProcID = oItemSub.hprocid.Value;//--宸ュ簭ID
+ sendworksub.HProcPlanBillNo = oItemSub.宸ュ簭璁″垝鍗曞彿; //--宸ュ簭璁″垝鍗曞彿
+ sendworksub.HProcPlanEntryID = oItemSub.hsubid.Value; //--宸ュ簭璁″垝鍗曞瓙ID
+ sendworksub.HProcPlanInterID = oItemSub.hmainid.Value; //--宸ュ簭璁″垝鍗旾D
+ sendworksub.HICMOInterID = oItemSub.hicmointerid.Value; //--浠诲姟鍗旾D
+ sendworksub.HICMOBillNo = oItemSub.浠诲姟鍗曞彿; //--浠诲姟鍗曞彿
+ sendworksub.HSeOrderBillNo = oItemSub.閿�鍞鍗曞彿; //--閿�鍞鍗曞彿
+ sendworksub.HSeOrderEntryID = oItemSub.閿�鍞鍗曞瓙ID.Value; //--閿�鍞瓙ID
+ sendworksub.HSeOrderInterID = oItemSub.閿�鍞鍗曚富ID.Value; //--閿�鍞鍗曚富ID
+ sendworksub.HPlanTimes = (float)oItemSub.璁″垝鍔犲伐鏃堕棿; //--璁″垝宸ユ椂
+ sendworksub.HPlanEndDate = oItemSub.璁″垝瀹屽伐鏃ユ湡.Value; //--璁″垝瀹屽伐鏃ユ湡
+ sendworksub.HPlanBeginDate = oItemSub.璁″垝寮�宸ユ棩鏈�.Value; //--璁″垝寮�宸ユ棩鏈�
+ sendworksub.HQty = (double)oItemSub.璁″垝鏁伴噺; //--娲惧伐鏁伴噺
+ sendworksub.HWorkerNumber = oItemSub.鎿嶄綔鍛樹唬鐮�; //--鎿嶄綔宸ヤ唬鐮�
+ sendworksub.HWorkerID = oItemSub.HWorkerID.Value; //--鎿嶄綔宸D
+ sendworksub.HGroupNumber = oItemSub.鐝粍浠ｇ爜; //鐝粍浠ｇ爜
+ sendworksub.HGroupID = oItemSub.HGroupID.Value; //--鐝粍ID
+ sendworksub.HSourceNumber = oItemSub.鐢熶骇璧勬簮; //--鐢熶骇璧勬簮浠ｇ爜
+ //--鐢熶骇璧勬簮ID
+ sendworksub.HProcNumber = oItemSub.宸ュ簭浠ｇ爜; //--宸ュ簭浠ｇ爜
+ sendworksub.HRemark = oItemSub.琛ㄤ綋澶囨敞; //--澶囨敞
+
+ 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";
@@ -285,14 +306,31 @@
// return objJsonResult;
//}
- //oItemSub.HEntryID = i;
- //oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- //oItemSub.HRemark = "";
- //oItemSub.HCloseMan = "";
- //oItemSub.HCloseType = false;
- //Sendwork.DetailColl.Add(oItemSub);
+ sendworksub.HEntryID = i;
+ sendworksub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ sendworksub.HRemark = "";
+ sendworksub.HCloseMan = "";
+ sendworksub.HCloseType = false;
+ sendworksub.HSourceBillType = oItemSub.HBillType;
+ 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;
}
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -406,6 +444,121 @@
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
+ {
+ DAL.ClsSc_ProcessReport ReportModel = new DAL.ClsSc_ProcessReport();
+ List<WebAPI.Models.Sc_ProcessReportViewModel> ls = new List<WebAPI.Models.Sc_ProcessReportViewModel>();
+ ls = oListModels.getObjectByJson_Report(msg1);
+ int i = 0;
+ Model.ClsSc_ProcessReportMain ReportMain = new Model.ClsSc_ProcessReportMain();
+ Model.ClsSc_ProcessReportSub ReportSub = new Model.ClsSc_ProcessReportSub();
+ foreach (Models.Sc_ProcessReportViewModel ItemView in ls)
+ {
+ i++;
+ //宸ュ簭姹囨姤鍗曚富琛ㄤ繚瀛�
+ 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.HInterID = ItemView.HInterID;
+ ReportMain.HMaker = ItemView.HEmp;
+ ReportMain.HCloseType = false;
+ ReportMain.HPlanQty = (double)ItemView.HQty;
+ //淇濆瓨鍒版眹鎶ュ崟涓昏〃
+ 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;
+ //淇濆瓨鍒版眹鎶ュ崟瀛愯〃
+ 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;
+ }
+
//
}
--
Gitblit v1.9.1