From 97bc78d6500360aca073b29a5a1c387fd98f6c14 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期一, 12 七月 2021 16:12:59 +0800
Subject: [PATCH] nothing
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 133 +++++----
WebAPI/Web References/WebS/Reference.cs | 3
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 11
WebAPI/Models/ClsSc_MouldScrapOutBillMain.cs | 22 +
WebAPI/WebAPI.csproj | 4
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 4
WebAPI/Controllers/CellWidthController.cs | 174 ++++++++++++
WebAPI/Controllers/Sc_MouldController.cs | 451 ++++++++++++++++++++++++++++++++
8 files changed, 736 insertions(+), 66 deletions(-)
diff --git a/WebAPI/Controllers/CellWidthController.cs b/WebAPI/Controllers/CellWidthController.cs
new file mode 100644
index 0000000..d91b945
--- /dev/null
+++ b/WebAPI/Controllers/CellWidthController.cs
@@ -0,0 +1,174 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class CellWidthController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+
+
+ #region 鍗曟嵁淇濆瓨鍒楀
+ /// <summary>
+ /// 鍗曟嵁鍒楄〃淇濆瓨
+ /// </summary>
+ /// <returns></returns>
+ [Route("tb_CellWidth/GetMouldScrapInHouseCellWidth")]
+ [HttpPost]
+ public object GetMouldScrapInHouseCellWidth()
+ {
+
+ string Item = HttpContext.Current.Request["myMap"];
+ string Name = HttpContext.Current.Request["Name"];
+ string[] sArray = Item.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg3 = sArray[0].ToString();
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ string[] myMap = msg3.Split(','); //瀛楃涓茶浆鏁扮粍
+
+ SaveGridView(myMap, Name, HttpContext.Current.Server.MapPath("~/bin"));
+
+ try
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ex.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鍒楀淇濆瓨
+ public object SaveGridView(string[] _value, string KeyItem, string AppPath)
+ {
+ string text = "";
+ try
+ {
+ for (int i = 0; i <= _value.Length - 1; i++)
+ {
+ bool flag = i == 0;
+ if (flag)
+ {
+ text = _value[i].ToString();
+ }
+ else
+ {
+ text = text + "," + _value[i].ToString();
+ }
+ }
+ ClsIni clsIni = new ClsIni();
+ bool flag2 = ClsIni.WriteIni("GridSave", KeyItem, text, AppPath + "\\grdWidth.wyini");
+ if (flag2)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎿嶄綔鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触锛�";
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = null;
+ }
+
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鍒楀鏌ヨ
+
+ [Route("tb_CellWidth/GetMouldScrapInHouseCellWidthList")]
+ [HttpGet]
+ public object GetGridView(int colNum, string Name)
+ {
+ try
+ {
+
+ char c = Convert.ToChar(",");
+ string text = ClsIni.ReadIni("GridSave", Name, HttpContext.Current.Server.MapPath("~/bin") + "\\grdWidth.wyini");
+ bool flag = text != "娌℃湁鎵惧埌锛�";
+ if (flag)
+ {
+ string[] array = text.Split(new char[]
+ {
+ c
+ });
+ bool flag2 = colNum > array.Length;
+ int num;
+ if (flag2)
+ {
+ num = array.Length;
+ }
+ else
+ {
+ num = colNum;
+ }
+ for (int i = 0; i < num; i++)
+ {
+ bool flag3 = ClsPub.isInt(array[i]) > 500;
+ if (flag3)
+ {
+ array[i] = ClsPub.isInt(array[i]).ToString();
+ }
+ else
+ {
+ array[i] = ClsPub.isInt(array[i]).ToString();
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鍒楀鎴愬姛!";
+ objJsonResult.data = array;
+ }
+ else
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缃�!";
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璁剧疆鍒楀澶辫触!" + ex.Message;
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 1f9f379..3e9492d 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -610,7 +610,16 @@
public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList ", "h_v_Sc_MouldRepairWorkBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList " + sWhere, "h_v_Sc_MouldRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
+ }
}
#endregion
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index 812f91e..1178caf 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -165,6 +165,457 @@
#endregion
+ #region 妯″叿鐢熶骇棰嗙敤鍗�
+
+ #region 妯″叿鐢熶骇棰嗙敤鍗曚繚瀛�
+
+ [Route("Sc_MouldProdOutBill/MouldProdOutBill_Save")]
+ [HttpPost]
+ public object MouldProdOutAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldProdOutAddBill(msg1);
+ }
+
+ public json MouldProdOutAddBill(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_MouldProdOutBill BillNew = new DAL.ClsSc_MouldProdOutBill();
+ List<Model.ClsSc_MouldProdOutBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldProdOutBillMain>>(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 = 0;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ 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_MouldProdBackBill/MouldProdBackBill_Save")]
+ [HttpPost]
+ public object MoulddProdBackAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MoulddProdBackAddBill(msg1);
+ }
+
+ public json MoulddProdBackAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldProdBackBill BillNew = new DAL.ClsSc_MouldProdBackBill();
+ List<Model.ClsSc_MouldProdBackBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Model.ClsSc_MouldProdBackBillMain>>(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 = 0;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ 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);
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
+ 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_MouldScrapOutBill/MouldScrapOutBill_Save")]
+ [HttpPost]
+ public object MouldScrapOutAdd([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = MouldScrapOutAddBill(msg1);
+ }
+
+ public json MouldScrapOutAddBill(string msg1)
+ {
+ bool bResult;
+ try
+ {
+ msg1 = "[" + msg1.ToString() + "]";
+ DAL.ClsSc_MouldScrapOutBill BillNew = new DAL.ClsSc_MouldScrapOutBill();
+ List<Models.ClsSc_MouldScrapOutBillMain> mainList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Models.ClsSc_MouldScrapOutBillMain>>(msg1);
+ List<Models.ClsSc_MouldStockBillSub> subList = Newtonsoft
+ .Json
+ .JsonConvert
+ .DeserializeObject<List<Models.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 = 0;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ 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);
+ oSub.HDesignLife = DBUtility.ClsPub.isLong(subList[0].HDesignLife);
+ oSub.HUseLife = DBUtility.ClsPub.isLong(subList[0].HUseLife);
+ 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 妯″叿鍏朵粬鍑哄簱鍗曚繚瀛�
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index 94e4da7..9e51174 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -181,8 +181,8 @@
//
if (oMould.DeleteBill(HItemID, ref DBUtility.ClsPub.sExeReturnInfo))
{
- //鍐欏叆鏃ュ織
- //ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oMould.omodel.HNumber + ",鍚嶇О锛�" + oMould.omodel.HName, ClsPub.CurUserName);
+ ////鍐欏叆鏃ュ織
+ //ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oMould.omodel.hn + ",鍚嶇О锛�" + oMould.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Models/ClsSc_MouldScrapOutBillMain.cs b/WebAPI/Models/ClsSc_MouldScrapOutBillMain.cs
new file mode 100644
index 0000000..84269e7
--- /dev/null
+++ b/WebAPI/Models/ClsSc_MouldScrapOutBillMain.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsSc_MouldScrapOutBillMain: DBUtility.ClsXt_BaseBillMain
+ {
+ public long HMouldID;// int --产品模具
+ public string HPlanNo;// varchar(50) --点检计划编号
+ public long HPlanInterID;// int --点检计划内码
+ public string HBeginDate;// datetime --点检开始日期
+ public string HEndDate;// datetime --点检结束日期
+ public string HExplanation;// varchar(500) --摘要
+ public string HInnerBillNo;// varchar(50) --内部单据号
+ public long HDeptID;// int --部门ID
+ public long HWHID;// int --仓库ID
+ public long HSecManagerID;// int --
+ public long HKeeperID;// int --
+ public bool HRedBlueFlag;// bool
+ }
+}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6973bc5..18aa618 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>06/30/2021 16:33:18</publishTime>
+ <publishTime>07/02/2021 08:47:34</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
+ <publishTime>09/20/2018 19:23:20</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.ServicesStub.dll">
+ <publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
<publishTime>03/18/2015 17:02:50</publishTime>
@@ -42,19 +48,22 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>06/17/2021 23:18:55</publishTime>
+ <publishTime>07/02/2021 08:47:34</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>07/05/2021 15:15:53</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -120,7 +129,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -168,160 +177,160 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>06/30/2021 16:33:18</publishTime>
+ <publishTime>07/02/2021 08:47:34</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>06/17/2021 23:18:55</publishTime>
+ <publishTime>07/02/2021 08:47:34</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/21/2020 10:51:50</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Index.html">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>01/21/2021 13:19:40</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>02/22/2021 09:25:21</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>02/22/2021 09:25:20</publishTime>
+ <publishTime>05/10/2021 09:27:02</publishTime>
</File>
<File Include="Web.config">
<publishTime>07/12/2021 16:00:31</publishTime>
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index b2e5ee5..b72f3f4 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -857,7 +857,8 @@
/// <remarks/>
public WebService1() {
- this.Url = "http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx";
+ this.Url = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
+
if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
this.UseDefaultCredentials = true;
this.useDefaultCredentialsSetExplicitly = false;
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3c7f96b..8086554 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -343,6 +343,7 @@
<Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
+ <Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -421,6 +422,9 @@
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldScrapOutBillMain.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Compile>
<Compile Include="Models\ClsSc_MouldDotCheckBillMain.cs" />
<Compile Include="Models\ClsSc_MouldDotCheckBillSub.cs" />
<Compile Include="Models\ClsSc_MouldMaintainBillMain.cs" />
--
Gitblit v1.9.1