From 345e6bd76ba3ba62117b5128ac25f266812328b9 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 28 六月 2021 17:33:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
/dev/null | 0
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 14
WebAPI/Controllers/Sc_GroupOrderBillController.cs | 79 +++++++++
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 303 +++++++++++++++++++++++++++++++++++++
WebAPI/Controllers/WebAPIController.cs | 53 ++++++
WebAPI/DLL/DAL.dll | 0
WebAPI/DLL/DAL20210625.zip | 0
WebAPI/WebAPI.csproj | 6
WebAPI/DLL/Model.zip | 0
WebAPI/DLL/调用工程文件/Model.dll | 0
WebAPI/DLL/Model.dll | 0
11 files changed, 446 insertions(+), 9 deletions(-)
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
new file mode 100644
index 0000000..9e68093
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -0,0 +1,303 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //宸ュ簭娴佽浆鍗ontroller
+ public class Sc_ProcessExchangeBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ /// <summary>
+ /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_ProcessExchangeBill/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ bool bResult;
+ try
+ {
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Model.ClsSc_ProcessExchangeBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillMain>>(msg2);
+ DAL.ClsSc_ProcessExchangeBill BillNew = new DAL.ClsSc_ProcessExchangeBill();
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ 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.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ BillNew.omodel.HDate = HDate;
+ BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HWWOrderInterID = ClsPub.isLong(mainList[0].HWWOrderInterID);
+ BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(mainList[0].HWWOrderEntryID);
+ BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(mainList[0].HWWOrderBillNo);
+ BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ BillNew.omodel.HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+ BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ BillNew.omodel.HMaterID2 = ClsPub.isLong(mainList[0].HMaterID2);
+ BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ BillNew.omodel.HMaterNumber = ClsPub.isStrNull(mainList[0].HMaterNumber);
+ BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
+ BillNew.omodel.HUnitID = ClsPub.isLong(mainList[0].HUnitID);
+ BillNew.omodel.HUnitNumber = ClsPub.isStrNull(mainList[0].HUnitNumber);
+ BillNew.omodel.HPlanQty = ClsPub.isDoule(mainList[0].HPlanQty);
+ BillNew.omodel.HQty = ClsPub.isDoule(mainList[0].HQty);
+ BillNew.omodel.HPlanBeginDate = ClsPub.isDate(mainList[0].HPlanBeginDate);
+ BillNew.omodel.HPlanEndDate = ClsPub.isDate(mainList[0].HPlanEndDate);
+ BillNew.omodel.HExplanation = ClsPub.isStrNull(mainList[0].HExplanation);
+ BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(mainList[0].HInnerBillNo);
+ BillNew.omodel.HWorkShopID = ClsPub.isLong(mainList[0].HWorkShopID);
+ BillNew.omodel.HSupID = ClsPub.isLong(mainList[0].HSupID);
+ BillNew.omodel.HBLFlag = mainList[0].HBLFlag;
+ BillNew.omodel.HMainMaterID = ClsPub.isLong(mainList[0].HMainMaterID);
+ BillNew.omodel.HKeyMaterID = ClsPub.isLong(mainList[0].HKeyMaterID);
+ BillNew.omodel.HOrderProcNO = ClsPub.isStrNull(mainList[0].HOrderProcNO);
+ BillNew.omodel.HEquipMentID = ClsPub.isLong(mainList[0].HEquipMentID);
+ BillNew.omodel.HMateOutBatchNo = ClsPub.isStrNull(mainList[0].HMateOutBatchNo);
+ BillNew.omodel.HProjectNum = ClsPub.isStrNull(mainList[0].HProjectNum);
+ BillNew.omodel.HProdMaterCode = ClsPub.isStrNull(mainList[0].HProdMaterCode);
+ BillNew.omodel.HSeOrderBillNo = ClsPub.isStrNull(mainList[0].HSeOrderBillNo);
+ BillNew.omodel.HCusShortName = ClsPub.isStrNull(mainList[0].HCusShortName);
+ BillNew.omodel.HCusNeedMaterial = ClsPub.isStrNull(mainList[0].HCusNeedMaterial);
+ BillNew.omodel.HPlanSendGoodsDate = ClsPub.isStrNull(mainList[0].HPlanSendGoodsDate);
+ BillNew.omodel.HProdMaterName = ClsPub.isStrNull(mainList[0].HProdMaterName);
+ BillNew.omodel.HCusName = ClsPub.isStrNull(mainList[0].HCusName);
+ BillNew.omodel.HWorkRemark = ClsPub.isStrNull(mainList[0].HWorkRemark);
+ BillNew.omodel.HImportNote = ClsPub.isStrNull(mainList[0].HImportNote);
+ BillNew.omodel.HMaterNumber_A = ClsPub.isStrNull(mainList[0].HMaterNumber_A);
+ BillNew.omodel.HMaterNumber_B = ClsPub.isStrNull(mainList[0].HMaterNumber_B);
+ BillNew.omodel.HMaterNumber_C = ClsPub.isStrNull(mainList[0].HMaterNumber_C);
+ BillNew.omodel.HMaterNumber_D = ClsPub.isStrNull(mainList[0].HMaterNumber_D);
+ BillNew.omodel.HProdType = ClsPub.isStrNull(mainList[0].HProdType);
+ BillNew.omodel.HMaterShortName = ClsPub.isStrNull(mainList[0].HMaterShortName);
+ BillNew.omodel.HMaterIDA = ClsPub.isStrNull(mainList[0].HMaterIDA);
+ BillNew.omodel.HMaterIDB = ClsPub.isStrNull(mainList[0].HMaterIDB);
+ BillNew.omodel.HMaterIDC = ClsPub.isStrNull(mainList[0].HMaterIDC);
+ BillNew.omodel.HMaterIDD = ClsPub.isStrNull(mainList[0].HMaterIDD);
+ List<Model.ClsSc_ProcessExchangeBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessExchangeBillSub>>(msg3);
+ BillNew.DetailColl = new List<Model.ClsSc_ProcessExchangeBillSub>();
+ for (int i = 0; i < subList.ToArray().Length; i++)
+ {
+ if (DBUtility.ClsPub.isInt(subList[i].HProcID) != 0)//HQty
+ {
+ Model.ClsSc_ProcessExchangeBillSub oSub = new Model.ClsSc_ProcessExchangeBillSub();
+ oSub.HEntryID = i;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HSourceInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ oSub.HSourceEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+ oSub.HSourceBillType = "85";
+ oSub.HSourceBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ //oSub.HRelationQty_In = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_In);
+ //oSub.HRelationQty_Out = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Out);
+ //oSub.HRelationQty_WWOrder = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_WWOrder);
+ //oSub.HRelationQty_Bad = DBUtility.ClsPub.isDoule(subList[i].HRelationQty_Bad);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+ oSub.HQty = DBUtility.ClsPub.isDoule(subList[i].HQty);
+ if (oSub.HQty <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佽浆鍗℃暟閲忎笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HProcNo = DBUtility.ClsPub.isLong(subList[i].HProcNo);
+ if (oSub.HProcNo <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝娴佹按鍙蜂笉鑳戒负0鎴栬�呭皬浜�0";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcID);
+ oSub.HProcNumber = DBUtility.ClsPub.isStrNull(subList[i].HProcNumber);
+ oSub.HWorkRemark = DBUtility.ClsPub.isStrNull(subList[i].HWorkRemark);
+ oSub.HCenterID = DBUtility.ClsPub.isLong(subList[i].HCenterID);
+ oSub.HDeptID = DBUtility.ClsPub.isLong(subList[i].HDeptID);
+ oSub.HDeptNumber = DBUtility.ClsPub.isStrNull(subList[i].HDeptNumber);
+ ////oSub.HGroupID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HGroupIDCol].Value);
+ oSub.HGroupNumber = DBUtility.ClsPub.isStrNull(subList[i].HGroupNumber);
+ oSub.HWorkerID = DBUtility.ClsPub.isLong(subList[i].HWorkerID);
+ oSub.HWorkerNumber = DBUtility.ClsPub.isStrNull(subList[i].HWorkerNumber);
+ oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceID);
+ oSub.HTimeUnit = DBUtility.ClsPub.isStrNull(subList[i].HTimeUnit);
+ oSub.HPlanWorkTimes = DBUtility.ClsPub.isSingle(subList[i].HPlanWorkTimes);
+ oSub.HPlanBeginDate = DBUtility.ClsPub.isDate(subList[i].HPlanBeginDate);
+ oSub.HPlanEndDate = DBUtility.ClsPub.isDate(subList[i].HPlanEndDate);
+ oSub.HRelBeginDate = DBUtility.ClsPub.isDate(subList[i].HRelBeginDate);
+ oSub.HRelEndDate = DBUtility.ClsPub.isDate(subList[i].HRelEndDate);
+ oSub.HReadyTime = 0;
+ oSub.HQueueTime = 0;
+ oSub.HMoveTime = 0;
+ oSub.HBeginDayQty = DBUtility.ClsPub.isSingle(subList[i].HBeginDayQty);
+ oSub.HBeginFixQty = DBUtility.ClsPub.isSingle(subList[i].HBeginFixQty);
+ oSub.HFixWorkDays = DBUtility.ClsPub.isSingle(subList[i].HFixWorkDays);
+ oSub.HTrunWorkDays = DBUtility.ClsPub.isSingle(subList[i].HTrunWorkDays);
+ oSub.HReadyTimes = DBUtility.ClsPub.isSingle(subList[i].HReadyTimes);
+ oSub.HMyWorkDays = DBUtility.ClsPub.isSingle(subList[i].HMyWorkDays);
+ oSub.HOutPrice = DBUtility.ClsPub.isSingle(subList[i].HOutPrice);
+ oSub.HOutMoney = DBUtility.ClsPub.isSingle(subList[i].HOutMoney);
+ oSub.HLastProc = "鍚�";
+ oSub.HFstProc = "鍚�";
+ oSub.HKeyProc = DBUtility.ClsPub.isStrNull(subList[i].HKeyProc);
+ oSub.HSupID = DBUtility.ClsPub.isLong(subList[i].HSupID);
+ oSub.HSupFlag = DBUtility.ClsPub.isBool(subList[i].HSupFlag);
+ oSub.HBackProc = DBUtility.ClsPub.isBool(subList[i].HBackProc);
+ oSub.HEdit = DBUtility.ClsPub.isBool(subList[i].HEdit);
+ if (oSub.HCenterID == 0 && oSub.HSupFlag == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + ClsPub.isStrNull(i + 1) + "琛岋紝宸ヤ綔涓績鎴栧澶栨爣璁颁笉鑳藉悓鏃朵负绌�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(subList[i].HICMOBillNo);
+ oSub.HICMOInterID = DBUtility.ClsPub.isLong(subList[i].HICMOInterID);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(subList[i].HSeOrderInterID);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HSeOrderEntryID);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HSeOrderBillNo);
+ oSub.HWWOrderInterID = DBUtility.ClsPub.isLong(subList[i].HWWOrderInterID);
+ oSub.HWWOrderEntryID = DBUtility.ClsPub.isLong(subList[i].HWWOrderEntryID);
+ oSub.HWWOrderBillNo = DBUtility.ClsPub.isStrNull(subList[i].HWWOrderBillNo);
+ oSub.HSumPassRate = DBUtility.ClsPub.isSingle(subList[i].HSumPassRate);
+ oSub.HPassRate = DBUtility.ClsPub.isSingle(subList[i].HPassRate);
+ oSub.HOverRate = DBUtility.ClsPub.isDoule(subList[i].HOverRate);
+ oSub.HMaxQty = DBUtility.ClsPub.isDoule(subList[i].HMaxQty);
+ oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(subList[i].HTechnologyParameter);
+ oSub.HPicNum = DBUtility.ClsPub.isStrNull(subList[i].HPicNum);
+ oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(subList[i].HProcCheckNote);
+ BillNew.DetailColl.Add(oSub);
+ }
+ }
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ //if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew)
+ //{
+ // bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //}
+ //else
+ //{
+ // bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //}
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ 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;
+ }
+ }
+
+ /// <summary>
+ /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
+ /// </summary>
+ /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
+ /// <returns>object</returns>
+ [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
+ [HttpGet]
+ public object GetICMOBillDetail(int hmainid,int OrganizationID)
+ {
+ try
+ {
+ if (hmainid == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid + " and HSTOCKINORGID="+ OrganizationID, "h_v_Sc_ICMOBillListDetail");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_GroupOrderBillController.cs b/WebAPI/Controllers/Sc_GroupOrderBillController.cs
new file mode 100644
index 0000000..09e4d6e
--- /dev/null
+++ b/WebAPI/Controllers/Sc_GroupOrderBillController.cs
@@ -0,0 +1,79 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ //缁勬墭鍗旵ontroller
+ public class Sc_GroupOrderBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ string HBillType = "2601";
+
+ /// <summary>
+ /// 杩斿洖鍒楄〃
+ /// </summary>
+ /// <param name="sWhere">鎷兼帴鐨凷QL</param>
+ /// <returns>object</returns>
+ [Route("GroupOrderBill/List")]
+ [HttpGet]
+ public object List(string sWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_GroupOrderBillList order by 鍒跺崟鏃堕棿 desc", "h_v_GroupOrderBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_GroupOrderBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ string sql2 = " order by 鍒跺崟鏃堕棿 desc";
+ sql += sql2;
+ ds = oCN.RunProcReturn(sql, "h_v_GroupOrderBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 1a6e2b3..42aee5b 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1779,6 +1779,59 @@
}
+ /// <summary>
+ /// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetSc_ICMOBillListView")]
+ [HttpGet]
+ public object GetSc_ICMOBillListView(string ICMOBill,int OrganizationID)
+ {
+ if (ICMOBill != "")
+ {
+ sWhere = "where 1=1 and 鐢熶骇璁㈠崟鍙� like '%" + ICMOBill + "%' and HSTOCKINORGID=" + OrganizationID;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where HSTOCKINORGID=" + OrganizationID, "h_v_S_Sc_ICMOBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_S_Sc_ICMOBillList ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_S_Sc_ICMOBillList");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
}
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index 959f5e6..61c41aa 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/DLL/DAL20210625.zip b/WebAPI/DLL/DAL20210625.zip
new file mode 100644
index 0000000..d496341
--- /dev/null
+++ b/WebAPI/DLL/DAL20210625.zip
Binary files differ
diff --git a/WebAPI/DLL/Model.dll b/WebAPI/DLL/Model.dll
index 9d15d15..4caf8d8 100644
--- a/WebAPI/DLL/Model.dll
+++ b/WebAPI/DLL/Model.dll
Binary files differ
diff --git a/WebAPI/DLL/Model.zip b/WebAPI/DLL/Model.zip
new file mode 100644
index 0000000..a03c930
--- /dev/null
+++ b/WebAPI/DLL/Model.zip
Binary files differ
diff --git a/WebAPI/DLL/Model20200818.zip b/WebAPI/DLL/Model20200818.zip
deleted file mode 100644
index b243991..0000000
--- a/WebAPI/DLL/Model20200818.zip
+++ /dev/null
Binary files differ
diff --git "a/WebAPI/DLL/\350\260\203\347\224\250\345\267\245\347\250\213\346\226\207\344\273\266/Model.dll" "b/WebAPI/DLL/\350\260\203\347\224\250\345\267\245\347\250\213\346\226\207\344\273\266/Model.dll"
index d302ff5..4caf8d8 100644
--- "a/WebAPI/DLL/\350\260\203\347\224\250\345\267\245\347\250\213\346\226\207\344\273\266/Model.dll"
+++ "b/WebAPI/DLL/\350\260\203\347\224\250\345\267\245\347\250\213\346\226\207\344\273\266/Model.dll"
Binary files differ
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index f8a2180..2c90d52 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -20,7 +20,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>06/25/2021 16:26:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
@@ -41,7 +41,7 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>05/20/2021 17:29:58</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
@@ -152,10 +152,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>06/18/2021 14:17:15</publishTime>
+ <publishTime>06/28/2021 10:34:31</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>06/18/2021 14:17:15</publishTime>
+ <publishTime>06/28/2021 10:34:31</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -179,7 +179,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>01/13/2021 21:47:30</publishTime>
+ <publishTime>06/25/2021 16:26:52</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -188,7 +188,7 @@
<publishTime>01/13/2021 21:47:30</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/20/2021 17:29:58</publishTime>
+ <publishTime>06/17/2021 23:18:55</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
<publishTime>01/13/2021 21:47:30</publishTime>
@@ -323,7 +323,7 @@
<publishTime>02/22/2021 09:25:20</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/18/2021 14:17:32</publishTime>
+ <publishTime>06/28/2021 10:34:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a81665d..49bb806 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -82,9 +82,9 @@
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <Reference Include="Model, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Model.dll</HintPath>
+ <HintPath>DLL\璋冪敤宸ョ▼鏂囦欢\Model.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -347,6 +347,7 @@
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
@@ -354,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_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipMaintainBillController.cs" />
--
Gitblit v1.9.1