From eb38ca9a6cd3fab7e857b0cc654f01a26d24f725 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 10 一月 2022 08:49:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 87 ++-
WebAPI/Controllers/仓存管理/条码库存/KF_ICInventoryList_WMSBillController.cs | 86 ++++
WebAPI/WebAPI.csproj.user | 4
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 5
WebAPI/Controllers/仓存管理/领料发货/apiController.cs | 6
Model/生产管理/模具管理/ClsSc_MouldMaintainBillMain.cs | 1
WebAPI/DLL/ClsWW_PPBomBill.cs | 139 ++++++
WarM/条码打印/Gy_BarCodeBill.cs | 40 +
WebAPI/Models/ClsWW_PPBomBillSub.cs | 28 +
WebAPI/Controllers/仓存管理/领料发货/Kf_StepFoldOutBillController.cs | 67 +++
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 6
WebAPI/Controllers/仓存管理/条码出入库记录/Kf_ICStockInOutBillController.cs | 96 ++++
WarM/条码打印/Gy_BarCodeBill.resx | 17
WebAPI/Models/ClsWW_PPBomBillMain.cs | 20 +
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs | 5
DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs | 5
WebAPI/Controllers/仓存管理/委外用料/WW_PPBomBillController.cs | 73 +++
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 19
WebAPI/Controllers/WebAPIController.cs | 161 ++++++++
WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs | 64 +++
WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs | 2
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 65 +++
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillMain.cs | 6
WarM/条码打印/Gy_BarCodeBill.designer.cs | 59 ++
WebAPI/Controllers/仓存管理/扫码异常记录/KF_PonderationBillController.cs | 70 +++
WebAPI/WebAPI.csproj | 13
Pub_Class/CustomerCls/ClsPub.cs | 32 +
27 files changed, 1,096 insertions(+), 80 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 5e0c1c2..c4a8d5e 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,7 @@
",HEndDate='" + omodel.HEndDate + "'" +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
-
+ ",HMouldMaintainRuleInterID="+omodel.HMouldMaintainRuleInterID.ToString()+
//",HDeptID=" + omodel.HDeptID.ToString() +
//",HDeptNumber='" + omodel.HDeptNumber +"'"+
//",HEmpID=" + omodel.HEmpID.ToString() +
@@ -146,13 +146,13 @@
",HYear,HPeriod,HRemark" +
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
",HEndDate"+
- ",HInnerBillNo,HExplanation" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID" +
") " +
" 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.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString()+
") ");
if (DetailCol.Count > 0)
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_EquipDotCheckBill.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_EquipDotCheckBill.cs"
index 2e4abe6..49077a5 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_EquipDotCheckBill.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_EquipDotCheckBill.cs"
@@ -54,6 +54,7 @@
",HPlanNo='" + omodel.HPlanNo + "'" +
",HExplanation='" + omodel.HExplanation+"'" +
",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
+ ",HEquipDotCheckRuleInterID="+omodel.HEquipDotCheckRuleInterID+
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -113,11 +114,11 @@
oCn.RunProc("Insert Into Sb_EquipDotCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
- ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo" +
+ ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipDotCheckRuleInterID" +
") "+
" 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.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipDotCheckRuleInterID.ToString()+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSb_EquipDotCheckBillSub 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_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 ac58894..ea7b0aa 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"
@@ -53,6 +53,7 @@
",HPlanNo='" + omodel.HPlanNo + "'" +
",HExplanation='" + omodel.HExplanation+"'" +
",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
+ ",HEquipMaintainRuleInterID="+omodel.HEquipMaintainRuleInterID.ToString()+
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -118,11 +119,11 @@
oCn.RunProc("Insert Into Sb_EquipMaintainBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
- ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo" +
+ ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
") "+
" 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.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString()+
") ");
//鎻掑叆閰嶄欢瀛愯〃
foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)
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 0176525..c5e6d1b 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"
@@ -14,5 +14,6 @@
public string HEndDate;// --保养结束日期
public string HExplanation;// --摘要
public string HInnerBillNo;// --内部单据号
+ public int HMouldMaintainRuleInterID;
}
}
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_EquipDotCheckBillMain.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_EquipDotCheckBillMain.cs"
index 4aa23a0..04f336a 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_EquipDotCheckBillMain.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_EquipDotCheckBillMain.cs"
@@ -13,6 +13,10 @@
public string HExplanation;
public string HInnerBillNo;
public Int64 HDeptID;
-
+ public int HEquipMaintainRuleInterID;
+ public int HEquipDotCheckRuleInterID;
+
+
+
}
}
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 2e6e249..e070588 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"
@@ -13,7 +13,8 @@
public string HExplanation;
public string HInnerBillNo;
public Int64 HDeptID;
-
-
+ public int HEquipMaintainRuleInterID;
+
+
}
}
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index c82b5ac..f87582c 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -399,7 +399,7 @@
case 0:
switch (Glida)
{
- case 0:
+ case 0://绾祦姘村彿
Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "'", "Gy_MaxNum");
if (Ds.Tables[0].Rows.Count != 0)
{
@@ -418,11 +418,31 @@
}
return sBillNo;
- case 1:
+ case 1://鏍规嵁 YY骞�+MM鏈� + 娴佹按鍙� 鐢熸垚鍗曟嵁鍙�
+ sKjYear = sKjYear.Substring(2, 2);
+ sPeriod = "0" + sPeriod;
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "";
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
+ if (Ds.Tables[0].Rows.Count != 0)
+ {
+ sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
+ sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + Ds.Tables[0].Rows[0]["NowNumBer"].ToString().Trim();
+ }
+ else //鎻掑叆鏂拌褰�
+ {
+ sStr = new string(c, CodeLen - 1);
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
+ sBillNo = Profix.Trim() + sKjYear + sPeriod + sDay + sStr + "1";
+ }
+ if (Add == true)
+ {
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
+ }
return sBillNo;
- case 2: //褰撳墠骞村綋鍓嶆湡闂� 鐢熸垚鍗曟嵁鍙�
- Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear=" + sKjYear + " and Period=" + sPeriod + " and Day=" + sDay, "Gy_MaxNum");
+ case 2: //鏍规嵁骞�+鏈�+鏃� 鐢熸垚鍗曟嵁鍙�
+ Ds = oCn.RunProcReturn("Select * from Gy_MaxNum where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'", "Gy_MaxNum");
if (Ds.Tables[0].Rows.Count != 0)
{
sStr = new string(c, CodeLen - (Ds.Tables[0].Rows[0]["NowNumBer"].ToString()).Length);
@@ -431,12 +451,12 @@
else //鎻掑叆鏂拌褰�
{
sStr = new string(c, CodeLen - 1);
- oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,Day,NowNumber) values('" + BillCode.Trim() + "'," + sKjYear + "," + sPeriod + "," + sDay + ",1)");
+ oCn.RunProc("insert into Gy_Maxnum(BillCode,Kjyear,Period,whcode,NowNumber) values('" + BillCode.Trim() + "','" + sKjYear + "','" + sPeriod + "','" + sDay + "',1)");
sBillNo = Profix.Trim() + sKjYear + ClsPub.isStrNull(("0" + sPeriod)).Substring(ClsPub.isStrNull(("0" + sPeriod)).Length - 2, 2) + ClsPub.isStrNull(("0" + sDay)).Substring(ClsPub.isStrNull(("0" + sDay)).Length - 2, 2) + sStr + 1;
}
if (Add == true)
{
- oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear=" + sKjYear + " and Period=" + sPeriod + " and Day=" + sDay);
+ oCn.RunProc("update Gy_Maxnum set NowNumBer=NowNumBer+1 where BillCode='" + BillCode.Trim() + "' and KjYear='" + sKjYear + "' and Period='" + sPeriod + "' and whcode='" + sDay + "'");
}
return sBillNo;
default:
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 5dfefdc..ebc3560 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"
@@ -266,6 +266,7 @@
{
this.Sub_SaveBill();
Display();
+
}
//閲嶇疆鎸夌航
@@ -797,8 +798,8 @@
}
else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
{
- //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+澶辨晥鏃ユ湡锛圷YMMDD锛�+娴佹按鍙�6浣�-
- sTMNumber = HMaterNumber + HBatchNo + sYear + sPeriod + sDay;
+ //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+娴佹按鍙�6浣�-
+ sTMNumber = HMaterNumber + HBatchNo ;
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
@@ -812,7 +813,7 @@
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- LSHlen = 4;
+ LSHlen = 5;
if (sTMNumber.Length != 16)
{
MessageBox.Show("鏉＄爜闀垮害涓嶅16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠ｇ爜5浣�:[" + HModelName + "] + 骞存湀鏃�5浣�:["+ HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:["+ HYasuoji + "]+00 ; ");
@@ -827,7 +828,7 @@
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- LSHlen = 4;
+ LSHlen = 5;
if (sTMNumber.Length != 18)
{
MessageBox.Show("鏉＄爜闀垮害涓嶅18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:["+ HMaterNumber.Replace(".", "") + "]+骞存湀鏃�5浣�:["+ HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];");
@@ -841,7 +842,7 @@
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
- LSHlen = 4;
+ LSHlen = 5;
}
//else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
//{
@@ -3208,5 +3209,34 @@
Thread.Sleep(1000);
}
}
+
+ //鐢熸垚澶栫鐮�
+ private void wxm_Click(object sender, EventArgs e)
+ {
+ //蹇呴』鏉＄爜鐢熸垚鎸夐挳鏄伆搴︽墠鍙互鐢熸垚绠辨潯鐮�
+ if(bc.Enabled != false)
+ {
+ MessageBox.Show("璇峰厛鐢熸垚鏉″舰鐮侊紝鍐嶇敓鎴愮鏉＄爜");
+ return;
+ }
+ //-------------------鏍规嵁HINTERID鐢熸垚绠辨潯鐮�
+
+ //鐢熸垚鍓嶅垽鏂紝寰幆鐗╂枡缃戞牸锛屽垽鏂� 鏄惁璁剧疆浜嗗悎鐞嗙殑 澶栫鏁伴噺銆� 澶栫鏁伴噺 蹇呴』鏄� 鏈�灏忓寘瑁呮暟鐨� 鍊嶆暟 骞跺繀椤诲ぇ浜�0鍜屽ぇ浜庣瓑浜庢渶灏忓寘瑁呮暟閲忋��
+
+
+
+ //浠�0琛岃繘琛屽惊鐜� 鐗╂枡缃戞牸锛岃幏鍙栧绠辨暟閲�
+
+ //瀛愬惊鐜� 鏉＄爜缃戞牸
+
+ //鏍规嵁澶栫鏁伴噺 鎵ｅ噺锛岀洿鍒� 澶栫鏁伴噺鎵ｅ噺瀹岋紝鐢熸垚 澶栫鏉＄爜鍜岀粍鎵樺崟
+
+
+ //缁撴潫寰幆
+
+ //鍒锋柊鎵撳嵃椤电锛�-S 鐨� 铏氭嫙鏉＄爜涓嶆樉绀� 锛�
+
+
+ }
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index 3a12b1c..9a89e5e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -32,6 +32,7 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill));
this.Tool = new System.Windows.Forms.ToolStrip();
this.dy = new System.Windows.Forms.ToolStripButton();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
this.yl = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
@@ -106,7 +107,9 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.sdy = new System.Windows.Forms.ToolStripButton();
+ this.wxm = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -139,6 +142,9 @@
this.DelRow,
this.toolStripSeparator4,
this.bc,
+ this.toolStripSeparator8,
+ this.wxm,
+ this.toolStripSeparator9,
this.cz,
this.toolStripSeparator5,
this.kc,
@@ -176,6 +182,20 @@
this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.dy.Click += new System.EventHandler(this.dy_Click);
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Click += new System.EventHandler(this.sdy_Click);
//
// yl
//
@@ -1037,19 +1057,29 @@
this.grdList.Size = new System.Drawing.Size(1241, 347);
this.grdList.TabIndex = 46;
//
- // sdy
+ // wxm
//
- this.sdy.AutoSize = false;
- this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
- this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.sdy.Name = "sdy";
- this.sdy.Size = new System.Drawing.Size(35, 47);
- this.sdy.Text = "娴忚";
- this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sdy.Click += new System.EventHandler(this.sdy_Click);
+ this.wxm.AutoSize = false;
+ this.wxm.Image = ((System.Drawing.Image)(resources.GetObject("wxm.Image")));
+ this.wxm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.wxm.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.wxm.Name = "wxm";
+ this.wxm.Size = new System.Drawing.Size(50, 47);
+ this.wxm.Text = "澶栫鐮�";
+ this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.wxm.Click += new System.EventHandler(this.wxm_Click);
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
//
// Gy_BarCodeBill
//
@@ -1176,5 +1206,8 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
private System.Windows.Forms.ToolStripButton BatchNo;
private System.Windows.Forms.ToolStripButton sdy;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton wxm;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
index b1f4011..804bb7a 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.resx"
@@ -440,6 +440,21 @@
SUVORK5CYII=
</value>
</data>
+ <data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
<data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -573,6 +588,6 @@
<value>93, 17</value>
</metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>42</value>
+ <value>25</value>
</metadata>
</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
new file mode 100644
index 0000000..b5de632
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
@@ -0,0 +1,64 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_RoutingGroupController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 宸ヨ壓璺嚎澶х被鍒楄〃鏌ヨ
+ [Route("Gy_RoutingGroup/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where 1=1", "Gy_RoutingGroup");
+ }
+ else
+ {
+ string sql = "select * from Gy_RoutingGroup where 1 = 1 " + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_RoutingGroup");
+ }
+ 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 = "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
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 19632c0..94b4e01 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -104,6 +104,9 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
+
+ int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
+ int OperationType = int.Parse(sArray[3].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
try
{
msg2 = "[" + msg2.ToString() + "]";
@@ -112,7 +115,7 @@
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
DateTime HDate = mainList[0].HDate;//鏃ユ湡
- int HYear = 2021;
+ int HYear = DateTime.Now.Year;
double HPeriod = 1;
string HRemark = mainList[0].HRemark;//澶囨敞
string HMaker = mainList[0].HMaker;//鍒跺崟浜�
@@ -136,23 +139,39 @@
double HDelSourceRate = mainList[0].HDelSourceRate;//鍑忚祫婧愬噺閲�
int HPRDORGID = mainList[0].HPRDORGID; //缁勭粐
- //涓昏〃
- oCN.RunProc("Insert Into Gy_RoutingBillMain " +
- "(HBillType,HInterID,HBillNo,HDate" +
- ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
- ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
- ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
- ",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
- ") " +
- " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
- "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
- "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
- "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
- "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
- ") ");
+ if (OperationType == 1)//鏂板
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_RoutingBillMain " +
+ "(HBillType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
+ ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
+ ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
+ ",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
+ ") " + " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
+ "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
+ "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
+ "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
+ ") ");
+ }
+ else if (OperationType == 3)
+ { //淇敼
+ oCN.RunProc("update Gy_RoutingBillMain set " +
+ "HDate='" + HDate +
+ "',HYear='" + HYear + "',HPeriod='" + HPeriod + "',HRemark='" + HRemark + "',HMaker='" + HMaker +
+ "',Hmakedate=getdate(),HMaterID='" + HMaterID + "',HName='" + HName + "',HMaterTypeID='" + HMaterTypeID +
+ "',HRoutingGroupID='" + HRoutingGroupID + "',HUnitID='" + HUnitID + "',HMaterNumber='" + HMaterNumber + "',HUnitNumber='" + HUnitNumber +
+ "',HStandard='" + Convert.ToString(HStandard ? 1 : 0) + "',HMainGroupID='" + HMainGroupID + "',HMainProcID='" + HMainProcID + "',HMainCenterID='" + HMainCenterID +
+ "',HMainTimeUnit='" + HMainTimeUnit + "',HMainUnitTime='" + HMainUnitTime + "',HMainWorkQty='" + HMainWorkQty + "',HMainPrice='" + HMainPrice +
+ "',HStdSourceQty='" + HStdSourceQty + "',HAddSourceRate='" + HAddSourceRate + "',HDelSourceRate='" + HDelSourceRate +
+ "' where HInterID='" + HInterID + "'");
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HEntryID='" + hentryid + "'");
+ }
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID);
+ objJsonResult = AddBillSub(msg3, HInterID, hentryid);
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -164,23 +183,28 @@
oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+
+ if (OperationType == 1)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒ゆ柇閲嶅宸ュ簭鍙峰け璐ワ紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.Message = "鍒ゆ柇閲嶅宸ュ簭鍙峰け璐ワ紒";
objJsonResult.data = null;
return objJsonResult;
+ }
+ else
+ {
+ if (ClsPub.isStrNull(ds.Tables[0].Rows[0][0]) == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
}
objJsonResult.code = "1";
@@ -199,9 +223,10 @@
}
}
- public json AddBillSub(string msg3,long HInterID) {
+ public json AddBillSub(string msg3, long HInterID, int hentryid)
+ {
List<Gy_RoutingBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
- for (int i=0;i< subList.ToArray().Length;i++)
+ for (int i = 0; i < subList.ToArray().Length; i++)
{
if (subList[i].HWorkQty <= 0)
{
@@ -265,7 +290,7 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
") values("
- + HInterID + "," + i + "," + subList[i].HProcID + "," + subList[i].HProcNo + "," + subList[i].HSupID + "," + Convert.ToString(subList[i].HSupFlag ? 1 : 0) + "" +
+ + HInterID + "," + (hentryid == -1 ? i : hentryid) + "," + subList[i].HProcID + ",'" + subList[i].HProcNo + "'," + subList[i].HSupID + "," + Convert.ToString(subList[i].HSupFlag ? 1 : 0) + "" +
"," + subList[i].HWorkQty + "," + HCenterID + ",'" + HTimeUnit + "'," + HUnitTime +
"," + HReadyTime + "," + HQueueTime + "," + HMoveTime +
",'" + HCloseMan + "'," + Convert.ToString(HCloseType ? 1 : 0) + ",'" + subList[i].HRemark + "','" + HProcType + "'," + Convert.ToString(HNextProcFlag ? 1 : 0) + "," + Convert.ToString(HFlowProc ? 1 : 0) +
@@ -276,7 +301,7 @@
",'" + HPackStd + "','" + HPack + "','" + HPutArea + "'," + HMyWorkDays + "," + HMyFixWorkDays + "," + subList[i].HPassRate +
") ");
}
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = null;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index b153a67..c452787 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -755,8 +755,15 @@
{
try
{
-
- ds = Sc_GetMoveStockBillList(sWhere);
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList");
+ }
+ else
+ {
+ string sql = "select * from h_v_IF_MoveStockBillList where 1=1 " + sWhere+ "order by 鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_MoveStockBillList");
+ }
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
objJsonResult.code = "0";
@@ -784,14 +791,6 @@
}
}
- #region sql璇彞
-
-
- public static DataSet Sc_GetMoveStockBillList(string sWhere)
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList");
- }
- #endregion
/// <summary>
/// 閿�鍞嚭搴撳崟鍒楄〃
/// </summary>
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 5b8605f..eec471f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2337,6 +2337,59 @@
return objjson;
}
}
+ /// <summary>
+ /// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMouldMaintainItemtemByMaintainRuleID")]
+ [HttpGet]
+ public object GetMouldMaintainItemtemByMaintainRuleID(int MouldMaintainRuleID)
+ {
+
+ if (MouldMaintainRuleID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鍣ㄥ叿淇濆吇瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=" + MouldMaintainRuleID);
+
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a
+ left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=" + MouldMaintainRuleID);
+ ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
/// <summary>
@@ -2431,6 +2484,59 @@
return objjson;
}
}
+ /// <summary>
+ /// 鏍规嵁璁惧淇濆吇瑙勭▼鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetMaintainItemtemByMaintainRuleID")]
+ [HttpGet]
+ public object GetMaintainItemtemByMaintainRuleID(int EquipProjectID)
+ {
+ if (EquipProjectID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧淇濆吇瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> list = new List<object>();
+ DataSet ds2;
+ DataSet ds1;
+ string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+ from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
+ left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+ left join Gy_Employee e on e.HItemID=t.HManagerID
+ where a.HInterID=" + EquipProjectID );
+ string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a
+ left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID
+ left join h_v_IF_Material m on b.HMaterID=m.HItemID
+ left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+ where a.HInterID=" + EquipProjectID);
+
+ ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+ ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+ list.Add(ds1.Tables[0]);
+ list.Add(ds2.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鏍规嵁璁惧鏄剧ず璁惧鐐规绋嬮」鐩�
@@ -2484,7 +2590,60 @@
return objjson;
}
}
-
+ /// <summary>
+ /// 鏍规嵁璁惧鐐规瑙勭▼鏄剧ず璁惧鐐规绋嬮」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetDotCheckRuleItemByDotCheckRuleID")]
+ [HttpGet]
+ public object GetDotCheckRuleItemByDotCheckRuleID(int HDotCheckRuleInterID)
+ {
+ if (HDotCheckRuleInterID <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "璁惧鐐规瑙勭▼鏈�夋嫨";
+ objjson.data = null;
+ return objjson;
+ }
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
+ left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
+ left join Gy_Employee e on e.HItemID=b.HManagerID
+ where a.HInterID=" + HDotCheckRuleInterID);
+ ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
/// <summary>
/// 鑾峰彇缁翠慨椤圭洰鍒楄〃
/// </summary>
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
new file mode 100644
index 0000000..14c7204
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
@@ -0,0 +1,73 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.濮斿鐢ㄦ枡
+{
+ public class WW_PPBomBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DLL.ClsWW_PPBomBill BillNew0 = new DLL.ClsWW_PPBomBill();
+ public DLL.ClsWW_PPBomBill BillOld0 = new DLL.ClsWW_PPBomBill();
+
+ #region 妯″叿閲囪喘鍏ュ簱鍗曞垪琛�
+
+ [Route("WW_PPBomBillController/Get_WW_PPBomBillList")]
+ [HttpGet]
+ public object Get_WW_PPBomBillList(string sWhere)
+ {
+ try
+ {
+ ds = WW_PPBomBillList(sWhere);
+ if (ds == null)
+ {
+ 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 ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet WW_PPBomBillList(string sWhere)
+ {
+ string sql1 = string.Format(@"select * from h_v_WW_PPBomBillList");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_WW_PPBomBillList");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_WW_PPBomBillList");
+ }
+ }
+
+ #endregion
+ }
+}
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225/KF_PonderationBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225/KF_PonderationBillController.cs"
new file mode 100644
index 0000000..01bbc3f
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225/KF_PonderationBillController.cs"
@@ -0,0 +1,70 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鎵爜寮傚父璁板綍
+{
+ public class KF_PonderationBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ #region 鎵爜寮傚父璁板綍鏌ヨ
+ [Route("KF_PonderationBill/PonderationBillList")]
+ [HttpGet]
+ public object PonderationBillList(string HbarCode)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_WMS_BarCodeStatusQuery '" + HbarCode + "'", "h_p_WMS_BarCodeStatusQuery");
+
+ 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)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
new file mode 100644
index 0000000..a43fdfd
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\207\272\345\205\245\345\272\223\350\256\260\345\275\225/Kf_ICStockInOutBillController.cs"
@@ -0,0 +1,96 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜鍑哄叆搴撹褰�
+{
+ public class Kf_ICStockInOutBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //瀛樺偍杩囩▼ 鏁版嵁 绫�
+ public class Data
+ {
+ public Data()
+ {
+ HStartDate = DateTime.Now.AddMonths(-1);
+ HEndDate = DateTime.Now;
+ BillType = "鍏ㄩ儴";
+ }
+ public DateTime HStartDate;//寮�濮嬫棩鏈�
+ public DateTime HEndDate;//缁撴潫鏃ユ湡
+ public string MaterialName;//鐗╂枡
+ public string sWH;//浠撳簱
+ public string sSP;//浠撲綅
+ public string sBatchNo;//鎵瑰彿
+ public string HBarCode;//鏉″舰鐮�
+ public string BillType;//鍗曟嵁绫诲瀷
+ public string BillNo;//鍗曟嵁鍙�
+ public string SeOrderBillNo;//(閿�鍞鍗曞彿)
+ }
+
+ #region 鍑哄叆搴撹褰曟煡璇�
+ [Route("Kf_ICStockInOutBill/StockInOutBillList")]
+ [HttpGet]
+ public object StockInOutBillList(string sWhere)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ var data = JsonConvert.DeserializeObject<Data>(sWhere);
+
+ ds = oCN.RunProcReturn("exec h_p_Kf_BarCodeOutInReport '" +
+ data.HStartDate + "','" + data.HEndDate + "','" + data.MaterialName + "','" + data.sWH + "','" + data.sSP + "','" + data.sBatchNo + "','" + data.HBarCode + "','" + data.BillType + "','" + data.BillNo + "','" + data.SeOrderBillNo
+ + "'", "h_p_Kf_BarCodeOutInReport");
+
+ 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)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs"
new file mode 100644
index 0000000..61e26de
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\345\272\223\345\255\230/KF_ICInventoryList_WMSBillController.cs"
@@ -0,0 +1,86 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.鏉＄爜搴撳瓨
+{
+ public class KF_ICInventoryList_WMSBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ #region 鏉＄爜搴撳瓨鏌ヨ鍒楄〃
+ [Route("KF_ICInventoryList_WMSBill/GetWMSBillList")]
+ [HttpGet]
+ public object GetWMSBillList(int page, int limit,string sWhere)
+ {
+ //page 椤垫暟
+ //limit 椤甸潰鏄剧ず鐨勮鏁�
+ //sWhere妯＄硦鏌ヨ 鏉′欢
+
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ //鍒嗛〉SQL璇彞
+ string sql = "select top "+limit+ " (select count(*) from h_v_KF_ICInventoryList_WMS) 鎬绘暟, * from (select row_number() over(order by HMaterID asc)" +
+ " as rownumber, * from h_v_KF_ICInventoryList_WMS) temp_row where rownumber >"+((page-1)*limit)+" ";
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql, "h_v_KF_ICInventoryList_WMS");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_KF_ICInventoryList_WMS");
+ }
+
+ //鑾峰彇琛ㄥご瀛楁鍚嶇О
+ 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)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count =int.Parse(ds.Tables[0].Rows[0]["鎬绘暟"].ToString());
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
new file mode 100644
index 0000000..4f6617d
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.璋冩嫧鐩樼偣
+{
+ public class Kf_MoveStockRequestBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region 璋冩嫧鍗曞垪琛�
+ [Route("Kf_MoveStockRequestBill/GetMoveStockRequestBillList")]
+ [HttpGet]
+ public object GetMoveStockRequestBillList(string sWhere)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺(鐣�)
+
+ string sql1 = string.Format("select * from h_v_IF_MoveStockRequestBillList_Litee where 1=1 ");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn(sql1 + " order by 鏃ユ湡 desc", "h_v_IF_MoveStockRequestBillList_Litee");
+ }
+ else
+ {
+ string sql = sql1 + sWhere ;
+ ds = oCn.RunProcReturn(sql, "h_v_IF_MoveStockRequestBillList_Litee");
+ }
+ 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 = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
new file mode 100644
index 0000000..22f70e4
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
@@ -0,0 +1,67 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.浠撳瓨绠＄悊.棰嗘枡鍙戣揣
+{
+ public class Kf_StepFoldOutBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
+ #region 鍒嗘寮忚皟鍑哄崟 鏌ヨ
+
+ [Route("Kf_StepFoldOutBill/GetStepFoldOutBillList")]
+ [HttpGet]
+ public object GetStepFoldOutBillList(string sWhere, string user, string Organization)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺(鐣�)
+
+ string sql1 = string.Format("select * from h_v_Kf_MoveStockStepOutBillList where (璋冨叆缁勭粐='" + Organization + "')");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn(sql1 + " order by 鏃ユ湡 desc", "h_v_Kf_MoveStockStepOutBillList");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + " order by 鏃ユ湡 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_Kf_MoveStockStepOutBillList");
+ }
+ 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 = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/apiController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/apiController.cs"
new file mode 100644
index 0000000..c71c79b
--- /dev/null
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/apiController.cs"
@@ -0,0 +1,6 @@
+锘縩amespace WebAPI.Controllers.浠撳瓨绠＄悊.棰嗘枡鍙戣揣
+{
+ public class apiController
+ {
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
index b1faa0d..34892ea 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
@@ -15,7 +15,7 @@
public DataSet ds = new DataSet();
public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- #region 濮斿鍔犲伐鍑哄簱鍗�
+ #region 鍒嗘寮忚皟鍏ュ崟 鏌ヨ
[Route("Kf_StepFoldinBill/GetStepFoldinBillList")]
[HttpGet]
diff --git a/WebAPI/DLL/ClsWW_PPBomBill.cs b/WebAPI/DLL/ClsWW_PPBomBill.cs
new file mode 100644
index 0000000..b0d2b75
--- /dev/null
+++ b/WebAPI/DLL/ClsWW_PPBomBill.cs
@@ -0,0 +1,139 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.DLL
+{
+ public class ClsWW_PPBomBill : DBUtility.ClsXt_BaseBill
+ {
+ public Models.ClsWW_PPBomBillMain omodel = new Models.ClsWW_PPBomBillMain();
+ public List<Models.ClsWW_PPBomBillSub> DetailColl = new List<Models.ClsWW_PPBomBillSub>();
+
+ public ClsWW_PPBomBill()
+ {
+ base.MvarItemKeySub = "WW_PPBomBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "WW_PPBomBillMain";
+ base.MvarReportTitle = "濮斿鐢ㄦ枡鍗�";
+ base.BillType = "1604";
+ base.HBillSubType = "1604";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsWW_PPBomBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ string sql = "Insert Into WW_PPBomBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HRemark,HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HDeptID,HMaterID,HUnitID,HQty,HType" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
+ ", '" + omodel.HRemark.ToString() + "','" + omodel.HMaker + "',getdate()" + /*omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" +*/
+ ","+ omodel.HDeptID.ToString() +","+ omodel.HMaterID.ToString() + ","+ omodel.HUnitID.ToString() +","+ omodel.HQty.ToString()+",'"+ omodel.HQty+
+ "') ";
+ //涓昏〃
+ oCn.RunProc(sql);
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsWW_PPBomBillSub oSub in DetailColl)
+ {
+
+ oCn.RunProc("Insert into WW_PPBomBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HMaterNumber,HUnitID,HUnitNumber,HQtyMust,HQty" +
+ ",HWHID,HQtyScrap,HSendDate,HSPID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber+ "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HQtyScrap.ToString() + ",'" + oSub.HSendDate + "'," + oSub.HSPID.ToString() +
+ ") ");
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate WW_PPBomBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HMaterID=" + omodel.HMaterID.ToString() +
+ ",HUnitID=" + omodel.HUnitID.ToString() +
+ ",HQty=" + omodel.HQty.ToString() +
+ ",HType=" + omodel.HType.ToString() +
+
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ foreach (Models.ClsWW_PPBomBillSub oSub in DetailColl)
+ {
+
+ oCn.RunProc("Insert into WW_PPBomBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaterID,HMaterNumber,HUnitID,HUnitNumber,HQtyMust,HQty" +
+ ",HWHID,HQtyScrap,HSendDate,HSPID" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HQtyScrap.ToString() + ",'" + oSub.HSendDate + "'," + oSub.HSPID.ToString() +
+ ") ");
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_PPBomBillMain.cs b/WebAPI/Models/ClsWW_PPBomBillMain.cs
new file mode 100644
index 0000000..71f712a
--- /dev/null
+++ b/WebAPI/Models/ClsWW_PPBomBillMain.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_PPBomBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public int HDeptID;// int --閮ㄩ棬
+ public int HICMOInterI;// D int
+ public int HSeOrderInterID;// int
+ public int HSeOrderEntryID;// int
+ public string HSeOrderBillNo;// varchar(50)
+ public int HMaterID;// int
+ public int HUnitID;// int
+ public int HQty;// dec(18,8)
+ public string HType;// varchar(10) 绫诲瀷(鍙兘鏄� 濮斿鍜岀敓浜�)
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsWW_PPBomBillSub.cs b/WebAPI/Models/ClsWW_PPBomBillSub.cs
new file mode 100644
index 0000000..e7a107e
--- /dev/null
+++ b/WebAPI/Models/ClsWW_PPBomBillSub.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class ClsWW_PPBomBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public int HMaterID;// int //鐗╂枡ID
+ public string HMaterNumber;//
+ public int HUnitID;// int //鍗曚綅ID
+ public string HUnitNumber;//
+ public float HQtyMust;//
+ public float HQty;// dec(18,8) --鏁伴噺
+ public int HWHID;// int --浠撳簱
+ public float HQtyScrap;// dec(18,8) --鎹熻�楃巼
+ public DateTime HSendDate;// datetime --鍙戞枡鏃ユ湡
+ public int HSPID;// int --浠撲綅
+ public int HBomInterID;// int --BOM
+ public int HICMOInterID;// int 浠诲姟鍗旾D
+ public string HICMOBillNo;// varchar(100) 浠诲姟鍗曞彿
+ public string HSeOrderBillNo;// varchar(50) //(閿�鍞鍗曞彿)
+ public int HSeOrderInterID;// int //(閿�鍞鍗曚富鍐呯爜)
+ public int HSeOrderEntryID;// int //(閿�鍞鍗曞瓙鍐呯爜)
+ public int HChangeTimes;// int //鍙樻洿娆℃暟
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0700d5d..f1c8dda 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -279,6 +279,7 @@
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
<Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_RoutingGroupController.cs" />
<Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
<Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -351,6 +352,12 @@
<Compile Include="Controllers\SCGL\Sc_ProductionReturnBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_PackUnionBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜搴撳瓨\KF_ICInventoryList_WMSBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\璋冩嫧鐩樼偣\Kf_MoveStockRequestBillController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\apiController.cs" />
+ <Compile Include="Controllers\浠撳瓨绠＄悊\棰嗘枡鍙戣揣\Kf_StepFoldOutBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
<Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_StockCheckItemBillController.cs" />
@@ -718,8 +725,14 @@
<Folder Include="App_Data\" />
<Folder Include="Views\Cg_PurchaseReturn\" />
<Folder Include="Views\Gy_EquipType\" />
+ <Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
+ <Folder Include="Views\Kf_ICStockInOutBill\" />
+ <Folder Include="Views\Kf_MoveStockRequestBill\" />
+ <Folder Include="Views\KF_PonderationBill\" />
<Folder Include="Views\kf_StepFoldinBill\" />
+ <Folder Include="Views\Kf_StepFoldOutBill\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\ProductionReturnBill\" />
<Folder Include="Views\QC_Management\" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index d152f2c..729b04f 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -19,8 +19,8 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<ProjectView>ProjectFiles</ProjectView>
- <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
- <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
+ <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
+ <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
--
Gitblit v1.9.1