From e4674196f18a1bec1d92ce63a50addbca001c9b4 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 28 十一月 2022 17:45:42 +0800
Subject: [PATCH] 代码上传
---
WebAPI/Controllers/Sc_MouldController.cs | 255 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 228 insertions(+), 27 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index af82ab5..4f9248d 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -1480,7 +1480,7 @@
#endregion
- #region 璁惧缁翠慨璁板綍鍗曚繚瀛�
+ #region 璁惧淇濆吇璁板綍鍗曚繚瀛�
[Route("Sb_EquipMaintainBill/EquipMaintainBill_Save")]
[HttpPost]
@@ -1497,15 +1497,15 @@
try
{
msg1 = "[" + msg1.ToString() + "]";
- DAL.ClsSb_MouldRepairWorkBill BillNew = new DAL.ClsSb_MouldRepairWorkBill();
- List<Model.ClsSb_MouldRepairWorkBillMain> mainList = Newtonsoft
+ DAL.ClsSb_EquipMaintainBill BillNew = new DAL.ClsSb_EquipMaintainBill();
+ List<Model.ClsSb_EquipMaintainBillMain> mainList = Newtonsoft
.Json
.JsonConvert
- .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillMain>>(msg1);
- List<Model.ClsSb_MouldRepairWorkBillSub> subList = Newtonsoft
+ .DeserializeObject<List<Model.ClsSb_EquipMaintainBillMain>>(msg1);
+ List<Model.ClsSb_EquipMaintainBillSub> subList = Newtonsoft
.Json
.JsonConvert
- .DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(msg1);
+ .DeserializeObject<List<Model.ClsSb_EquipMaintainBillSub>>(msg1);
string s = "";
int sYear = 0;
int sPeriod = 0;
@@ -1523,27 +1523,23 @@
BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
BillNew.omodel.HMaker = mainList[0].HMaker;
BillNew.omodel.HDate = HDate;
- BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ BillNew.omodel.HEquipID = mainList[0].HEquipID;
BillNew.omodel.HDeptID = mainList[0].HDeptID;
- BillNew.omodel.HEmpID = mainList[0].HEmpID;
- BillNew.omodel.HRepairID = mainList[0].HRepairID;
- BillNew.omodel.HManagerID = mainList[0].HManagerID;
- BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
- BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
- BillNew.omodel.HRepairContent = mainList[0].HRepairContent;
- BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
- BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
- BillNew.omodel.HTimes = mainList[0].HTimes;
+ BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
+ BillNew.omodel.HEndDate = mainList[0].HEndDate;
+ //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+ //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+ //BillNew.omodel.HTimes = mainList[0].HTimes;
BillNew.omodel.HExplanation = mainList[0].HExplanation;
BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
- BillNew.omodel.HMouldID = mainList[0].HMouldID;
- BillNew.omodel.HSupID = mainList[0].HSupID;
- BillNew.omodel.HRepairType = mainList[0].HRepairType;
- BillNew.omodel.HNewModel = mainList[0].HNewModel;
- BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
- BillNew.omodel.HEquipID = mainList[0].HEquipID;
- BillNew.DetailColl = new List<Model.ClsSb_MouldRepairWorkBillSub>();
- Model.ClsSb_MouldRepairWorkBillSub oSub = new Model.ClsSb_MouldRepairWorkBillSub();
+ //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ //BillNew.omodel.HSupID = mainList[0].HSupID;
+ //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+ //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+ //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+ //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.DetailColl = new List<Model.ClsSb_EquipMaintainBillSub>();
+ Model.ClsSb_EquipMaintainBillSub oSub = new Model.ClsSb_EquipMaintainBillSub();
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
@@ -1555,10 +1551,215 @@
oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
- oSub.HRepairID = DBUtility.ClsPub.isLong(subList[0].HRepairID);
oSub.HManagerID = DBUtility.ClsPub.isLong(subList[0].HManagerID);
- oSub.HMoney = DBUtility.ClsPub.isDoule(subList[0].HMoney);
- oSub.HRepairExplanation = DBUtility.ClsPub.isStrNull(subList[0].HRepairExplanation);
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+
+ #region 璁惧缁翠慨璁板綍鍗曚繚瀛�
+
+ [Route("Sb_EquipRepairWorkBill/EquipRepairWorkBill_Save")]
+ [HttpPost]
+ public object EquipRepairWorkBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ return objJsonResult = EquipRepairWorkAddBill(msg1);
+ }
+
+ public json EquipRepairWorkAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSb_EquipRepairWorkBill BillNew = new DAL.ClsSb_EquipRepairWorkBill();
+ List<Model.ClsSb_EquipRepairWorkBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillMain>>(msg1);
+ List<Model.ClsSb_EquipRepairWorkBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_EquipRepairWorkBillSub>>(msg1);
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HRepairBeginDate = mainList[0].HRepairBeginDate;
+ BillNew.omodel.HRepairEndDate = mainList[0].HRepairEndDate;
+ //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+ //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+ //BillNew.omodel.HTimes = mainList[0].HTimes;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ //BillNew.omodel.HSupID = mainList[0].HSupID;
+ //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+ //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+ //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+ //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.DetailColl = new List<Model.ClsSb_EquipRepairWorkBillSub>();
+ Model.ClsSb_EquipRepairWorkBillSub oSub = new Model.ClsSb_EquipRepairWorkBillSub();
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
+ oSub.HRepairID = mainList[0].HRepairID;
+ BillNew.DetailColl.Add(oSub);
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+ #region 璁惧鐐规璁板綍鍗曚繚瀛�
+
+ [Route("Sb_EquipDotCheckBill/EquipDotCheckBill_Save")]
+ [HttpPost]
+ public object EquipDotCheckBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ return objJsonResult = EquipDotCheckAddBill(msg1);
+ }
+
+ public json EquipDotCheckAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill();
+ List<Model.ClsSb_EquipDotCheckBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillMain>>(msg1);
+ List<Model.ClsSb_EquipDotCheckBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(msg1);
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HDate;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo.Trim();
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HBeginDate = mainList[0].HBeginDate;
+ BillNew.omodel.HEndDate = mainList[0].HEndDate;
+ //BillNew.omodel.HCycleUnit = mainList[0].HCycleUnit;
+ //BillNew.omodel.HPlanTimes = mainList[0].HPlanTimes;
+ //BillNew.omodel.HTimes = mainList[0].HTimes;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ //BillNew.omodel.HMouldID = mainList[0].HMouldID;
+ //BillNew.omodel.HSupID = mainList[0].HSupID;
+ //BillNew.omodel.HRepairType = mainList[0].HRepairType;
+ //BillNew.omodel.HNewModel = mainList[0].HNewModel;
+ //BillNew.omodel.HNewDesignLife = mainList[0].HNewDesignLife;
+ //BillNew.omodel.HEquipID = mainList[0].HEquipID;
+ BillNew.DetailColl = new List<Model.ClsSb_EquipDotCheckBillSub>();
+ Model.ClsSb_EquipDotCheckBillSub oSub = new Model.ClsSb_EquipDotCheckBillSub();
+ oSub.HEntryID = 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(subList[0].HSourceInterID);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(subList[0].HSourceEntryID);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillType);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(subList[0].HSourceBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[0].HRelationQty);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[0].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[0].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[0].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[0].HCloseType);
BillNew.DetailColl.Add(oSub);
bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
if (bResult == true)
--
Gitblit v1.9.1