From 55a70a0971d84a7a7a1ec3de362e44ff56434c61 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期四, 02 九月 2021 15:53:29 +0800
Subject: [PATCH] 1
---
WebAPI/LogService.cs | 57 ++
PlanM/计划管理/Gy_RoutingBill.cs | 6
WorkM/流转卡管理/Sc_ProcessExchangeBillQuery.cs | 9
WebAPI/Models/StationBill.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 36
OCX/CheckPic4.jpg | 0
PlanM/数据导入/Gy_DataIn_RoutingBill.cs | 11
WebAPI/WebAPI.csproj.user | 2
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 7
DAL/计划管理/ClsGy_RoutingBill.cs | 10
WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs | 54 ++
WebAPI/Controllers/生产管理/质量汇报单/Sc_QualityReportBillController.cs | 483 +++++++++++++++++----
OCX/Closed.jpg | 0
WarM/条码打印/Gy_BarCodeBill.cs | 2
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 32
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 6
OCX/CheckPic3.jpg | 0
WebAPI/Models/Supplier.cs | 2
OCX/CheckPic2.jpg | 0
PlanM/数据导入/Gy_DataIn_RoutingBill.resx | 8
DBUtility/基础资料/BillSelect.cs | 1
WebAPI/Controllers/WebAPIController.cs | 24
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 10
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 51 ++
/dev/null | 224 ----------
PlanM/数据导入/Gy_DataIn_RoutingBill.designer.cs | 60 +-
BLL/系统公用CLS/Cls_S_KF_ICInventoryList_IF.cs | 4
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 62 ++
OCX/Checked.jpg | 0
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 56 +-
OCX/CheckPic.jpg | 0
OCX/Deleted.jpg | 0
WebAPI/WebAPI.csproj | 3
WebAPI/Controllers/ReportPlatFormController.cs | 41 +
34 files changed, 794 insertions(+), 469 deletions(-)
diff --git "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs" "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
index 1b5c55b..b35bc31 100644
--- "a/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
+++ "b/BLL/\347\263\273\347\273\237\345\205\254\347\224\250CLS/Cls_S_KF_ICInventoryList_IF.cs"
@@ -31,7 +31,7 @@
public bool Refresh(string sWhere)
{
string sErr = "";
- int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, MTONoCol;
+ int MainIDCol, SubIDCol, SPIDCol, BatchNoCol, AuxPropIDCol, MTONoCol;
string stmp;
string tSQL;
try
@@ -44,6 +44,7 @@
SubIDCol = oFrm.Fun_GetCol("hwhid");
SPIDCol = oFrm.Fun_GetCol("hspid");
BatchNoCol = oFrm.Fun_GetCol("鎵规");
+ AuxPropIDCol = oFrm.Fun_GetCol("HAuxPropID");
MTONoCol = oFrm.Fun_GetCol("璁″垝璺熻釜鍙�");
//
//寰幆 閫変腑琛�
@@ -56,6 +57,7 @@
oSelect.BillSubID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SubIDCol].Value);
oSelect.SPID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[SPIDCol].Value);
oSelect.BatchNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[BatchNoCol].Value);
+ oSelect.HAuxPropID = DBUtility.ClsPub.isLong(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[AuxPropIDCol].Value);
oSelect.BillNo = DBUtility.ClsPub.isStrNull(oFrm.grdMain.Rows[oFrm.grdMain.SelectedRows[i].Index].Cells[MTONoCol].Value);
oSelect.BillTitle = mvarReportTitle;
oSelect.BillType = mvarItemKey;
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index a91f6db..72337bd 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -64,6 +64,11 @@
",HStdSourceQty=" + omodel.HStdSourceQty.ToString() +
",HAddSourceRate=" + omodel.HAddSourceRate.ToString() +
",HDelSourceRate=" + omodel.HDelSourceRate.ToString() +
+ ",HPicNumVer='" + omodel.HPicNumVer.ToString() + "'" +
+ ",HPicNumAssemble='" + omodel.HPicNumAssemble.ToString() + "'" +
+ ",HMaterTexture='" + omodel.HMaterTexture.ToString() + "'" +
+ ",HProductNum='" + omodel.HProductNum.ToString() + "'" +
+ ",HVerNum='" + omodel.HVerNum.ToString() + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
@@ -305,6 +310,11 @@
omodel.HStdSourceQty = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HStdSourceQty"].ToString());
omodel.HAddSourceRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HAddSourceRate"].ToString());
omodel.HDelSourceRate = DBUtility.ClsPub.isSingle(Ds.Tables[0].Rows[0]["HDelSourceRate"].ToString());
+ omodel.HPicNumVer = Ds.Tables[0].Rows[0]["HPicNumVer"].ToString().Trim();
+ omodel.HPicNumAssemble = Ds.Tables[0].Rows[0]["HPicNumAssemble"].ToString().Trim();
+ omodel.HMaterTexture = Ds.Tables[0].Rows[0]["HMaterTexture"].ToString().Trim();
+ omodel.HProductNum = Ds.Tables[0].Rows[0]["HProductNum"].ToString().Trim();
+ omodel.HVerNum = Ds.Tables[0].Rows[0]["HVerNum"].ToString().Trim();
//寰幆
DataSet DsSub ;
diff --git "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs" "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
index 47f514f..ea134df 100644
--- "a/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
+++ "b/DBUtility/\345\237\272\347\241\200\350\265\204\346\226\231/BillSelect.cs"
@@ -13,5 +13,6 @@
public Int64 BillSubID;
public Int64 SPID;
public string BatchNo;
+ public Int64 HAuxPropID;
}
}
diff --git a/LMES/bin/x86/HXERP.ini b/LMES/bin/x86/HXERP.ini
deleted file mode 100644
index 4b0d5e2..0000000
--- a/LMES/bin/x86/HXERP.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[po]
-Server=47.96.97.237,15127
-[Erp]
-Server=47.96.97.237,15127
-DataBase=HX_LMESsys
-DataBaseNumber=001-智云LMES管理系统
-UserName=HX_USER
-PassWord=lc@841022
-UserPsd=
-Remember=
-[K3Erp]
-Server=47.96.97.237,15127
-DataBase=
-UserName=HX_USER
-PassWord=lc@841022
-[K32Erp]
-Server=47.96.97.237,15127
-DataBase=HX_LMESsys
-UserName=HX_USER
-PassWord=lc@841022
-[SRM]
-Server=.\sql2008
-DataBase=hx_lims_SRM
-UserName=HX_USER
-PassWord=lc@841022
-[UserInfo]
-UserName=admin,景焕章,生管员,条码,测试用户
-UserPsd=
-Remember=1
-HOrgName=手机事业部
-[CLOUDINFO]
-sCLOUDUrl=ddddd
-sCLOUDAcc=4455xddd
-sCLOUDUseName=顾问1
-sCLOUDPsd=123456
-
-
diff --git a/OCX/CheckPic.jpg b/OCX/CheckPic.jpg
new file mode 100644
index 0000000..dbe148b
--- /dev/null
+++ b/OCX/CheckPic.jpg
Binary files differ
diff --git a/OCX/CheckPic2.jpg b/OCX/CheckPic2.jpg
new file mode 100644
index 0000000..096a505
--- /dev/null
+++ b/OCX/CheckPic2.jpg
Binary files differ
diff --git a/OCX/CheckPic3.jpg b/OCX/CheckPic3.jpg
new file mode 100644
index 0000000..8c4716e
--- /dev/null
+++ b/OCX/CheckPic3.jpg
Binary files differ
diff --git a/OCX/CheckPic4.jpg b/OCX/CheckPic4.jpg
new file mode 100644
index 0000000..457ac98
--- /dev/null
+++ b/OCX/CheckPic4.jpg
Binary files differ
diff --git a/OCX/Checked.jpg b/OCX/Checked.jpg
new file mode 100644
index 0000000..25868f7
--- /dev/null
+++ b/OCX/Checked.jpg
Binary files differ
diff --git a/OCX/Closed.jpg b/OCX/Closed.jpg
new file mode 100644
index 0000000..9def613
--- /dev/null
+++ b/OCX/Closed.jpg
Binary files differ
diff --git a/OCX/Deleted.jpg b/OCX/Deleted.jpg
new file mode 100644
index 0000000..dcc34c0
--- /dev/null
+++ b/OCX/Deleted.jpg
Binary files differ
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
index 3488207..9f1b7aa 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
@@ -232,11 +232,6 @@
}
for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
{
- BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
- BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
- BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
- BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
- BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
string sHNumber = "";
if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "")
{
@@ -261,7 +256,11 @@
BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
}
-
+ BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
+ BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
+ BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
+ BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
+ BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
}
else
{
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
index 45a5161..2f3f591 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.designer.cs"
@@ -41,7 +41,8 @@
//
// pPic
//
- this.pPic.Size = new System.Drawing.Size(1158, 45);
+ this.pPic.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.pPic.Size = new System.Drawing.Size(1544, 56);
//
// panel1
//
@@ -52,7 +53,8 @@
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.cmbHYear);
this.panel1.Controls.Add(this.label1);
- this.panel1.Size = new System.Drawing.Size(1158, 42);
+ this.panel1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.panel1.Size = new System.Drawing.Size(1544, 52);
this.panel1.Controls.SetChildIndex(this.cmdHPath, 0);
this.panel1.Controls.SetChildIndex(this.label4, 0);
this.panel1.Controls.SetChildIndex(this.txtHPath, 0);
@@ -66,28 +68,33 @@
//
// lblCaption
//
- this.lblCaption.Size = new System.Drawing.Size(129, 19);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lblCaption.Size = new System.Drawing.Size(160, 24);
this.lblCaption.Text = "数据导入模块";
//
// cmdHPath
//
- this.cmdHPath.Location = new System.Drawing.Point(782, 7);
+ this.cmdHPath.Location = new System.Drawing.Point(1043, 9);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(461, 3);
- this.txtHPath.Size = new System.Drawing.Size(315, 32);
+ this.txtHPath.Location = new System.Drawing.Point(615, 4);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txtHPath.Size = new System.Drawing.Size(419, 39);
//
// label4
//
- this.label4.Location = new System.Drawing.Point(390, 12);
+ this.label4.Location = new System.Drawing.Point(520, 15);
+ this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(26, 9);
+ this.label1.Location = new System.Drawing.Point(35, 11);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(53, 12);
+ this.label1.Size = new System.Drawing.Size(67, 15);
this.label1.TabIndex = 104;
this.label1.Text = "会计年：";
//
@@ -95,9 +102,10 @@
//
this.cmbHYear.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbHYear.FormattingEnabled = true;
- this.cmbHYear.Location = new System.Drawing.Point(84, 8);
+ this.cmbHYear.Location = new System.Drawing.Point(112, 10);
+ this.cmbHYear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHYear.Name = "cmbHYear";
- this.cmbHYear.Size = new System.Drawing.Size(94, 20);
+ this.cmbHYear.Size = new System.Drawing.Size(124, 23);
this.cmbHYear.TabIndex = 105;
//
// cmbHPeriod
@@ -117,17 +125,19 @@
"10",
"11",
"12"});
- this.cmbHPeriod.Location = new System.Drawing.Point(269, 10);
+ this.cmbHPeriod.Location = new System.Drawing.Point(359, 12);
+ this.cmbHPeriod.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cmbHPeriod.Name = "cmbHPeriod";
- this.cmbHPeriod.Size = new System.Drawing.Size(85, 20);
+ this.cmbHPeriod.Size = new System.Drawing.Size(112, 23);
this.cmbHPeriod.TabIndex = 107;
//
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(198, 10);
+ this.label2.Location = new System.Drawing.Point(264, 12);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(65, 12);
+ this.label2.Size = new System.Drawing.Size(82, 15);
this.label2.TabIndex = 106;
this.label2.Text = "会计期间：";
//
@@ -136,34 +146,38 @@
this.checkadd.AutoSize = true;
this.checkadd.Checked = true;
this.checkadd.CheckState = System.Windows.Forms.CheckState.Checked;
- this.checkadd.Location = new System.Drawing.Point(1085, 10);
+ this.checkadd.Location = new System.Drawing.Point(1447, 12);
+ this.checkadd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.checkadd.Name = "checkadd";
- this.checkadd.Size = new System.Drawing.Size(48, 16);
+ this.checkadd.Size = new System.Drawing.Size(56, 19);
this.checkadd.TabIndex = 108;
this.checkadd.Text = "追加";
this.checkadd.UseVisualStyleBackColor = true;
//
// txtHSheetName
//
- this.txtHSheetName.Location = new System.Drawing.Point(949, 9);
+ this.txtHSheetName.Location = new System.Drawing.Point(1265, 11);
+ this.txtHSheetName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtHSheetName.Name = "txtHSheetName";
- this.txtHSheetName.Size = new System.Drawing.Size(100, 21);
+ this.txtHSheetName.Size = new System.Drawing.Size(132, 25);
this.txtHSheetName.TabIndex = 109;
this.txtHSheetName.Text = "Sheet1";
//
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(902, 10);
+ this.label3.Location = new System.Drawing.Point(1203, 12);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(41, 12);
+ this.label3.Size = new System.Drawing.Size(52, 15);
this.label3.TabIndex = 110;
this.label3.Text = "工作簿";
//
// Gy_DataIn_RoutingBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
- this.ClientSize = new System.Drawing.Size(1158, 631);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.ClientSize = new System.Drawing.Size(1544, 789);
+ this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.Name = "Gy_DataIn_RoutingBill";
this.Text = "数据导入模块";
this.pPic.ResumeLayout(false);
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
index 5c0687c..d55421f 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.resx"
@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>95, 17</value>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
index 613641e..cc1efe0 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
@@ -844,6 +844,12 @@
this.txtHAddSourceRate.Text = BillOld.omodel.HAddSourceRate.ToString();
this.txtHDelSourceRate.Text = BillOld.omodel.HDelSourceRate.ToString();
+ this.textHPicNumVer.Text = BillOld.omodel.HPicNumVer.ToString();
+ this.textHPicNumAssemble.Text = BillOld.omodel.HPicNumAssemble.ToString();
+ this.textHMaterTexture.Text = BillOld.omodel.HMaterTexture.ToString();
+ this.textHProductNum.Text = BillOld.omodel.HProductNum.ToString();
+ this.textHVerNum.Text = BillOld.omodel.HVerNum.ToString();
+
//鍔犺浇琛ㄤ綋
int i = 0;
foreach (Model.ClsGy_RoutingBillSub oSub in BillOld.DetailColl)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 2b26d3b..093b951 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -168,8 +168,10 @@
public string MES_StationInBill_FullMoveCtl; //上道完全出站控制（本道进站时，上道的报废+合格必须等于上道进站数量
public string MES_StationInBill_QtyCtl; //进站数量不能大于上道出站汇总合格数
public string MES_StationInBill_OneCtl; //一张流转卡只允许一次进站
+ public string MES_StationInBill_FirstCheckOut; //必须首件检验通过才能保存单据
//出站单
public string MES_StationOutBill_QtyCtl; //出站数量不能大于本道进站汇总数
+ public string MES_StationOutBill_ProcessCheckOut; //必须工序检验通过才能保存单据
//不良品评审单
public string QC_NoPassProdCheckBill_QtyCtl; //不良品数不能大于出站单报废数量
//委外发出
@@ -190,7 +192,7 @@
public string Sc_ICMOReportBill_MulSourceBill; //多源单模式
public string Sc_ICMOReportBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Sc_ICMOReportBill_UpdateSourceInterID;//覆盖源单内码
-
+ public string Sc_ICMOReportBill_FirstCheckOut; //必须首件检验通过才能保存单据
//JIT
@@ -206,7 +208,11 @@
//质量汇报单
public string Sc_ICMOBillQualityStatus_AutoCheck; //自动审核
- //
+ //QMS
+
+ //首件检验单
+ public string QC_FirstPieceCheckBill_AutoCheck; //自动审核
+
}
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 5a95409..580f92b 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1781,7 +1781,7 @@
grdMain.Rows.Add();
Application.DoEvents();
//寰楀埌淇℃伅
- Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
+ Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and HAuxPropID=" + oSelectRow.HAuxPropID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "'", "h_v_KF_ICInventoryList_IF");
//鍐欏叆淇℃伅
Sub_WriteInForm2(Ds.Tables[0], i);
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index c8fe01b..650b243 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -31,12 +31,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere, "h_v_IF_BadReasonList");
+ ds = oCN.RunProcReturn("select * from h_v_IF_BadReasonList " + sWhere+ " order by HItemID desc", "h_v_IF_BadReasonList");
}
else
{
- string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql1 = "select * from h_v_IF_BadReasonList where 1 = 1";
+ string sql = sql1 + sWhere+ " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_BadReasonList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 660e6e1..3db4fde 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -31,12 +31,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere, "h_v_Gy_CustomerList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
}
else
{
string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -77,8 +77,17 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_Customer where HItemID=" + HInterID, "Gy_Customer");
-
+ string sql = string.Format(@"select c.HItemID,c.HNumber 瀹㈡埛浠ｇ爜,c.HName 瀹㈡埛鍚嶇О,c.HHelpCode 鍔╄鐮�,c.HShortName 绠�绉�,c.HAddress 鍦板潃,c.HLinkMan 鑱旂郴浜�,c.HLinkPhone 鑱旂郴鐢佃瘽
+ ,c.HMobilePhone 鎵嬫満,c.HFax 浼犵湡,c.HPostalCode 閭紪,c.HEmail 鐢靛瓙閭欢,c.HCorMan 娉曚汉浠ｈ〃,c.HBank 寮�鎴烽摱琛�,c.HBankAccount 閾惰璐﹀彿,
+ c.HTaxNum 绋庡姟鐧昏鍙�,c.HTaxRate 澧炲�肩◣鐜�,c.HEnglishName 鑻辨枃鍚嶇О,c.HEngLishAddress 鑻辨枃鍦板潃,c.HCountry 鍥藉,c.HCusStatus 瀹㈡埛鐘舵��
+ ,c.HStopflag 绂佺敤鏍囧織,c.HRemark 澶囨敞,c.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,c.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+ c.HSSID 缁撶畻鏂瑰紡ID,s.HName 缁撶畻鏂瑰紡,c.HCusTypeID 瀹㈡埛鍒嗙被ID,t.HName 瀹㈡埛鍒嗙被 from Gy_Customer c
+ left join Gy_AreaSet a on c.HAreaID=a.HItemID
+ left join Gy_Currency r on c.HCurID=r.HItemID
+ left join Gy_SettleStyle s on c.HSSID=s.HItemID
+ left join Gy_CusType t on c.HCusTypeID=t.HItemID
+ where c.HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "Gy_Customer");
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "";
@@ -255,7 +264,7 @@
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
",HCusTypeID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
- ", " + HLevel + ",0,0,'" + HRemark + "'" +
+ ", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "'," + HTaxRate + ",'" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
@@ -304,10 +313,10 @@
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();//id
+ string msg4 = sArray[2].ToString();//褰撳墠鐢ㄦ埛
+ string msg5 = sArray[3].ToString();//鏉冮檺妯″潡浠ｇ爜
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Customer> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(msg2);
@@ -381,14 +390,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -398,7 +399,32 @@
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
",HShortNumber='" + HShortNumber + "'" +
- ",HParentID=" + HParentID +
+ ",HLevel ='" + HLevel + "'" +
+ ",HEndFlag ='" + HEndFlag + "'" +
+ ",HParentID='" + HParentID + "'" +
+ ",HStopflag ='" + HStopflag + "'" +
+ ",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 + "'" +
+ ",HCountry ='" + HCountry + "'" +
+ ",HEnglishName ='" + HEnglishName + "'" +
+ ",HCorMan ='" + HCorMan + "'" +
+ ",HEnglishAddress ='" + HEnglishAddress + "'" +
+ ",HCurID ='" + HCurID + "'" +
+ ",HSSID ='" + HSSID + "'" +
+ ",HAreaID ='" + HAreaID + "'" +
+ ",HCusStatus ='" + HCusStatus + "'" +
+ ",HCusTypeID ='" + HCusTypeID + "'" +
",HRemark= '" + HRemark + "' 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/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index c3a1947..696f98c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -31,12 +31,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
}
else
{
string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + " order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -109,7 +109,16 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier");
+ string sql = string.Format(@"select s.HItemID,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode 鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
+ ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠ｈ〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,
+ s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
+ ,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+ s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡 from Gy_Supplier s
+ left join Gy_AreaSet a on s.HAreaID=a.HItemID
+ left join Gy_Currency r on s.HCurID=r.HItemID
+ left join Gy_SettleStyle e on s.HSSID=e.HItemID
+ where s.HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "Gy_Supplier");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -158,6 +167,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
string HEndFlag = list[0].HEnfFlag;
+ string HStopflag = list[0].HStopflag;
string HHelpCode = list[0].HHelpCode;
string HShortName = list[0].HShortName;
string HAddress = list[0].HAddress;
@@ -208,7 +218,7 @@
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
",HEnglishAddress,HCurID,HSSID,HAreaID) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
- "," + HLevel + ",'0','0','" + HRemark + "'" +
+ "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
@@ -268,7 +278,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
string HEndFlag = list[0].HEnfFlag;
- bool HStopflag = list[0].HStopflag;
+ string HStopflag = list[0].HStopflag;
string HHelpCode = list[0].HHelpCode;
string HShortName = list[0].HShortName;
string HAddress = list[0].HAddress;
@@ -317,16 +327,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -336,7 +336,7 @@
",HShortNumber='" + HShortNumber + "'" +
",HParentID=" + HParentID.ToString() +
",HLevel=" + HLevel.ToString() +
- ",HStopflag=" + HStopflag +
+ ",HStopflag ='" + HStopflag + "'" +
",HRemark= '" + HRemark + "'" +
",HHelpCode='" + HHelpCode + "'" +
",HShortName='" + HShortName + "'" +
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index b6fe620..13ad85b 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -32,6 +32,8 @@
//濮斿宸ュ簭鍙戝嚭鍙嶅簭鍒楀寲
msg1 = "[" + msg1.ToString() + "]";
List<StationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StationBill>>(msg1);
+ long HMainInterID = 0;
+ HMainInterID = list[0].HMainInterID;
long HProcExchInterID = list[0].lngBillKey;//娴佽浆鍗′富鍐呯爜
if (HProcExchInterID <= 0)
{
@@ -166,7 +168,7 @@
",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationInTime,HSourceID" +
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
",HSupID,HQty,HPrice,HMoney,HPieceQty,HSourceName,HCenterID" +
- ",HProcNo,HOrderProcNO" +
+ ",HProcNo,HOrderProcNO,HMainInterID" +
") " +
" values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" +
"," + HYear + "," + HPeriod + ",'" + HRemark + "'" +
@@ -174,7 +176,7 @@
",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID +
"," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" +
"," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HPieceQty + ",'" + HSourceName + "'," + HCenterID +
- ",'" + HProcNo + "','" + HOrderProcNO + "'" +
+ ",'" + HProcNo + "','" + HOrderProcNO + "'," + HMainInterID +
") ");
}
else if ("Modify".Equals(eventType))
@@ -718,6 +720,51 @@
}
#endregion
+ #region 鎵归噺杩涚珯妯″潡杩斿洖鏄庣粏淇℃伅鍒楄〃
+ [Route("Cj_StationInBill/get_BarCodeDetail")]
+ [HttpGet]
+ public object get_BarCodeDetail(string HMainInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(
+ "select a.HBillNo,a.HInterID,a.HQty,a.HProcExchBillNo,a.HICMOBillNo" +
+ ",b.HNumber HMaterNumber,b.HName HMaterName,b.HModel HMaterModel,c.HName HSourceName,d.HName HGroupName" +
+ ",e.HName HEmpName,a.HMaker,a.HMakeDate " +
+ " from Sc_StationInBillMain a " +
+ " left join Gy_Material b on a.HMaterID = b.HItemID " +
+ " left join Gy_Source c on a.HSourceID = c.HItemID " +
+ " left join Gy_Group d on a.HGroupID = d.HItemID " +
+ " left join Gy_Employee e on a.HEmpID = e.HItemID " +
+ " where HMainInterID = " + HMainInterID + " order by a.HMakeDate desc", "Sc_StationInBillMain");
+ 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
+
//
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 072aca9..8a91897 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -70,28 +70,31 @@
try
{
- //ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "'", "Gy_SourceRelationSet");
- //if (ds.Tables[0].Rows.Count > 0)
- //{
-
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鐢熶骇璧勬簮宸插瓨鍦紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
- //oCN.BeginTran();
- //鍐欏叆浜х嚎缁戝畾
- string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
+ ds = oCN.RunProcReturn("select * from Gy_SourceRelationSet where HSourceID='" + HSourceID + "' and HUserName='" + HUserName + "'", "Gy_SourceRelationSet");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠浜哄憳鍒涘缓姝ょ敓浜ц祫婧�,涓嶅厑璁搁噸澶嶅垱寤猴紒";
+ objJsonResult.data = null;
+
+ }
+ else
+ {
+ oCN.BeginTran();
+ //鍐欏叆浜х嚎缁戝畾
+ string sql = string.Format(@"insert into Gy_SourceRelationSet (HSourceID,HUserName,HGroupID,HManagerID,HRemark,HCreateDate,HCreator,HNowFlag,HCheckManID)
values('" + HSourceID + "','" + HUserName + "','" + HGroupID + "','" + HManagerID + "','" + HRemark + "','" + DateTime.Parse(HCreateDate).ToShortDateString() + "','" + HUserName + "','0','')");
- oCN.RunProc(sql);
- oCN.Commit();
+ oCN.RunProc(sql);
+ oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- objJsonResult.data = null;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
deleted file mode 100644
index 7d70a87..0000000
--- a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
+++ /dev/null
@@ -1,224 +0,0 @@
-锘縰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/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index d576b54..dedfd6e 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -443,22 +443,11 @@
{
ds = Sc_MouldConkBookBillList_s(sWhere);
- 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;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception ex)
{
@@ -475,11 +464,18 @@
public static DataSet Sc_MouldConkBookBillList_s(string sWhere)
{
- if (sWhere != "" || sWhere != null)
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
{
- sWhere = " where 1=1 " + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList " + sWhere, "h_v_Sc_MouldConkBookBillList");
}
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList "+sWhere+"", "h_v_Sc_MouldConkBookBillList");
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldConkBookBillList where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList");
+ }
+ return ds;
}
#endregion
@@ -495,7 +491,6 @@
{
try
{
-
ds = Sc_MouldRepairCheckBillList_s(sWhere);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -519,7 +514,18 @@
public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");
+ }
+ return ds;
}
#endregion
@@ -1642,6 +1648,7 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
string UserName = "";
@@ -1655,7 +1662,7 @@
lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2);
foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
+ oItem.HMaker = msg4;
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3817";
oItem.HBillSubType = "3817";
@@ -1937,6 +1944,7 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
+ DBUtility.ClsPub.CurUserName = UserName;
oItem.HBillType = "3815";
oItem.HBillSubType = "3815";
//oItem.HBillNo = ""; //鍗曟嵁鍙�
@@ -2072,7 +2080,7 @@
{
//ds = oCN.RunProcReturn("select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub", "Sc_MouldRepairCheckBillSub");
- ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit");
+ ds = oCN.RunProcReturn("select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit", "h_v_Sc_MouldConkBookBillList_Edit");
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -2083,7 +2091,7 @@
{
//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
- string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HHConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 ";
+ string sql1 = "select HConkReasonID,鏁呴殰鍘熷洜浠ｇ爜 HConkReasonCode,鏁呴殰鍘熷洜 HConkReasonName,鏁呴殰鍘熷洜鎻忚堪 HConkExplanation,HManagerSonID HManagerID,瀛愯礋璐ｄ汉浠ｇ爜 HManagerCode,瀛愯礋璐ｄ汉 HManagerName,澶囨敞 HRemark from h_v_Sc_MouldConkBookBillList_Edit where 1 = 1 ";
string sql = sql1 + sqlWhere;
ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList_Edit");
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 73bf700..b6c0485 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1237,22 +1237,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- if (HStopflag)
- {
- oCN.RollBack();//鍥炴粴浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+ //if (HStopflag)
+ //{
+ // oCN.RollBack();//鍥炴粴浜嬪姟
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
- oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID);
+ oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
objJsonResult.code = "0";
objJsonResult.count = 1;
- objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+ objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
index 1033433..40cefa1 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBillController.cs"
@@ -16,8 +16,10 @@
public class Sc_QualityReportBillController : ApiController
{
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
- private json objJsonResult = new json();
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ private json objJsonResult = new json();
+ private json objJsonResultReturn = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
DataSet ds;
#region 杩斿洖鐢熶骇璐ㄩ噺姹囨姤鍗曞垪琛�
@@ -124,20 +126,19 @@
{
var msg1 = oMain["oMain"].ToString();
//淇濆瓨鍗曟嵁
- return objJsonResult = AddBillMain(msg1);
+ return objJsonResult = AddBillTmp(msg1);
}
- public json AddBillMain(string msg1)
+ public json AddBillTmp(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg = sArray[0].ToString();
string OperationType = sArray[1].ToString().Trim();
- bool bResult;
+ bool bResult = false;
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();
+ List<Sc_ICMOBillQualityStatus_Tmp> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Sc_ICMOBillQualityStatus_Tmp>>(msg);
//鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
string s = "";
int sYear = 0;
@@ -151,52 +152,27 @@
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);
+ //鏄惁淇濆瓨
+ bResult = AddBillTmpSQL(mainList, ref ClsPub.sExeReturnInfo);
}
else if (OperationType.Equals("3"))
{
- bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //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.Message = "鎵爜淇濆瓨鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -218,78 +194,407 @@
return objJsonResult;
}
}
- #endregion
-
- /// <summary>
- /// 璐ㄩ噺姹囨姤鍗曡缃垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Sc_QualityReportBill/Delete")]
- [HttpGet]
- public object DeltetSc_QualityReportBill(string HItemID)
+ //鏂板鍗曟嵁
+ public bool AddBillTmpSQL(List<Sc_ICMOBillQualityStatus_Tmp> mainList, ref string sReturn)
{
- DataSet ds;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
try
{
- //鍒犻櫎鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ Sc_ICMOBillQualityStatus_Tmp BillNew = new Sc_ICMOBillQualityStatus_Tmp();
+ //鍥哄畾璧嬪��=================================
+ BillNew.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ BillNew.HBillNo = mainList[0].HBillNo;
+ BillNew.HBillType = mainList[0].HBillType;
+ BillNew.HDate = mainList[0].HDate;
+ BillNew.HICMOBillNo = mainList[0].HICMOBillNo;
+ BillNew.HICMOInterID = mainList[0].HICMOInterID;
+ BillNew.HProcExchBillNo = mainList[0].HProcExchBillNo;
+ BillNew.HProcExchInterID = mainList[0].HProcExchInterID;
+ BillNew.HProcExchEntryID = mainList[0].HProcExchEntryID;
+ BillNew.HProcID = mainList[0].HProcID;
+ BillNew.HMaterID = mainList[0].HMaterID;
+ BillNew.HSourceID = mainList[0].HSourceID;
+ BillNew.HGroupID = mainList[0].HGroupID;
+ BillNew.HCheckManID = mainList[0].HCheckManID;
+ BillNew.HBadReasonID = mainList[0].HBadReasonID;
+ BillNew.HBarCode = mainList[0].HBarCode;
+ BillNew.HMaker = mainList[0].HMaker;
+ BillNew.HMakeDate = mainList[0].HMakeDate;
+ BillNew.HReportType = mainList[0].HReportType;
+ BillNew.HSourceBillNo = mainList[0].HICMOBillNo;
+ BillNew.HSourceInterID = mainList[0].HICMOInterID;
+ BillNew.HSourceBillType = mainList[0].HSourceBillType;
+ oCN.BeginTran();
+ //涓存椂琛�
+ oCN.RunProc("Insert Into Sc_ICMOBillQualityStatus_Tmp " +
+ " (HInterID,HBillNo,HDate,HICMOBillNo,HICMOInterID" +
+ ",HProcExchBillNo,HProcExchInterID,HProcExchEntryID,HProcID,HMaterID" +
+ ",HSourceID,HGroupID,HCheckManID,HBadReasonID,HBarCode" +
+ ",HMaker,HMakeDate,HBillType,HReportType,HSourceBillNo" +
+ ",HSourceInterID,HSourceBillType" +
+ ") " +
+ " values(" + BillNew.HInterID + ",'" + BillNew.HBillNo + "','" + BillNew.HDate + "','" + BillNew.HICMOBillNo + "'," + BillNew.HICMOInterID +
+ ",'" + BillNew.HProcExchBillNo + "'," + BillNew.HProcExchInterID + "," + BillNew.HProcExchEntryID + "," + BillNew.HProcID + "," + BillNew.HMaterID +
+ "," + BillNew.HSourceID + "," + BillNew.HGroupID + "," + BillNew.HCheckManID + "," + BillNew.HBadReasonID + ",'" + BillNew.HBarCode + "'" +
+ ",'" + BillNew.HMaker + "','" + BillNew.HMakeDate + "','" + BillNew.HBillType + "','" + +BillNew.HReportType + "','" +BillNew.HSourceBillNo + "'" +
+ "," + BillNew.HSourceInterID + ",'" + BillNew.HSourceBillType + "'" +
+ ") ");
+ sReturn = "鎵爜鎴愬姛锛�";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (string.IsNullOrWhiteSpace(HItemID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "HItemID涓虹┖锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- oCN.BeginTran();//寮�濮嬩簨鍔�
- ds = oCN.RunProcReturn("select * from Sc_QualityReportBill where HItemID=" + HItemID, "Sc_QualityReportBill");
+ #region 璐ㄩ噺姹囨姤鍗曟壂涓嶈壇鏉＄爜鑾峰彇涓嶈壇鍘熷洜id
+ [Route("Sc_QualityReportBill/get_HBadReasonID")]
+ [HttpGet]
+ public object get_HBadReasonID(string HBadReasonNumber)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HNumber from Gy_BadReason where HStopflag=0 and HNumber='" + HBadReasonNumber + "'", "Gy_BadReason");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
- objJsonResult.data = null;
- return objJsonResult; ;
- }
- var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- if (HStopflag)
- {
- oCN.RollBack();//鍥炴粴浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+ objJsonResult.Message = "涓嶈壇鏉＄爜涓嶅瓨鍦ㄦ垨宸茶绂佺敤锛�";
objJsonResult.data = null;
return objJsonResult;
}
-
- oCN.RunProc("update Sc_QualityReportBill set HStopflag=1 where HItemID=" + HItemID);
- oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- 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 = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瀹℃牳
+ public object set_CheckBill(long HInterID,string HChecker, ref string sReturn)
+ {
+ SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN();
+ try
+ {
+ oCN1.BeginTran();
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_QualityReportBill_Check", 1, true, HChecker))
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夋潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (HInterID == 0)
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓�0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSc_QualityReportBill oBill = new DAL.ClsSc_QualityReportBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紒涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紒涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紒涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳
+ if (CheckBill(HInterID, HChecker, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ oCN1.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN1.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥�:" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
+ //瀹℃牳SQL
+ public bool CheckBill(Int64 HInterID,string HChecker, ref string sReturn)
+ {
+
+ try
+ {
+ oCN.RunProc(" Update Sc_QualityReportBillMain set HChecker='" + HChecker + "',HCheckDate=GETDATE() Where HInterID=" + HInterID.ToString());
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鑾峰彇鎵爜鎵弿璁板綍
+ [Route("Sc_QualityReportBill/get_BarCodeDetail")]
+ [HttpGet]
+ public object get_BarCodeDetail(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(
+ "Select a.HItemID,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName" +
+ ",c.HName HCheckMan,d.HName HGroupName,e.HName HSourceName " +
+ " from Sc_ICMOBillQualityStatus_Tmp a " +
+ " left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
+ " left join Gy_Employee c on a.HCheckManID = c.HItemID " +
+ " left join Gy_Group d on a.HGroupID = d.HItemID " +
+ " left join Gy_Source e on a.HSourceID = e.HItemID " +
+ " where HInterID=" + HInterID, "Sc_ICMOBillQualityStatus_Tmp"
+ );
+ 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 鑾峰彇鎵爜姹囨�昏褰�
+ [Route("Sc_QualityReportBill/get_BarCodeDetailSum")]
+ [HttpGet]
+ public object get_BarCodeDetailSum(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(
+ "Select count(*) HQty,a.HInterID,b.HNumber HBadReasonNumber,b.HName HBadReasonHName,c.HName HCheckMan" +
+ ",d.HName HGroupName,e.HName HSourceName " +
+ " from Sc_ICMOBillQualityStatus_Tmp a " +
+ " left join Gy_BadReason b on a.HBadReasonID = b.HItemID " +
+ " left join Gy_Employee c on a.HCheckManID = c.HItemID " +
+ " left join Gy_Group d on a.HGroupID = d.HItemID " +
+ " left join Gy_Source e on a.HSourceID = e.HItemID " +
+ " where a.HInterID=" + HInterID +
+ " group by a.HInterID,a.HBadReasonID,a.HCheckManID,a.HGroupID,a.HSourceID" +
+ " ,b.HNumber,b.HName,c.HName,d.HName,e.HName", "Sc_ICMOBillQualityStatus_Tmp"
+ );
+ 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 鍒犻櫎鎵弿璁板綍琛�
+ [Route("Sc_QualityReportBill/del_BarCodeDetail")]
+ [HttpGet]
+ public object del_BarCodeDetail(long HItemID)
+ {
+ try
+ {
+ oCN.RunProc("delete from Sc_ICMOBillQualityStatus_Tmp where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ 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
+
+ #region 鎻愪氦淇濆瓨锛屽瓨涓诲瓙琛ㄥ強鏄庣粏琛�
+ [Route("Sc_QualityReportBill/set_SaveBill")]
+ [HttpGet]
+ public object set_SaveBill(long HInterID,string HChecker)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ bool bResult2 = false;
+ oCN.BeginTran();
+ //淇濆瓨
+ oCN.RunProc("exec h_p_save_Sc_QualityReportBill " + HInterID);
+ //鍒ゆ柇鏄惁鍏佽淇濆瓨锛屼笉鍏佽鍒欏洖婊�
+ ds = oCN.RunProcReturn("exec h_p_JIT_ICMOBillQualityStatus_SaveCtrl", "h_p_JIT_ICMOBillQualityStatus_SaveCtrl");
+ if (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.Commit();
+ //鑾峰彇鑷姩瀹℃牳鍙傛暟
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ICMOBillQualityStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ //瀹℃牳
+ objJsonResultReturn = (json)set_CheckBill(HInterID, HChecker, ref ClsPub.sExeReturnInfo);
+ if (objJsonResultReturn.code == "1")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯锛佸鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯锛佽嚜鍔ㄥ鏍稿け璐ワ紝鍘熷洜锛�" + objJsonResultReturn.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯锛佽幏鍙栬嚜鍔ㄥ鏍稿弬鏁板け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ 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/LogService.cs b/WebAPI/LogService.cs
new file mode 100644
index 0000000..9168f4d
--- /dev/null
+++ b/WebAPI/LogService.cs
@@ -0,0 +1,57 @@
+锘縰sing Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WebAPI
+{
+ public class LogService
+ {
+ private static readonly object lockObj = new object();
+
+ #region 鏃ュ織
+ public static void Write(object obj, string filePath = "Vlog", bool isAppend = true)
+ {
+ try
+ {
+ lock (lockObj)
+ {
+ filePath = $@"{filePath}\webapi{DateTime.Now.ToString("yyyyMMdd")}.txt";
+
+ filePath = AppDomain.CurrentDomain.BaseDirectory + filePath;
+
+ if (!System.IO.Directory.Exists(Path.GetDirectoryName(filePath)))
+ {
+ System.IO.Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+ }
+
+ bool fileExists = System.IO.File.Exists(filePath);
+ //涓嶅瓨鍦� 鍒欏垱寤鸿鏂囦欢
+ if (!fileExists)
+ {
+ System.IO.File.Create(filePath).Close();
+ }
+
+ using (StreamWriter writer = new StreamWriter(filePath, isAppend))
+ {
+ //瀛樺湪鐨勬椂鍊欐墠鍐欎竴琛�
+ if (fileExists && isAppend)
+ {
+ writer.WriteLine();
+ }
+
+ var content = obj is string ? obj : JsonConvert.SerializeObject(obj);
+ writer.WriteLine($"{DateTime.Now} {content}");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
new file mode 100644
index 0000000..c5a1b34
--- /dev/null
+++ b/WebAPI/Models/Sc_ICMOBillQualityStatus_Tmp.cs
@@ -0,0 +1,54 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ //鐢熶骇璐ㄩ噺鐘舵�佷复鏃惰〃_鏄庣粏锛堣川閲忔眹鎶ワ級
+ public class Sc_ICMOBillQualityStatus_Tmp
+ {
+ public long HInterID { get; set; }//涓诲唴鐮�
+ public long HEntryID { get; set; }//瀛愬唴鐮侊紙鏆傛椂涓嶇敤锛�
+ public string HBillType { get; set; }// 鍗曟嵁绫诲瀷
+ public DateTime HDate { get; set; }//鏃ユ湡
+ public string HBillSubType { get; set; }//瀛愮被鍨�
+ public string HBillNo { get; set; }//鍗曟嵁鍙�
+ public string HRemark { get; set; }//澶囨敞
+ public long HQualityReportEntryID { get; set; }//璐ㄩ噺姹囨姤鍗曞瓙琛↖D
+ public long HMaterID { get; set; }//鐗╂枡鍐呯爜锛坓y_material锛�
+ public long HAuxPropID { get; set; }//杈呭姪灞炴��
+ public string HMTONo { get; set; }//璁″垝璺熻釜鍙�
+ public long HProcID { get; set; }//宸ュ簭(gy_Process)
+ public long HSourceID { get; set; }//鐢熶骇璧勬簮(gy_source)
+ public long HReportType { get; set; }//姹囨姤绫诲瀷锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
+ public long HBadReasonID { get; set; }//涓嶈壇鍘熷洜
+ public long HWasterReasonID { get; set; }//鎶ュ簾鍘熷洜
+ public string HBarCode { get; set; }//鏉″舰鐮�
+ public string HAddr { get; set; }//鏈哄櫒鍦板潃
+ public string HMaker { get; set; }//璁板綍浜�
+ public DateTime HMakeDate { get; set; }//璁板綍鏃ユ湡锛坹yyy-MM-dd hh:mm:ss锛�
+ public long HGroupID { get; set; }//鐢熶骇鐝粍锛坓y_Group锛�
+ public long HCheckManID { get; set; }//妫�楠屽憳(Gy_Employee)
+ public long HOWNERID { get; set; }//璐т富
+ public long HOWNERTYPEID { get; set; }//璐т富绫诲瀷
+ public long HPRDORGID { get; set; }//鐢熶骇缁勭粐
+ public long HOTHERORGID { get; set; }//鍏朵粬缁勭粐(棰勭暀)
+ public string HSplitNO { get; set; }//娲惧伐鍗曞彿
+ public long HICMOInterID { get; set; }//鐢熶骇璁㈠崟
+ public long HICMOEntryID { get; set; }//鐢熶骇璁㈠崟瀛愬唴鐮�
+ public string HICMOBillNo { get; set; }//鐢熶骇璁㈠崟鍙�
+ public long HProcExchInterID { get; set; }//宸ュ簭娴佽浆鍗″唴鐮�
+ public long HProcExchEntryID { get; set; }//宸ュ簭娴佽浆鍗″瓙鍐呯爜
+ public string HProcExchBillNo { get; set; }//宸ュ簭娴佽浆鍗″彿
+ public long HSourceInterID { get; set; }//婧愬崟涓诲唴鐮�
+ public long HSourceEntryID { get; set; }//婧愬崟瀛愬唴鐮�
+ public string HSourceBillNo { get; set; }//婧愬崟鍗曞彿
+ public string HSourceBillType { get; set; }//婧愬崟绫诲瀷
+ public long HRelationInterID { get; set; }//鍏宠仈鍗曚富鍐呯爜
+ public long HRelationEntryID { get; set; }//鍏宠仈鍗曞瓙鍐呯爜
+ public string HRelationBillNo { get; set; }//鍏宠仈鍗曞彿
+ public long HReportEntryID { get; set; }//姹囨姤鍗曞瓙鍐呯爜
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index ca50c72..5d5a72a 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -70,8 +70,8 @@
public long HQCCheckID { get; set; }
public long HProcPlanInterID { get; set; }
public long HProcPlanEntryID { get; set; }
-
public string eventType { get; set; }
+ public long HMainInterID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/Supplier.cs b/WebAPI/Models/Supplier.cs
index 86790a1..3800016 100644
--- a/WebAPI/Models/Supplier.cs
+++ b/WebAPI/Models/Supplier.cs
@@ -20,7 +20,7 @@
public string HRemark { get; set; }
- public bool HStopflag { get; set; }
+ public string HStopflag { get; set; }
public string HHelpCode { get; set; }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 639d6b1..ebbf6cc 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-08-31T01:53:41.3652480Z;True|2021-08-31T09:47:38.1594937+08:00;True|2021-08-31T09:40:59.0336956+08:00;True|2021-08-31T09:39:43.8156398+08:00;True|2021-08-31T09:36:54.2239237+08:00;True|2021-08-31T09:35:51.5700999+08:00;True|2021-08-31T09:34:03.7330797+08:00;True|2021-08-30T17:02:03.6174851+08:00;True|2021-08-30T16:28:48.9113263+08:00;True|2021-08-30T15:49:49.4161918+08:00;True|2021-08-30T14:39:40.5677137+08:00;True|2021-08-30T14:04:23.8463640+08:00;True|2021-08-30T11:23:40.6661689+08:00;True|2021-08-30T11:12:55.0564387+08:00;True|2021-08-30T11:09:33.5575316+08:00;True|2021-08-30T10:28:13.6354281+08:00;True|2021-08-30T10:23:14.4712130+08:00;True|2021-08-30T10:06:42.9673996+08:00;True|2021-08-30T10:04:40.1466701+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2021-09-02T03:16:15.1370453Z;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/31/2021 09:53:33</publishTime>
+ <publishTime>09/02/2021 11:16:07</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/31/2021 09:53:33</publishTime>
+ <publishTime>09/02/2021 11:16:07</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/31/2021 09:53:32</publishTime>
+ <publishTime>09/02/2021 11:16:06</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/31/2021 09:53:32</publishTime>
+ <publishTime>09/02/2021 11:16:06</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/31/2021 09:53:29</publishTime>
+ <publishTime>09/02/2021 11:16:04</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/31/2021 09:53:29</publishTime>
+ <publishTime>09/02/2021 11:16:04</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/31/2021 09:53:29</publishTime>
+ <publishTime>09/02/2021 11:16:05</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/31/2021 09:53:29</publishTime>
+ <publishTime>09/02/2021 11:16:05</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/09/2021 15:55:25</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/31/2021 09:53:27</publishTime>
+ <publishTime>09/02/2021 11:16:03</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/31/2021 09:53:27</publishTime>
+ <publishTime>09/02/2021 11:16:03</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/31/2021 09:53:28</publishTime>
+ <publishTime>09/02/2021 11:16:03</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/31/2021 09:53:28</publishTime>
+ <publishTime>09/02/2021 11:16:03</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/31/2021 09:53:28</publishTime>
+ <publishTime>09/02/2021 11:16:04</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/31/2021 09:53:28</publishTime>
+ <publishTime>09/02/2021 11:16:04</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/31/2021 09:53:35</publishTime>
+ <publishTime>09/02/2021 11:16:09</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/31/2021 09:53:35</publishTime>
+ <publishTime>09/02/2021 11:16:09</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/31/2021 09:53:40</publishTime>
+ <publishTime>09/02/2021 11:16:14</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 59bee3d..4f78163 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -355,7 +355,6 @@
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
@@ -388,6 +387,7 @@
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="LogService.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
@@ -420,6 +420,7 @@
<Compile Include="Models\Gy_Mould.cs" />
<Compile Include="Models\Gy_MouldSub.cs" />
<Compile Include="Models\Sc_MouldStockBillMain.cs" />
+ <Compile Include="Models\Sc_ICMOBillQualityStatus_Tmp.cs" />
<Compile Include="Models\Sc_MouldStockBillSub.cs" />
<Compile Include="Models\Xt_AccountPeriod.cs" />
<Compile Include="Models\xtgnb.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index e034e8d..c934955 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
<WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
<WebStackScaffolding_LayoutPageFile />
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
- <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 5b15b03..60ca177 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -2477,10 +2477,15 @@
Report.FieldByName("鍘熸枡鎵规").AsString = txtHMateOutBatchNo.Text;
Report.FieldByName("妯″叿璁惧").AsString = txtHEquipMentID.Text;
Report.FieldByName("椤圭洰鍙�").AsString = txtHProjectNum.Text;
+ Report.FieldByName("鍥惧彿鐗堟湰").AsString = textHPicNumVer.Text;
+ Report.FieldByName("鎬昏鍥惧彿").AsString = textHPicNumAssemble.Text;
+ Report.FieldByName("鏉愯川").AsString = textHMaterTexture.Text;
+ Report.FieldByName("鎴愬搧缂栧彿").AsString = textHProductNum.Text;
+ Report.FieldByName("鐗堟湰").AsString = textHVerNum.Text;
}
catch (Exception e)
{
- MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧]." + e.Message);
+ MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规],[妯″叿璁惧],[鍥惧彿鐗堟湰],[鎬昏鍥惧彿],[鏉愯川],[鎴愬搧缂栧彿],[鐗堟湰]." + e.Message);
}
}
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
index c963755..3ffcfdc 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBillQuery.cs"
@@ -605,17 +605,22 @@
Report.FieldByName("娴佽浆鍗℃暟閲�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("娴佽浆鍗℃暟閲�")].Value);
Report.FieldByName("浜у搧浠ｇ爜").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧浠ｇ爜")].Value);
Report.FieldByName("浜у搧鍚嶇О").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧鍚嶇О")].Value);
- Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("瑙勬牸鍨嬪彿")].Value);
+ Report.FieldByName("浜у搧瑙勬牸").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("浜у搧瑙勬牸")].Value);
Report.FieldByName("璁″垝寮�宸ユ棩鏈�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝寮�宸ユ棩鏈�")].Value);
Report.FieldByName("璁″垝瀹屽伐鏃ユ湡").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁″垝瀹屽伐鏃ユ湡")].Value);
Report.FieldByName("璁㈠崟璺熻釜鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("璁㈠崟璺熻釜鍙�")].Value);
Report.FieldByName("鍘熸枡鎵规").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍘熸枡鎵规")].Value);
Report.FieldByName("妯″叿璁惧").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("妯″叿璁惧")].Value);
Report.FieldByName("椤圭洰鍙�").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("椤圭洰鍙�")].Value);
+ Report.FieldByName("鍥惧彿鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鍥惧彿鐗堟湰")].Value);
+ Report.FieldByName("鎬昏鍥惧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎬昏鍥惧彿")].Value);
+ Report.FieldByName("鏉愯川").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鏉愯川")].Value);
+ Report.FieldByName("鎴愬搧缂栧彿").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鎴愬搧缂栧彿")].Value);
+ Report.FieldByName("鐗堟湰").AsString = DBUtility.ClsPub.isStrNull(grdMain.SelectedRows[selectRow].Cells[Fun_GetCol("鐗堟湰")].Value);
}
catch (Exception e)
{
- MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]." + e.Message);
+ MessageBox.Show("鎵撳嵃澶辫触锛孾椤圭洰鍙穄,[娴佽浆鍗＄紪鍙穄,[娴佽浆鍗℃暟閲廬,[浜у搧浠ｇ爜],[浜у搧鍚嶇О],[浜у搧瑙勬牸],[璁″垝寮�宸ユ棩鏈焆,[璁″垝瀹屽伐鏃ユ湡],[璁㈠崟璺熻釜鍙穄,[鍘熸枡鎵规]锛孾妯″叿璁惧]锛孾鍥惧彿鐗堟湰]锛孾鎬昏鍥惧彿]锛孾鏉愯川]锛孾鎴愬搧缂栧彿]锛孾鐗堟湰]." + e.Message);
}
}
--
Gitblit v1.9.1