From c9501acdf8e497e88a467a5c8dec4f88b125fcfd Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 20 四月 2021 21:43:08 +0800
Subject: [PATCH] 新增委外工序接收单模块

---
 WebAPI/Models/StationBill.cs                                  |    9 +
 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs  |    4 
 WebAPI/Properties/PublishProfiles/API.pubxml.user             |  130 +++++++++++++-------------
 WebAPI/WebAPI.csproj                                          |    2 
 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs |  136 +++++++++++++++++++++++++++
 5 files changed, 212 insertions(+), 69 deletions(-)

diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
index f8d61c9..a24cb6d 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -138,7 +138,7 @@
             {
                 //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
                 msg1 = "[" + msg1.ToString() + "]";
-                List<StationEntrustInBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationEntrustInBill>>(msg1);
+                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
 
                 long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
                 int HYear = 2021;
@@ -243,7 +243,7 @@
                 oCN.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "Exception锛�" + e.Message;
                 objJsonResult.data = null;
                 return objJsonResult;
             }
diff --git a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
index e00be82..bbb9aa0 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs
@@ -68,6 +68,142 @@
             }
         }
 
+        /// <summary>
+        /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Cj_StationEntrustOutBill/AddBill")]
+        [HttpPost]
+        public object AddBill([FromBody] JObject oMain)
+        {
+            var _value = oMain["oMain"].ToString();
+            string msg1 = _value.ToString();
+            try
+            {
+                //濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
+                msg1 = "[" + msg1.ToString() + "]";
+                List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+
+                long HInterID = list[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+                int HYear = 2021;
+                double HPeriod = list[0].HPeriod;//鍗曚环
+                string HBillNo = list[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                int HBillStatus = 0;
+                string HInnerBillNo = list[0].HInnerBillNo;//閫佽揣鍗曞彿
+                string HICMOBillNo = list[0].HICMOBillNo;//鐢熶骇璁㈠崟鍙�
+                long HICMOInterID = list[0].HICMOInterID;//鐢熶骇璁㈠崟鍙稩D
+                int HProcExchInterID = 0;
+                int HProcExchEntryID = 0;
+                string HProcExchBillNo = list[0].HProcExchBillNo;//娴佽浆鍗�
+                long HProcID = list[0].HProcID;//褰撳墠宸ュ簭
+                long HMaterID = list[0].HMaterID;//浜у搧ID
+                long HEmpID = list[0].HEmpID;//鎿嶄綔鍛業D
+                long HSourceID = list[0].HSourceID;//鐢熶骇璧勬簮ID
+                long HGroupID = list[0].HGroupID;//鐝粍ID
+                double HICMOQty = list[0].HICMOQty;//浠诲姟鍗曟暟閲�
+                double HPlanQty = list[0].HPlanQty;//娴佽浆鍗℃暟閲�
+                double HQty = list[0].HQty;//鍙戝嚭鏁伴噺
+                long HSupID = list[0].HSupID;//渚涘簲鍟咺D
+                double HPieceQty = list[0].HPieceQty;//鍙戝嚭浠舵暟
+                string HSourceName = list[0].HSourceName;//
+                double HPrice = list[0].HPrice;//鍗曚环
+                double HMoney = list[0].HMoney;//閲戦
+                string HRemark = list[0].HRemark;//澶囨敞
+                double HTaxRate = list[0].HTaxRate;//绋庣巼
+                string HProcNo = list[0].HProcNo;//娴佹按鍙�
+                string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
+                int HWWWorkOrderInterID = 0;//濮斿宸ュ崟鍙峰瓙鍐呯爜
+                int HWWWorkOrderEntryID = 0;//濮斿宸ュ崟鍙蜂富鍐呭悧
+                string HWWWorkOrderBillNo = list[0].HWWWorkOrderBillNo;//濮斿宸ュ崟鍙�
+                string HMaker = list[0].HMaker;//鍒跺崟浜�
+                int HProcPlanInterID = 0;
+                int HProcPlanEntryID = 0;
+                string HProcPlanBillNo = "";
+                long HDeptID = list[0].HDeptID;//閮ㄩ棬ID
+                string HBarCode = list[0].HBarCode;//鏉″舰鐮�
+                string HAddr = "";
+                string HBarCodeMaker = "";
+                string BillType = "3791";
+                double HWasterQty = list[0].HWasterQty;//涓嶅悎鏍兼暟閲�
+                long HPlanPieceQty = list[0].HPlanPieceQty;//鍙戝嚭浠舵暟
+                long HBadPNL = list[0].HBadPNL;//鎶ュ簾浠舵暟
+                double HPrice_BHS = list[0].HPrice_BHS;//涓嶅惈绋庡崟浠�
+                double HMoney_BHS = list[0].HMoney_BHS;//涓嶅惈绋庨噾棰�
+
+                double HBadCount = 0;
+                bool HLastSubProc = true;
+                double HMainSourceInterID = 0;
+                string HMainSourceBillNo = "";
+                string HMainSourceBillType = "3792";
+
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCN.BeginTran();
+                //涓昏〃
+                oCN.RunProc("Insert Into Sc_StationOutBillMain " +
+                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+                ",HYear,HPeriod,HRemark,HInnerBillNo,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
+                ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+                ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID" +
+                ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
+                ",HSupID,HTaxRate,HQty,HPrice,HMoney,HPrice_BHS,HMoney_BHS,HBadCount" +
+                ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HProcNo,HOrderProcNO,HLastSubProc,HWWWorkOrderBillNo,HWWWorkOrderInterID,HWWWorkOrderEntryID" +
+                ") " +
+                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
+                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HInnerBillNo + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
+                "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+                ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
+                "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
+                "," + HSupID + "," + HTaxRate + "," + HQty + "," + HPrice + "," + HMoney + "," + HPrice_BHS + "," + HMoney_BHS + "," + HBadCount +
+                "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + HProcNo + ",'" + HOrderProcNO + "'," + Convert.ToString(HLastSubProc ? 1 : 0) + ",'" + HWWWorkOrderBillNo + "'," + HWWWorkOrderInterID + "," + HWWWorkOrderEntryID + 
+              ") ");
+                ds = oCN.RunProcReturn("exec h_p_MES_StationOutBill_QtyCtrl " + HInterID + "", "h_p_MES_StationOutBill_QtyCtrl");
+                if (ds == null)
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (ds.Tables[0].Rows.Count == 0)
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒ゆ柇鏁伴噺澶辫触锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+                {
+                    oCN.RollBack();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Out " + HInterID.ToString() + ",1");
+                oCN.RunProc("exec h_p_WW_EntrustWorkOrderRelationQty_Out " + HInterID.ToString() + ",1");
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
 
 
         //
diff --git a/WebAPI/Models/StationEntrustInBill.cs b/WebAPI/Models/StationBill.cs
similarity index 86%
rename from WebAPI/Models/StationEntrustInBill.cs
rename to WebAPI/Models/StationBill.cs
index 0043101..595752f 100644
--- a/WebAPI/Models/StationEntrustInBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -5,7 +5,7 @@
 
 namespace WebAPI.Models
 {
-    public class StationEntrustInBill
+    public class StationBill
     {
         public long HInterID { get; set; }
         public int HYear { get; set; }
@@ -41,5 +41,12 @@
         public string HMaker { get; set; }
         public long HDeptID { get; set; }
         public string HBarCode { get; set; }
+        public double HWasterQty { get; set; }
+        public long HPlanPieceQty { get; set; }
+        public long HBadPNL { get; set; }
+        public double HPrice_BHS { get; set; }
+        public double HMoney_BHS { get; set; }
+
+
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/API.pubxml.user b/WebAPI/Properties/PublishProfiles/API.pubxml.user
index eb094ce..fd60e22 100644
--- a/WebAPI/Properties/PublishProfiles/API.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -19,19 +19,19 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -49,7 +49,7 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
@@ -58,13 +58,13 @@
       <publishTime>01/04/2011 13:48:18</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/15/2015 17:57:08</publishTime>
@@ -130,7 +130,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -163,10 +163,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>04/08/2021 15:31:05</publishTime>
+      <publishTime>04/20/2021 21:24:01</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>04/08/2021 15:31:05</publishTime>
+      <publishTime>04/20/2021 21:24:01</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
       <publishTime>02/04/2021 21:35:21</publishTime>
@@ -184,163 +184,163 @@
       <publishTime>03/26/2019 14:23:20</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>05/21/2020 10:51:50</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/21/2021 13:19:40</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>01/13/2021 21:47:30</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:21</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>03/26/2021 14:35:48</publishTime>
+      <publishTime>02/22/2021 09:25:20</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>04/08/2021 15:31:28</publishTime>
+      <publishTime>04/20/2021 21:24:08</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index f5ee9d5..f2fa65e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -348,7 +348,7 @@
     <Compile Include="Models\M_Process.cs" />
     <Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
     <Compile Include="Models\Sc_ProcessReportViewModel.cs" />
-    <Compile Include="Models\StationEntrustInBill.cs" />
+    <Compile Include="Models\StationBill.cs" />
     <Compile Include="Models\StationOutBillView.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>

--
Gitblit v1.9.1