From ef10f06e96034f6ab3db93ea103f2a4d78fcb2b9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 13 五月 2024 17:32:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs | 57 +++++++
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 34 ++++
WebAPI/Controllers/SCGL/日计划管理/JIT_Cg_PODemandPlanBillController.cs | 113 ++++++++++++++
DAL/生产管理/模具管理/ClsSc_MouldMaintainRuleBill.cs | 5
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 7
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs | 2
Model/生产管理/模具管理/ClsSc_MouldMaintainBillMain.cs | 2
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 7
Model/生产管理/设备管理/ClsSb_EquipMaintainPlanBillMain.cs | 4
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | 12 +
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs | 7
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs | 2
WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs | 32 ++-
DAL/生产管理/设备管理/ClsSb_EquipMaintainPlanBill.cs | 5
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 10 +
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/Controllers/生产管理/生产任务单/Sc_ICMOBillController.cs | 4
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs | 11
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs | 5
Model/生产管理/模具管理/ClsSc_MouldMaintainPlanBillMain.cs | 2
Model/生产管理/模具管理/ClsSc_MouldMaintainRuleBillMain.cs | 4
WebAPI/Controllers/Sc_ProcessMangementController.cs | 35 +++
WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs | 2
DAL/生产管理/模具管理/ClsSc_MouldMaintainPlanBill.cs | 8
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 24 +-
WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs | 57 +++++++
26 files changed, 384 insertions(+), 69 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index c4a8d5e..6ff8ba7 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -57,7 +57,8 @@
",HEndDate='" + omodel.HEndDate + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
- ",HMouldMaintainRuleInterID="+omodel.HMouldMaintainRuleInterID.ToString()+
+ ",HMouldMaintainRuleInterID=" + omodel.HMouldMaintainRuleInterID.ToString() +
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
//",HDeptID=" + omodel.HDeptID.ToString() +
//",HDeptNumber='" + omodel.HDeptNumber +"'"+
//",HEmpID=" + omodel.HEmpID.ToString() +
@@ -146,13 +147,13 @@
",HYear,HPeriod,HRemark" +
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
",HEndDate"+
- ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
",'" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() + "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
",'" + omodel.HEndDate + "'"+
- ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString()+
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
") ");
if (DetailCol.Count > 0)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
index b8529c8..ab762e5 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBill.cs"
@@ -64,7 +64,7 @@
",HEndDate='" + omodel.HEndDate + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
-
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -143,12 +143,12 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HCycleUnit,HCheckCycle,HBeginDate,HEndDate"+
- ",HInnerBillNo,HExplanation,HMouldMaintainRuleID" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleID,HMaintainLevID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "'" +
- ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" + "','" + omodel.HMouldMaintainRuleID + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID +
") ");
//鎻掑叆瀛愯〃閰嶄欢淇℃伅
foreach (Model.ClsSc_MouldMaintainPlanBillSub oSub in DetailColl)
@@ -180,7 +180,7 @@
",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
"," + Item.HManagerID.ToString() +
",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
- "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +"," + Item.HMaintainItem.ToString() +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +",'" + Item.HMaintainItem.ToString() + "'" +
") ");
}
//
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBill.cs"
index 85324c8..68f796f 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBill.cs"
@@ -56,6 +56,7 @@
",HCheckCycle=" + omodel.HCheckCycle.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
//DeleteRelation(ref sReturn, lngBillKey);
@@ -116,11 +117,11 @@
oCn.RunProc("Insert Into Sc_MouldMaintainRuleBillMain" +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo" +
+ ",HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo,HMaintainLevID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ",'" + omodel.HCycleUnit + "'," + omodel.HCheckCycle.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID +
") ");
////鎻掑叆瀛愯〃
foreach (Model.ClsSc_MouldMaintainRuleBillSub oSub in DetailColl_Mater)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
index 3f86948..c16e3e8 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
@@ -69,7 +69,8 @@
",HPlanNo='" + omodel.HPlanNo + "'" +
",HExplanation='" + omodel.HExplanation+"'" +
",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
- ",HEquipMaintainRuleInterID="+omodel.HEquipMaintainRuleInterID.ToString()+
+ ",HEquipMaintainRuleInterID=" + omodel.HEquipMaintainRuleInterID.ToString()+
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -173,11 +174,11 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
- ",HDeptID" +
+ ",HDeptID,HMaintainLevID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
- ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID +
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID +
") ");
//鎻掑叆閰嶄欢瀛愯〃
foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
index b4c6d51..9d2cbcf 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBill.cs"
@@ -55,6 +55,7 @@
",HCheckCycle=" + omodel.HCheckCycle.ToString() +
",HExplanation='" + omodel.HExplanation+"'" +
",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -121,11 +122,11 @@
oCn.RunProc("Insert Into Sb_EquipMaintainPlanBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
- ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldMaintainRuleID" +
+ ",HBeginDate,HEndDate,HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMouldMaintainRuleID,HMaintainLevID" +
") "+
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
- ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'" +
+ ",'" + omodel.HBeginDate +"','" +omodel.HEndDate + "'," + omodel.HCheckCycle.ToString() +",'"+ omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +"','" + omodel.HMouldMaintainRuleID + "'," + omodel.HMaintainLevID +
") ");
if (DetailColl != null)
{
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
index c5e6d1b..e8ba53a 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBillMain.cs"
@@ -15,5 +15,7 @@
public string HExplanation;// --摘要
public string HInnerBillNo;// --内部单据号
public int HMouldMaintainRuleInterID;
+
+ public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
index 3bcc61c..d7a0aeb 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainPlanBillMain.cs"
@@ -15,5 +15,7 @@
public string HExplanation;// varchar(500) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
public int HMouldMaintainRuleID; //器具保养规程id
+
+ public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillMain.cs"
index 4863c3c..ab8e819 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillMain.cs"
@@ -10,7 +10,7 @@
public Int64 HCheckCycle;// int --保养周期
public string HExplanation;// varchar(500) --摘要
public string HInnerBillNo;// varchar(50) --内部单据号
-
-
+
+ public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
index 50fc8c8..1edef06 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
@@ -17,5 +17,7 @@
public int HEquipMaintainPlanInterID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）主内码
public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码
+
+ public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBillMain.cs"
index c380854..b290e3c 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainPlanBillMain.cs"
@@ -14,7 +14,7 @@
public string HExplanation;
public string HInnerBillNo;
public int HMouldMaintainRuleID; //保养规程id
-
-
+
+ public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
}
}
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 57b9a60..b08fb0f 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -685,6 +685,21 @@
//鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID+ " and HInterID=" + HInterID);
+
+ ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
+left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
+where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
+group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
+
+ if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0) {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.Commit();
objJsonResult.code = "1";
@@ -1502,9 +1517,28 @@
// }
oCN.RunProc("update Gy_BarCodeBill set HStatus='' where HBarCode='" + model.HBarCode + "'");
+
+ DataSet dataSet = oCN.RunProcReturn($"select top 1 HInterID from Sc_StationOutBillMain where HProcExchInterID={subLsit[0].HProcExchInterID} and HProcExchEntryID={subLsit[0].HProcExchEntryID} and HBadCount>0", "Sc_StationOutBillMain");
+
+ if (dataSet.Tables[0].Rows.Count > 0)
+ {
+ string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString();
+
+ oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'");
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触,褰撳墠娴佽浆鍗″綋鍓嶅伐搴忕殑鍑虹珯鍗曟病鏈変笉鑹暟閲�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
else {
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "淇濆瓨澶辫触,鏃犵粨鏋滐紒";
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
index 1139f2f..fac9297 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -214,7 +214,7 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from Sc_MouldMaintainRuleBillMain where HInterID= " + HID + " ", "Sc_MouldMaintainRuleBillMain");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainRuleBill_Edit where HInterID= " + HID + " ", "h_v_Sc_MouldMaintainRuleBill_Edit");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ櫒鍏蜂繚鍏昏绋嬭褰�" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index 6346119..3506549 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -49,22 +49,12 @@
ds = oCN.RunProcReturn(sql, "h_v_Gy_EquipFileMainList");
}
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -104,8 +94,18 @@
return objJsonResult;
}
DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HInterID=" + HItemID, "Gy_EquipFileBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
{
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
index 23b262c..8470eb3 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipTypeController.cs
@@ -37,24 +37,14 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
- ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");
+ ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag,HMakeEmp,HMakeTime,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HCloseEmp,HCloseTime from Gy_EquipFileType where 1=1 " + sWhere+ " order by HItemID ", "Gy_EquipFileType");
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception ex)
{
@@ -94,8 +84,18 @@
return objJsonResult;
}
DLL.ClsGy_EquipTypeBill oBill = new DLL.ClsGy_EquipTypeBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ ds = oCN.RunProcReturn("select * from Gy_EquipFileType where HItemID=" + HItemID, "Gy_EquipFileType");
+ if (ds.Tables[0].Rows.Count > 0)
{
+ if (ds.Tables[0].Rows[0]["HCloseEmp"].ToString() != "" || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
oCN.RunProc("Delete From Gy_EquipFileType where HItemID=" + lngBillKey);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -174,9 +174,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_EquipFileType " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HMakeEmp) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
- "," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate(),'" + msg4 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_EquipFileType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
@@ -269,6 +269,8 @@
",HShortNumber='" + HShortNumber + "'" +
",HHelpCode='" + HHelpCode + "'" +
",HParentID=" + HParentID +
+ ",HModifyTime=getdate()" +
+ ",HModifyEmp='" + msg4 + "'" +
",HStopflag='" + HStopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
index 8c58423..5edf029 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipBeginBillController.cs
@@ -738,7 +738,62 @@
}
#endregion
-
+ #region 璁惧寮�鏈哄崟鍒楄〃PDA 鏌ヨ
+ [Route("Sb_EquipBeginBill/锘縎b_EquipBeginBillList_PDA")]
+ [HttpGet]
+ public object Sb_EquipBeginBillList_PDA(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipBeginBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipBeginBillList_PDA order by 鍗曟嵁鍙� desc", "锘縣_v_Sb_EquipBeginBillList_PDA");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipBeginBillList_PDA where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Sb_EquipBeginBillList_PDA");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ 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/SBGL/Sb_EquipDotCheckRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
index 4144b8a..6c2ae4d 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
@@ -110,9 +110,10 @@
return objJsonResult;
}
DLL.ClsSb_EquipDotCheckRuleBill oBill = new DLL.ClsSb_EquipDotCheckRuleBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ ds = oCN.RunProcReturn("select * from Sb_EquipDotCheckRuleBillMain where HInterID=" + HInterID, "Sb_EquipDotCheckRuleBillMain");
+ if (ds.Tables[0].Rows.Count>0)
{
- if (oBill.omodel.HBillStatus > 1)
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
index 6455b57..e3b5316 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -1,4 +1,5 @@
锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -26,6 +27,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainPlanBillList", 1, false, user))
{
objJsonResult.code = "0";
@@ -46,11 +48,19 @@
ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan");
}
-
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
}
catch (Exception ex)
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
index 7449da9..d3f3486 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -99,9 +99,10 @@
return objJsonResult;
}
DLL.ClsSb_EquipMaintainRuleBill oBill = new DLL.ClsSb_EquipMaintainRuleBill();
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ ds = oCN.RunProcReturn("select * from Sb_EquipMaintainRuleBillMain where HItemID=" + HInterID, "Sb_EquipMaintainRuleBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
{
- if (oBill.omodel.HBillStatus > 1)
+ if (int.Parse(ds.Tables[0].Rows[0]["HBillStatus"].ToString()) > 1)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -109,7 +110,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null)
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -200,9 +201,9 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from Sb_EquipMaintainRuleBillMain where HInterID= " + HID + " ", "Sb_EquipMaintainRuleBillMain");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipMaintainRuleBillList where HInterID= " + HID + " ", "h_v_Sb_EquipMaintainRuleBillList");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁″垝琛�" };
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏昏绋嬭〃" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
index 40890cf..9b7e312 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipStopBillController.cs
@@ -738,7 +738,62 @@
}
#endregion
-
+ #region 璁惧鍋滄満鍗曞垪琛≒DA 鏌ヨ
+ [Route("Sb_EquipStopBill/Sb_EquipStopBillList_PDA")]
+ [HttpGet]
+ public object Sb_EquipStopBillList_PDA(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipStopBillMain_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipStopBillList_PDA order by 鍗曟嵁鍙� desc", "锘縣_v_Sb_EquipStopBillList_PDA");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipStopBillList_PDA where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "锘縣_v_Sb_EquipStopBillList_PDA");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ 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/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
index 4884c4b..49ee536 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_Cg_PODemandPlanBillController.cs"
@@ -7,6 +7,7 @@
using System.Web.Http;
using WebAPI.Models;
using Newtonsoft.Json;
+using DBUtility;
namespace WebAPI.Controllers.SCGL
{
@@ -18,6 +19,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
JIT_Cg_PODemandPlanBillMain omdelMian = new JIT_Cg_PODemandPlanBillMain();
List<JIT_Cg_PODemandPlanBillSub> omodelsub = new List<JIT_Cg_PODemandPlanBillSub>();
+ public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill();
#region 鎻愭枡璁″垝鍗� 鍒楄〃
[Route("JIT_Cg_PODemandPlanBill/JIT_Cg_PODemandPlanBillList")]
@@ -260,6 +262,117 @@
}
#endregion
+ #region 鎻愭枡璁″垝鍗� 瀹℃牳/鍙嶅鏍稿姛鑳�
+ [Route("JIT_Cg_PODemandPlanBill/CheckPODemandPlanBillList")]
+ [HttpGet]
+ public object CheckPODemandPlanBillList(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻愭枡璁″垝鍗曟棤鏉冮檺瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "JIT_Cg_PODemandPlanBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶉渶瑕佸啀瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插弽瀹℃牳!涓嶉渶瑕佸啀鍙嶅鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (BillOld.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鎻愭枡璁″垝鍗� 鍏抽棴
[Route("JIT_Cg_PODemandPlanBill/ClosePODemandPlanBillList")]
[HttpGet]
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index ac64f22..11769da 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -425,6 +425,7 @@
{
try
{
+ List<object> columnNameList = new List<object>();
if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainPlanBillList", 1, false, user))
{
objJsonResult.code = "0";
@@ -436,12 +437,21 @@
ds = Sc_MouldMaintainPlanBillList_s(sWhere);
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
//if (ds.Tables[0].Rows.Count != 0 || ds != null)
//{
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
//}
//else
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 4756625..8efb342 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -482,6 +482,8 @@
{
try
{
+ LogService.Write("鐢熶骇姹囨姤鍗曡繘鍏ュ悓姝ユ柟娉曪紝姹囨姤鍗曞彿锛�" + BillNo);
+
string sErr = "";
oSystemParameter.ShowBill(ref sErr);
@@ -495,6 +497,7 @@
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
if (ds.Tables[0].Rows.Count <= 0)
{
+ LogService.Write("鐢熶骇姹囨姤鍗曞洖婊氾紝姹囨姤鍗曞彿锛�" + BillNo + " 鍘熷洜锛氱敓鎴愮敓浜ф眹鎶ュ崟杩囩▼涓病鏈夋煡璇㈠埌鍑虹珯鍗�");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鐢熸垚鐢熶骇姹囨姤鍗曡繃绋嬩腑娌℃湁鏌ヨ鍒板嚭绔欏崟";
@@ -505,9 +508,10 @@
//淇濆瓨
oCN.BeginTran();
- DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
+ DataSet DsTable = oCN.RunProcReturn($"select * from Sc_ICMOReportBillMain with(nolock) where HBillNo='{HBillNo}'", "Sc_ICMOReportBillMain");
if (DsTable.Tables[0].Rows.Count > 0)
{
+ LogService.Write("鐢熶骇姹囨姤鍗曞洖婊氾紝姹囨姤鍗曞彿锛�" + BillNo + " 鍘熷洜锛氬凡鍏ュ簱,璇蜂笉瑕侀噸澶嶅叆搴�");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "宸插叆搴�,璇蜂笉瑕侀噸澶嶅叆搴�";
@@ -550,6 +554,7 @@
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
+ LogService.Write("鐢熶骇姹囨姤鍗曞洖婊氾紝姹囨姤鍗曞彿锛�" + BillNo + " 鍘熷洜锛氭搷浣滃け璐�,閲戣澏璐﹀彿鐧诲綍寮傚父");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
@@ -643,6 +648,7 @@
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
LogService.Write("宸ュ簭姹囨姤鍗曞叆搴撻敊璇痡sonRoot:" + jsonRoot);
+ LogService.Write("鐢熶骇姹囨姤鍗曚繚瀛樺け璐ワ紝姹囨姤鍗曞彿锛�" + BillNo + " 鍘熷洜锛�" + result);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -663,10 +669,11 @@
result2 = InvokeHelper.Audit("PRD_MORPT", JsonConvert.SerializeObject(json));//鎻愪氦
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
+ LogService.Write("鐢熶骇姹囨姤鍗曟彁浜ゅけ璐ワ紝姹囨姤鍗曞彿锛�" + BillNo + " 鍘熷洜锛�" + result1);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ objJsonResult.Message = $"鐢熶骇姹囨姤鍗曞崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result1;
objJsonResult.data = null;
return objJsonResult;
}
@@ -674,6 +681,9 @@
oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
oCN.Commit();
+
+ LogService.Write("鐢熶骇姹囨姤鍗曚繚瀛樻垚鍔燂紝姹囨姤鍗曞彿锛�" + BillNo );
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -682,6 +692,7 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熶骇姹囨姤鍗曞悓姝ュ彂鐢熷紓甯革紝姹囨姤鍗曞彿锛�" + BillNo + " " + e.ToString());
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -768,6 +779,7 @@
{
try
{
+ LogService.Write("鐢熶骇鍏ュ簱鍗曡繘鍏ュ悓姝ユ柟娉�:" + " 鍏ュ簱鍗曞彿锛�" + BillNo);
//鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
Int64 HInterID = DBUtility.ClsPub.CreateBillID("1202", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode("1202", ref DBUtility.ClsPub.sExeReturnInfo, true);
@@ -778,10 +790,11 @@
//DataRow dr = ds.Tables[0].Rows[0];
//鍒ゆ柇鍏ュ簱鐨勫悎鏍兼暟閲忔槸鍚︿负0
- var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
+ var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain with(nolock) where HBillNo='" + BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氬悎鏍兼暟閲忎负0,涓嶉渶瑕佸叆搴擄紒");
objJsonResult.code = "1";
objJsonResult.count = 2;
objJsonResult.Message = "鍚堟牸鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
@@ -827,6 +840,7 @@
var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
if (isSuccess == 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氭搷浣滃け璐�,閲戣澏璐﹀彿鐧诲綍寮傚父");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
@@ -839,6 +853,7 @@
if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氭湭鎵惧埌瀵瑰簲鐨勬湰鍦版垨閲戣澏浜戠敓浜ф眹鎶ュ崟璁板綍;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鏈壘鍒板搴旂殑鏈湴鎴栭噾铦朵簯鐢熶骇姹囨姤鍗曡褰�;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒";
@@ -849,6 +864,7 @@
DataRow dr1 = ds1.Tables[0].Rows[0];
if (double.Parse(dr1[0].ToString()) <= 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氭湭鎵惧埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟璁板綍;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鏈壘鍒板搴旂殑鐢熶骇姹囨姤鍗曡褰�;1.鏈煡璇㈠埌瀵瑰簲鐨勭敓浜ф眹鎶ュ崟锛�2.璇风‘淇濆綋鍓嶅伐搴忔槸鏈亾宸ュ簭3.姹囨姤鍗曞搴旂殑鍏ュ簱鏁伴噺宸叉弧 璇峰湪閲戣澏浜戞煡鐪嬪叆搴撹褰曪紒";
@@ -868,6 +884,7 @@
if (ds.Tables[0].Rows.Count > 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氬綋鍓嶅嚭绔欏崟鍙峰凡鍏ュ簱,璇蜂笉瑕侀噸鏂板叆搴�!");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "褰撳墠鍑虹珯鍗曞彿宸插叆搴�,璇蜂笉瑕侀噸鏂板叆搴�!";
@@ -876,7 +893,7 @@
}
//鍒ゆ柇閲戣澏浜戠敓浜ф眹鎶ュ崟 鏁伴噺 鏄惁 澶т簬 鏈亾鍑虹珯鏁伴噺
- ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain where HBillNo='{BillNo}')
+ ds = oCN.RunProcReturn($@"select sum(FFinishQty)-sum(FSTOCKINQUASELQTY)-(select HQty from Sc_StationOutBillMain with(nolock) where HBillNo='{BillNo}')
from AIS20220308151944..T_PRD_MORPT rpt3
left join AIS20220308151944..T_PRD_MORPTENTRY rpt2 on rpt3.FID = rpt2.FID
left join AIS20220308151944..T_PRD_MORPTENTRY_A rpt1 on rpt2.FID = rpt1.FID
@@ -884,6 +901,7 @@
if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氶噾铦朵簯姹囨姤鏁伴噺灏忎簬鏈湴鍑虹珯鏁伴噺!");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "閲戣澏浜戞眹鎶ユ暟閲忓皬浜庢湰鍦板嚭绔欐暟閲�!";
@@ -896,6 +914,7 @@
{
if (item["HWYID"].ToString() == null || item["HWYID"].ToString() == "" || item["HWYID"].ToString() == "undefined")
{
+ LogService.Write("鍚屾閲戣澏鐢熶骇鍏ュ簱鍗曞洖婊�--鍑虹珯鍗曞彿锛�" + BillNo + " 鍥炴粴鍘熷洜锛氬敮涓�ID涓虹┖锛岃閲嶆柊鎵嬪姩鍏ュ簱鎴栬仈绯荤鐞嗗憳锛�");
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍞竴ID涓虹┖锛岃閲嶆柊鎵嬪姩鍏ュ簱鎴栬仈绯荤鐞嗗憳锛�";
@@ -1045,8 +1064,8 @@
string result = InvokeHelper.Save("PRD_INSTOCK", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
//鍒ゆ柇淇濆瓨鏄惁鎴愬姛
if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
- {
- LogService.Write("鐢熶骇鍏ュ簱閿欒jsonRoot:" + jsonRoot);
+ {
+ LogService.Write("鐢熶骇鍏ュ簱淇濆瓨閿欒jsonRoot:" + jsonRoot + " 鍏ュ簱鍗曞彿锛�" + BillNo);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1067,6 +1086,7 @@
//result2 = InvokeHelper.Audit("PRD_INSTOCK", JsonConvert.SerializeObject(json));//鎻愪氦
if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
+ LogService.Write("鐢熶骇鍏ュ簱鎻愪氦閿欒jsonRoot:" + jsonRoot + " 鍏ュ簱鍗曞彿锛�" + BillNo);
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -1076,7 +1096,7 @@
}
oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
-
+ LogService.Write("鐢熶骇鍏ュ簱鍚屾鎴愬姛:" + " 鍏ュ簱鍗曞彿锛�" + BillNo);
oCN.Commit();
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -1086,6 +1106,7 @@
}
catch (Exception e)
{
+ LogService.Write("鐢熶骇鍏ュ簱鍚屾鍙戠敓寮傚父:" + " 鍏ュ簱鍗曞彿锛�" + BillNo + " " + e.ToString());
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index b0419ce..ad05fa7 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -12757,7 +12757,7 @@
ds = oCn.RunProcReturn(sql, "Gy_MenuDefineSet"); //鏌ヨ褰撳墠鐢ㄦ埛鐨勮嚜瀹氫箟鑿滃崟鏁版嵁
if (ds.Tables[0]==null || ds.Tables[0].Rows.Count == 0) //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夎缃繃鑷畾涔変俊鎭紝鑻ヨ褰曟暟涓�0锛屽垯娌℃湁璁剧疆杩囷紝鍔犺浇鎵�鏈夌殑鑿滃崟淇℃伅
{
- sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition ";
+ sql = "Select * from Gy_Menu_1 where HType = '" + HType + "' Order by HPosition,len(HitemID),HitemID ";
ds = oCn.RunProcReturn(sql, "Gy_Menu");
}
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
index 123c422..44abd3c 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillController.cs"
@@ -327,12 +327,12 @@
//涓昏〃
oCN.RunProc(@"Insert Into Sc_ICMOBillMain
(HBillType,HInterID,HBillNo,HDate,HPRDORGID
- ,HYear,HPeriod,HRemark,HMaker,HMakeDate
+ ,HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate
,HSeOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HEmpID,HCusID
,HCenterID,HPlanQty,HDeptID,HMaterID,HUnitID,HBomID,HPlanBeginDate,HPlanEndDate,HBillStatus
,HOWNERID,HOWNERTYPEID)
values('3710'," + mainList[0].HInterID + ",'" + mainList[0].HBillNo + "','" + mainList[0].HDate + "'," + mainList[0].HPRDORGID +
- "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate()" +
+ "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + mainList[0].HRemark + "','" + mainList[0].HMaker + "',getdate(),'" + mainList[0].HMaker + "',getdate()" +
",'" + mainList[0].HSeOrderBillNo + "'," + mainList[0].HSeOrderInterID + "," + mainList[0].HSeOrderEntryID + "," + mainList[0].HEmpID + "," + mainList[0].HCusID +
"," + mainList[0].HCenterID + "," + mainList[0].HPlanQty + ",0,0,0,0,'','',2" +
","+ mainList[0].HOWNERID + ",'"+ mainList[0].HOWNERTYPEID + "') ");
diff --git a/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs b/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
index 8bc97a1..d853dd2 100644
--- a/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
+++ b/WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
@@ -55,6 +55,7 @@
",HCheckCycle=" + omodel.HCheckCycle.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HMaintainLevID=" + omodel.HMaintainLevID +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -120,12 +121,12 @@
oCn.RunProc("Insert Into Sb_EquipMaintainRuleBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
- ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo" +
+ ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMaintainLevID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark +
- "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo +
- "') ");
+ "',"+ omodel.HCheckCycle.ToString() + ",'" + omodel.HCycleUnit + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HMaintainLevID +
+ ") ");
//鎻掑叆淇濆吇椤瑰瓙琛�
foreach (Models.ClsSb_EquipMaintainRuleBillSub_Item Item in DetailColl_Pay)
diff --git a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
index f729114..6421a88 100644
--- a/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
+++ b/WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
@@ -11,5 +11,7 @@
public int HCheckCycle; //--淇濆吇鍛ㄦ湡
public string HExplanation; // varchar(500) --鎽樿
public string HInnerBillNo; //varchar(50) --鍐呴儴鍗曟嵁鍙�
+
+ public Int64 HMaintainLevID; //淇濆吇绾у埆锛坓y_HMaintainLev锛�
}
}
\ No newline at end of file
--
Gitblit v1.9.1