From ea64c8992b1345063f95e860fde9d7482150a89b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 19 九月 2023 16:33:59 +0800
Subject: [PATCH] 乔一指引卡变更 帅威 计划平台功能优化
---
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 2
Model/质检管理/ClsSc_ProcessExchangeBillMain_Note.cs | 25 ++++++++
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | 93 +++++++++++++++++++++++++++++++
Model/Model.csproj | 1
4 files changed, 120 insertions(+), 1 deletions(-)
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 82dca5a..f8fd1c1 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -584,6 +584,7 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldStockBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipConkBookBillSub.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsSc_ProcessExchangeBillMain_Note.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_FirstPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_PatrolProcCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_ProcessCheckBillSub_ValueGrid.cs" />
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs"
new file mode 100644
index 0000000..0d4f6bf
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain_Note.cs"
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class Sc_ProcessExchangeBillMain_Note : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HSouceID_Original;
+ public Int64 HSouceID_Now;
+ public Int64 HICMOInterID;
+ public String HICMOBillNo;
+ public Int64 HProcExchInterID;
+ public Int64 HProcExchEntryID;
+ public String HProcExchBillNo;
+ public Int64 HProcExchQty;
+ public Int64 HMaterID;
+ public String HBillNo_Note;
+ public Int64 HICMOEntryID;
+ public Int64 HUnitID;
+ public Int64 HProcID;
+ public Int64 HOrgID;
+
+ }
+}
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index 15a850e..98940fd 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -1169,6 +1169,99 @@
}
#endregion
+ #region 鎸囧紩鍗″彉鏇村崟 鏂板淇濆瓨
+ [Route("MES_Sc_ProcessExchangeBillMain_Note_PDA/ProcessExchangeBillMain_NoteAddBill")]
+ [HttpPost]
+ public object ProcessExchangeBillMain_NoteAddBill([FromBody] JObject oMain)
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ try
+ {
+ //鍙嶅簭鍒楀寲
+ string msg2 = "[" + sArray[0].ToString() + "]";
+ string user = sArray[1].ToString();//鐢ㄦ埛鍚�
+ string OperationType = sArray[2].ToString();//绫诲瀷
+
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Change", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲彉鏇存潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<Model.Sc_ProcessExchangeBillMain_Note> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.Sc_ProcessExchangeBillMain_Note>>(msg2);
+
+ long HSouceID_Original = list[0].HSouceID_Original;
+ long HSouceID_Now = list[0].HSouceID_Now;
+ long HOrgID = list[0].HOrgID;//缁勭粐ID
+ String HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
+ long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HProcExchInterID = list[0].HProcExchInterID;
+ long HProcExchEntryID = list[0].HProcExchEntryID;
+ String HProcExchBillNo = list[0].HProcExchBillNo;
+ String HBillNo_Note = list[0].HBillNo_Note;//鎸囧紩鍗�
+ long HMaterID = list[0].HMaterID;//浜у搧ID
+ long HUnitID = list[0].HUnitID;//璁￠噺鍗曚綅
+ long HProcID = list[0].HProcID;//宸ュ簭ID
+ string HMaker = user;//鍒跺崟浜�
+ string HMakeDate = list[0].HMakeDate;//鍒跺崟鏃ユ湡
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂�
+ if (HProcExchBillNo == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夐�夋嫨锛佽鎵弿鏉″舰鐮佹垨杈撳叆鏉″舰鐮佸悗鍥炶溅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ if (OperationType == "1")
+ {
+ oCN.RunProc("Insert Into Sc_ProcessExchangeBillMain_Note " +
+ "(HBillNo_Note,HSouceID_Original,HSouceID_Now,HOrgID,HICMOInterID,HICMOBillNo,HProcExchBillNo,HProcExchInterID" +
+ ",HProcExchEntryID,HMaterID,HUnitID,HProcID,HMaker,HMakeDate)" +
+ " values('" + HBillNo_Note + "','" + HSouceID_Original + "'," + HSouceID_Now + ",'" + HOrgID + "'," + HICMOInterID + ",'"+ HICMOBillNo + "','" + HProcExchBillNo + "' ," + HProcExchInterID +
+ "," + HProcExchEntryID + ",'" + HMaterID + "','" + HUnitID + "'," + HProcID + ",'" + HMaker + "','" + HMakeDate + "')" );
+
+ oCN.RunProc("update Sc_ProcessExchangeBillSub set HSourceID=" + HSouceID_Now + " where HInterID=" + HProcExchInterID + " and HEntryID=" + HProcExchEntryID);
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔绫诲瀷鏃犳晥锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鍑虹珯姹囨姤鍗曟樉绀鸿〃浣撴槑缁�
[Route("Cj_StationEntrustInBill/DisBillEntryList")]
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 82a2a5d..0ac933a 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -129,7 +129,7 @@
public json AddBillMain(string msg1)
{
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string user = sArray[1].ToString();
--
Gitblit v1.9.1