From 6d7f0a22efbe8b82b6eddb06832c001298b05cbe Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期三, 30 十一月 2022 12:41:04 +0800
Subject: [PATCH] 增加了生产补料校验 销售出库校验解析条码功能
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 155 +++++++++++++------------
WebAPI/Controllers/条码管理/WEBSController.cs | 3
WebAPI/Web.config | 8
WebAPI/WebAPI.csproj.user | 2
WebAPI/Controllers/Sc_ProcessMangementController.cs | 8 +
WebAPI/Controllers/POStockInBillController.cs | 146 ++++++++++++++++++++++++
6 files changed, 240 insertions(+), 82 deletions(-)
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 2d5de67..989a0f3 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -697,6 +697,152 @@
}
}
+ //鐢熶骇琛ユ枡鏍￠獙
+ if (HBillType == "1254")
+ {
+ string[] sArray = sBarCodeNew.Split('@');
+ string HMaterNumber = "";
+ HMaterNumber = sArray[0];
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sArray[4]);
+ string HBarchNo = "";
+ HBarchNo = sArray[6];
+
+ DateTime HSCRQ = ClsPub.isDate(sArray[3]);
+ DateTime HYXQZ = ClsPub.isDate(sArray[5]);
+
+ //閲囪喘璁㈠崟鍙�
+ string HPOOrderBillNo = "";
+ HPOOrderBillNo = ClsPub.isStrNull(sArray[8]);
+
+
+
+ Int64 HMaterID = 0;
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Dss;
+ Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+
+ DataSet Dss1;
+ Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+
+
+ HTM = HOrgNumber + HMaterID + HBarchNo;
+
+
+ DataSet Dss5;
+ Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", " + 0 + "," + 0 + ",'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
+ //閿�鍞嚭搴撴牎楠�
+ if (HBillType == "1205")
+ {
+ string HMaterNumber = "";
+ HMaterNumber = sBarCodeNew.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + sBarCodeNew.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = sBarCodeNew.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+ DataSet Dss;
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+ HTM = HOrgNumber + HMaterID + HBatchNo;
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+ string HYXQZ = "20" + sBarCodeNew.Substring(27, 6);
+ Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4));
+ Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2));
+ Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2));
+ DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1);
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3));
+
+ DataSet Dss5;
+ Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", 0,0,'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
//objJsonResult.code = "0";
//objJsonResult.count = 1;
//objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index af39f81..739115e 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -421,6 +421,14 @@
//DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERPProcduct_LastProc where HLastProc = '鏄�' and hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc '" + BillNo + "'", "h_p_TOERPProcduct_LastProc");
DataRow dr1 = ds1.Tables[0].Rows[0];
+ if (ds1.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈壘鍒板搴旂殑鐢熶骇姹囨姤鍗曡褰�;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
JObject model = new JObject();
model.Add("FBillType", new JObject() { ["FNumber"] = "SCRKD01_SYS" }); //鍗曟嵁绫诲瀷
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 802969b..e04bb00 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -843,7 +843,8 @@
{
try
{
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sBarCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
+ var sJXCode = POStockInBillController.JX_Json(sBarCode, HBillID, HBillType, HStockOrgID, HBillNo, HMaker);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, HBillID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HStockOrgID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index dbef529..4fd4944 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>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -20,12 +20,12 @@
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/27/2022 17:40:44</publishTime>
+ <publishTime>11/29/2022 21:27:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/27/2022 17:40:44</publishTime>
+ <publishTime>11/29/2022 21:27:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/27/2022 17:40:41</publishTime>
+ <publishTime>11/29/2022 21:27:52</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/27/2022 17:40:41</publishTime>
+ <publishTime>11/29/2022 21:27:52</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>11/27/2022 17:40:37</publishTime>
+ <publishTime>11/29/2022 21:27:44</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/27/2022 17:40:37</publishTime>
+ <publishTime>11/29/2022 21:27:44</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -81,7 +81,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>11/27/2022 14:21:58</publishTime>
+ <publishTime>03/15/2022 10:06:40</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -107,15 +107,15 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/27/2022 17:40:38</publishTime>
+ <publishTime>11/29/2022 21:27:45</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/27/2022 17:40:38</publishTime>
+ <publishTime>11/29/2022 21:27:45</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/04/2014 04:33:56</publishTime>
@@ -147,30 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:40</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:40</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:42</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:42</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/30/2012 22:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:42</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/27/2022 17:40:36</publishTime>
+ <publishTime>11/29/2022 21:27:42</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -248,7 +251,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -283,7 +286,7 @@
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/27/2022 20:29:24</publishTime>
+ <publishTime>11/29/2022 21:28:05</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -291,7 +294,7 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/27/2022 20:29:24</publishTime>
+ <publishTime>11/29/2022 21:28:05</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -303,58 +306,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>11/27/2022 14:22:07</publishTime>
+ <publishTime>08/16/2022 22:31:46</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>11/27/2022 14:22:07</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>11/27/2022 14:22:07</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>11/27/2022 14:22:07</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>11/27/2022 14:22:08</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -363,7 +366,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -372,115 +375,115 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>11/27/2022 14:22:09</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="packages.config">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>11/29/2022 08:58:24</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>11/27/2022 14:22:10</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>11/27/2022 17:36:16</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>11/27/2022 17:36:14</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>11/27/2022 17:36:17</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>11/27/2022 17:36:15</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>11/27/2022 17:36:17</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>11/27/2022 17:36:15</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>11/27/2022 17:36:18</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>11/27/2022 17:36:25</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>11/27/2022 17:36:22</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>11/27/2022 17:36:20</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>11/27/2022 17:36:24</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>11/27/2022 17:36:21</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>11/27/2022 17:36:19</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>11/27/2022 17:36:24</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>11/27/2022 17:36:22</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>11/27/2022 17:36:23</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>11/27/2022 17:36:20</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>11/27/2022 17:36:13</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>11/27/2022 17:36:26</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>11/27/2022 17:36:04</publishTime>
+ <publishTime>11/29/2022 08:58:24</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -491,7 +494,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>11/27/2022 17:42:05</publishTime>
+ <publishTime>11/29/2022 21:28:19</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 6c1e60b..743e68f 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,13 +22,13 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<add key="FileIP" value="http://localhost:8080/" />
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> <!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.63.195/WEBS-WMS/WebService1.asmx"/> 棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
- <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>
+ <add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/>
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -96,7 +96,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.63.195/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://192.168.80.90:9090/WEBS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -105,7 +105,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost/WEBS/WebService1.asmx</value>
+ <value>http://192.168.80.90:9090/WEBS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 75a0f3c..b5bf336 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>E:\GIT浠撳簱\ZYLMESWEBAPI\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1