From 48a68d91b37600d3604736cd8853aad7c59620a8 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 30 六月 2021 08:36:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/DLL/DAL.dll | 0
WebAPI/WebAPI.csproj | 1
WebAPI/Controllers/Sc_MouldController.cs | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 319 insertions(+), 0 deletions(-)
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
new file mode 100644
index 0000000..bf84079
--- /dev/null
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -0,0 +1,318 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Web.Http;
+using WebAPI.Models;
+namespace WebAPI.Controllers
+{
+ public class Sc_MouldController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+
+
+ #region 妯″叿鍏朵粬鍏ュ簱鍗�
+
+ #region 妯″叿鍏朵粬鍏ュ簱鍗曚繚瀛�
+
+ [Route("Sc_MouldOtherInBill/MouldOtherInBill_Save")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldOtherInAddBill(msg1);
+ }
+
+ public json MouldOtherInAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldOtherInBill BillNew = new DAL.ClsSc_MouldOtherInBill();
+ List<Model.ClsSc_MouldOtherInBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldOtherInBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(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.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HSecManagerID;
+ BillNew.omodel.HDeptID = mainList[0].HSecManagerID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ 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.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ 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
+
+ #endregion
+
+ #region 妯″叿鍏朵粬鍑哄簱鍗�
+
+ #region 妯″叿鍏朵粬鍑哄簱鍗曚繚瀛�
+
+ [Route("Sc_MouldOtherOutBill/MouldOtherOutBill_Save")]
+ [HttpPost]
+ public object MouldOtherOutBill_Save([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldOtherOutAddBill(msg1);
+ }
+
+ public json MouldOtherOutAddBill(string msg1)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[0].ToString();
+ bool bResult;
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldOtherOutBill BillNew = new DAL.ClsSc_MouldOtherOutBill();
+ List<Model.ClsSc_MouldOtherOutBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldOtherOutBillMain>>(msg1);
+ List<Model.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(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.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSupID = 0;
+ BillNew.omodel.HSCWHID = 0;
+ BillNew.omodel.HEmpID = 0;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HSecManagerID;
+ BillNew.omodel.HDeptID = mainList[0].HSecManagerID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+
+ 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.HMaterID = DBUtility.ClsPub.isLong(subList[0].HMaterID);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(subList[0].HPropertyID);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(subList[0].HSecUnitID);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(subList[0].HSecUnitRate);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(subList[0].HUnitID);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(subList[0].HQtyMust);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[0].HQty);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(subList[0].HBarCode);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ if (oSub.HDesignLife < 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁捐瀵垮懡涓嶈兘涓�0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HLeaveLife = DBUtility.ClsPub.isLong(subList[0].HLeaveLife);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(subList[0].HPrice);
+ oSub.HWHID = DBUtility.ClsPub.isLong(subList[0].HWHID);
+ oSub.HSPID = DBUtility.ClsPub.isLong(subList[0].HSPID);
+ oSub.HSCWHID = 0;
+ oSub.HSCSPID = 0;
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(subList[0].HSPGroupID);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(subList[0].HBatchNo);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(subList[0].HNewModel);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(subList[0].HWallThickness);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(subList[0].HHardness);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(subList[0].HLastProdModel);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(subList[0].HDiameter);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(subList[0].HBackFlag);
+ 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
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 61c41aa..f3c1344 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 439a40b..912572b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -355,6 +355,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
+ <Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" />
--
Gitblit v1.9.1