From 6dbb4801f817b738fddcde730919db972636544b Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 30 八月 2021 08:46:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 0
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 47 +++++++--
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs | 0
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs | 224 ++++++++++++++++++++++++++++++++++++++++++++
WebAPI/Models/Supplier.cs | 4
WebAPI/WebAPI.csproj | 21 ++--
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 0
WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs | 0
13 files changed, 272 insertions(+), 24 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 97ddaa3..c3a1947 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -151,7 +151,7 @@
List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);
- long HItemID = list[0].HItemID;
+ long HItemID = list[0].HInterID;
string HNumber = list[0].HNumber;
string HShortNumber = list[0].HShortNumber;
string HName = list[0].HName;
@@ -253,21 +253,22 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
- string msg5 = sArray[3].ToString();
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //鍒楄〃涓籌D
+ string msg4 = sArray[2].ToString(); //鐧诲綍浜哄憳
+ string msg5 = sArray[3].ToString(); //鏉冮檺妯″潡浠ｇ爜
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
- long HItemID = list[0].HItemID;
+ long HItemID = list[0].HInterID;
string HNumber = list[0].HNumber;
string HShortNumber = list[0].HShortNumber;
string HName = list[0].HName;
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
string HEndFlag = list[0].HEnfFlag;
+ bool HStopflag = list[0].HStopflag;
string HHelpCode = list[0].HHelpCode;
string HShortName = list[0].HShortName;
string HAddress = list[0].HAddress;
@@ -330,11 +331,35 @@
oCN.BeginTran();
//涓昏〃
oCN.RunProc("Update Gy_Supplier set " +
- " HNumber='" + HNumber + "'" +
- ",HName='" + HName + "'" +
- ",HShortNumber='" + HShortNumber + "'" +
- ",HParentID=" + HParentID +
- ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HParentID=" + HParentID.ToString() +
+ ",HLevel=" + HLevel.ToString() +
+ ",HStopflag=" + HStopflag +
+ ",HRemark= '" + HRemark + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HShortName='" + HShortName + "'" +
+ ",HAddress='" + HAddress + "'" +
+ ",HLinkMan='" + HLinkMan + "'" +
+ ",HLinkPhone='" + HLinkPhone + "'" +
+ ",HMobilePhone='" + HMobilePhone + "'" +
+ ",HFax='" + HFax + "'" +
+ ",HPostalCode='" + HPostalCode + "'" +
+ ",HEmail='" + HEmail + "'" +
+ ",HBank='" + HBank + "'" +
+ ",HBankAccount='" + HBankAccount + "'" +
+ ",HTaxNum='" + HTaxNum + "'" +
+ ",HTaxRate=" + HTaxRate.ToString() +
+ ",HCountry='" + HCountry + "'" +
+ ",HCorMan='" +HCorMan + "'" +
+ ",HEnglishName='" + HEnglishName + "'" +
+ ",HEnglishAddress='" + HEnglishAddress + "'" +
+ ",HCurID=" + HCurID.ToString() +
+ ",HSSID=" + HSSID.ToString() +
+ ",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//灏嗕笂绾� 涓洪潪鏈骇
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_LastPieceCheckBillController.cs" b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_LastPieceCheckBillController.cs"
rename to WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_OutCompCheckBillController.cs" b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/QC_OutCompCheckBillController.cs"
rename to WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs" b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_ICMOReportBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESBeginWorkBillController.cs" b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESBeginWorkBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESEndWorkBillController.cs" b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESEndWorkBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESProductReportBillController.cs" b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESProductReportBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESStopWorkBillController.cs" b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MESStopWorkBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MaterToSourceBillController.cs" b/WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_MaterToSourceBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_MaterToSourceBillController.cs
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_PPBomBillController.cs" b/WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
similarity index 100%
rename from "WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/Sc_PPBomBillController.cs"
rename to WebAPI/Controllers/SCGL/Sc_PPBomBillController.cs
diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
new file mode 100644
index 0000000..7d70a87
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
@@ -0,0 +1,224 @@
+锘縰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
+ //鏁版嵁搴撲富琛⊿c_QualityReportBillMain
+ //鏁版嵁搴撳瓙琛⊿c_QualityReportBillSub
+ public class Sc_QualityReportBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 杩斿洖鐢熶骇璐ㄩ噺姹囨姤鍗曞垪琛�
+ [Route("Sc_QualityReportBill/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_QualityReportBillListDetail " + sWhere, "h_v_Sc_QualityReportBillListDetail");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_QualityReportBillListDetail where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_QualityReportBillListDetail");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ 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;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺姹囨姤鍗曟牴鎹簮鍗曠被鍨嬭幏鍙栦俊鎭�-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+ [Route("Sc_QualityReportBill/get_ICMOBillStatus_Tmp")]
+ [HttpGet]
+ public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
+ {
+ try
+ {
+ if (HInterID == 0 || HBillType.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ ds = oCN.RunProcReturn
+ ("select a.HInterID,a.HBillType,a.HICMOBillNo,a.HICMOInterID,a.HMaterID" +
+ ",m.HNumber HMaterNumber,m.HName HMaterName,m.HModel HMaterModel " +
+ " from Sc_ICMOBillStatus_Tmp a " +
+ " left join Gy_Material m on a.HMaterID=m.HItemID " +
+ " Where a.HInterID=" + HInterID + " and a.HBillType="+ HBillType, "Sc_ICMOBillStatus_Tmp");
+ }
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璐ㄩ噺姹囨姤鍗曟壂涓嶈壇鏉＄爜淇濆瓨淇℃伅
+ [Route("Sc_QualityReportBill/set_SaveBarCode")]
+ [HttpPost]
+ public object set_SaveBarCode([FromBody] JObject oMain)
+ {
+ var msg1 = oMain["oMain"].ToString();
+ //淇濆瓨鍗曟嵁
+ return objJsonResult = AddBillMain(msg1);
+ }
+
+ public json AddBillMain(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg = sArray[0].ToString();
+ string OperationType = sArray[1].ToString().Trim();
+ bool bResult;
+ try
+ {
+ msg = "[" + msg.ToString() + "]";
+ List<Model.ClsSc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ICMOBillQualityStatus_Tmp>>(msg);
+ DAL.ClsQC_FirstPieceCheckBill BillNew = new DAL.ClsQC_FirstPieceCheckBill();
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = mainList[0].HMakeDate;
+ 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.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ //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.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+ //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ //BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ //BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ //BillNew.omodel.HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);
+ //BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+ //BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+ //BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+ //BillNew.omodel.HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ //BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+ //BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+ //BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
+ //BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ //BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ //BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ //BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ BillNew.omodel.HBillStatus = 1;
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ if (OperationType.Equals("1") || OperationType.Equals("2"))
+ {
+ bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ }
+ else if (OperationType.Equals("3"))
+ {
+ bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ ClsPub.sExeReturnInfo = "鏃犳晥鐨勬搷浣滅被鍨嬶紒";
+ bResult = false;
+ }
+ //鎻愮ず
+ if (bResult == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+ objJsonResult.Message = ClsPub.sExeReturnInfo + "鍗曟嵁鍙�:" ;
+ 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
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Supplier.cs b/WebAPI/Models/Supplier.cs
index eaa25f1..86790a1 100644
--- a/WebAPI/Models/Supplier.cs
+++ b/WebAPI/Models/Supplier.cs
@@ -7,7 +7,7 @@
{
public class Supplier
{
- public long HItemID { get; set; }
+ public long HInterID { get; set; }
public string HNumber { get; set; }
public string HShortNumber { get; set; }
public string HName { get; set; }
@@ -20,7 +20,7 @@
public string HRemark { get; set; }
- public string HStopflag { get; set; }
+ public bool HStopflag { get; set; }
public string HHelpCode { get; set; }
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 16864fe..0c7809a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -326,9 +326,7 @@
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillListController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -337,27 +335,27 @@
<Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
<Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MaterToSourceBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESEndWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESStopWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESBeginWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\QC_LastPieceCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\QC_OutCompCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_ICMOReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESEndWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_PPBomBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
<Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
@@ -542,6 +540,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
--
Gitblit v1.9.1