From 72d1aaa4af401fe25e5f2f7ba07163d7fc8fe8e8 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 03 十二月 2025 10:30:48 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs | 801 ++++++++++++++++
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
WebAPI/WebAPI.csproj.user | 15
EAM/模具管理/模具仓库管理/Sc_MouldProdBackBill.cs | 6
EAM/模具管理/模具仓库管理/Sc_MouldProdOutBill.cs | 6
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillSub.cs | 74
WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs | 12
WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user | 498 ++++++++++
DAL/生产管理/模具管理/ClsSc_MouldProdMoveBill.cs | 105 +
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs | 801 ++++++++++++++++
DAL/车间管理/ClsSc_StationOutBill.cs | 4
WebAPI/Properties/PublishProfiles/YsjPath.pubxml | 17
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
WebAPI/Controllers/Sc_MouldController.cs | 4
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml | 2
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user | 170 +-
EAM/模具管理/模具仓库管理/单模管理/Sc_MouldProdOut_SingleBill.cs | 6
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 37
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 4
WebAPI/Controllers/WebAPIController.cs | 4
Model/生产管理/模具管理/ClsSc_MouldProdBackBillMain.cs | 25
WebAPI/Controllers/条码管理/MouldController.cs | 2
DAL/生产管理/模具管理/ClsSc_MouldProdBackBill.cs | 112 +
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillMain.cs | 31
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 3
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
EAM/模具管理/模具仓库管理/单模管理/Sc_MouldProdBack_SingleBill.cs | 6
WebAPI/WebAPI.csproj | 4
Model/生产管理/模具管理/ClsSc_MouldProdBackBillSub.cs | 86
35 files changed, 2,547 insertions(+), 288 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_MouldProdBackBill.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_MouldProdBackBill.cs"
index 70765e0..f142871 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_MouldProdBackBill.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_MouldProdBackBill.cs"
@@ -8,7 +8,7 @@
public class ClsSc_MouldProdBackBill:DBUtility.ClsXt_BaseBill
{
public Model.ClsSc_MouldProdBackBillMain omodel = new Model.ClsSc_MouldProdBackBillMain();
- public List<Model.ClsSc_MouldStockBillSub> DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ public List<Model.ClsSc_MouldProdBackBillSub> DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
public ClsSc_MouldProdBackBill()
{
@@ -30,7 +30,7 @@
DetailColl = null;
}
- #endregion 鑷畾涔夋柟娉�
+ #endregion
//淇濆瓨鍓嶆帶鍒�
public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 HSecManagerID, Int64 HKeeperID, Int64 HSupID, Int64 OperationType, ref string sReturn)
@@ -86,12 +86,43 @@
}
}
+ //鍒犻櫎鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3851") //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldInRequestToMouldProdBack_Del " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3851") //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldInRequestToMouldProdBack_Add " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(lngBillKey, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 2, ref sReturn))
@@ -109,8 +140,8 @@
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
//========================================
- ",HSupID=" + omodel.HSupID.ToString() +
",HSupTypeID=" + omodel.HSupTypeID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
",HSecManagerID=" + omodel.HSecManagerID.ToString() +
@@ -129,7 +160,7 @@
DeleteBillSub(lngBillKey);
//鎻掑叆瀛愯〃
omodel.HInterID = lngBillKey;
- foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
@@ -140,6 +171,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -149,8 +182,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
{
@@ -222,29 +259,32 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(omodel.HInterID, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 1, ref sReturn))
{
+ oCn.RollBack();
return false;
}
-
- oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HSupID,HSupTypeID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HWHID,HSCWHID,HRedBlueFlag" +
",HExplanation,HInnerBillNo,HStockOrgID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
", " + omodel.HSupID.ToString() + "," + omodel.HSupTypeID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
") ");
//鎻掑叆瀛愯〃
- foreach (Model.ClsSc_MouldStockBillSub oSub in DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
" (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
@@ -255,6 +295,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -264,8 +306,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
{
@@ -293,6 +339,7 @@
throw (e);
}
}
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
@@ -333,6 +380,7 @@
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
//========================================================
+ omodel.HSupTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupTypeID"]);
omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
@@ -344,16 +392,15 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
-
- //
-
+ omodel.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOrgID"]);
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Sc_MouldStockBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldStockBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
// 鍥哄畾璧嬪��===============================================
oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
@@ -362,8 +409,8 @@
oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
@@ -373,32 +420,47 @@
oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQtyRel = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyRel"]);
oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLifeQty"]);
+ oSub.HNewLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNewLifeQty"]);
oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
- oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
- oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
- oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
- oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
- //oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
- //oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
- //oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
- //oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
- //oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
- //oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
-
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HCorrespondentTypeID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentTypeID"]);
+ oSub.HCorrespondentID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HStockOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOtherOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOtherOrgID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEID"]);
oSub.HNewModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNewModel"]);
oSub.HWallThickness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWallThickness"]);
oSub.HHardness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHardness"]);
oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLastProdModel"]);
oSub.HDiameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDiameter"]);
oSub.HBackFlag = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBackFlag"]);
+ oSub.HMouldType = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldType"]);
+ oSub.HInitModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HInitModel"]);
+ oSub.HInitDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HInitDesignLife"]);
+ oSub.HLifeUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HLifeUnitID"]);
+ oSub.HNowModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNowModel"]);
+ oSub.HNowLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNowLife"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
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_MouldProdMoveBill.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_MouldProdMoveBill.cs"
index 2a26939..33d5872 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_MouldProdMoveBill.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_MouldProdMoveBill.cs"
@@ -30,7 +30,7 @@
DetailColl = null;
}
- #endregion 鑷畾涔夋柟娉�
+ #endregion
//淇濆瓨鍓嶆帶鍒�
public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 HSecManagerID, Int64 HKeeperID, Int64 HSupID, Int64 OperationType, ref string sReturn)
@@ -86,12 +86,43 @@
}
}
+ //鍒犻櫎鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3850") //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldMoveStockRequestToMouldProdMove_Del " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ try
+ {
+ if (DetailColl[0].HSourceBillType == "3850") //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ {
+ oCn.RunProc("exec h_p_Sc_UpDateRelation_MouldMoveStockRequestToMouldProdMove_Add " + lngBillKey.ToString());
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(lngBillKey, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 2, ref sReturn))
@@ -109,8 +140,8 @@
",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
",HUpDateDate=getdate()" +
//========================================
- ",HSupID=" + omodel.HSupID.ToString() +
",HSupTypeID=" + omodel.HSupTypeID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
",HSecManagerID=" + omodel.HSecManagerID.ToString() +
@@ -143,6 +174,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -152,8 +185,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
{
@@ -188,23 +225,26 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
+
+ oCn.BeginTran();
//淇濆瓨鍓嶆帶鍒�
if (!BeforeSave(omodel.HInterID, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 1, ref sReturn))
{
+ oCn.RollBack();
return false;
}
-
- oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HSupID,HSupTypeID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HWHID,HSCWHID,HRedBlueFlag" +
",HExplanation,HInnerBillNo,HStockOrgID,HStockStyle,HStockInOrgID,HStockOutOrgID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
", " + omodel.HSupID.ToString() + "," + omodel.HSupTypeID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() + ",'" + omodel.HStockStyle + "'," + omodel.HStockInOrgID.ToString() + "," + omodel.HStockOutOrgID.ToString() +
@@ -221,6 +261,8 @@
",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
+ ",HNewModel,HWallThickness,HHardness,HLastProdModel,HDiameter,HBackFlag" +
+ ",HMouldType,HInitModel,HInitDesignLife,HLifeUnitID,HNowModel,HNowLife" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
@@ -230,8 +272,12 @@
"," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBarCode + "'," + oSub.HCorrespondentTypeID.ToString() + "," + oSub.HCorrespondentID.ToString() +
"," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
"," + oSub.HStockOrgID.ToString() + "," + oSub.HOWNERID.ToString() + "," + oSub.HOtherOrgID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ ",'" + oSub.HNewModel + "','" + oSub.HWallThickness + "','" + oSub.HHardness + "','" + oSub.HLastProdModel + "','" + oSub.HDiameter + "','" + oSub.HBackFlag + "'" +
+ "," + oSub.HMouldType.ToString() + ",'" + oSub.HInitModel + "'," + oSub.HInitDesignLife.ToString() + "," + oSub.HLifeUnitID.ToString() + ",'" + oSub.HNowModel + "'," + oSub.HNowLife.ToString() +
") ");
}
+ //鏂板鍏宠仈锛堟洿鏂版簮鍗曞叧鑱旀暟閲忥級
+ AddNewRelation(ref sReturn, omodel.HInterID);
//淇濆瓨鍚庢帶鍒�
if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
{
@@ -299,6 +345,7 @@
omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
//========================================================
+ omodel.HSupTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupTypeID"]);
omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
@@ -310,9 +357,11 @@
omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
omodel.HRedBlueFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HRedBlueFlag"]);
-
- //
-
+ omodel.HSTOCKORGID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOrgID"]);
+ omodel.HStockStyle = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HStockStyle"]);
+ omodel.HStockInOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockInOrgID"]);
+ omodel.HStockOutOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOutOrgID"]);
+
//寰幆
DataSet DsSub ;
DsSub = oCn.RunProcReturn("Select * from Sc_MouldStockBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sc_MouldStockBillSub");
@@ -328,8 +377,8 @@
oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
- oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
- oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
@@ -339,19 +388,47 @@
oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQtyRel = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyRel"]);
oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLifeQty"]);
+ oSub.HNewLifeQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNewLifeQty"]);
oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
oSub.HSPGroupID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPGroupID"]);
- oSub.HBatchNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBatchNo"]);
- oSub.HDesignLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HDesignLife"]);
- oSub.HLeaveLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HLeaveLife"]);
- oSub.HUseLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HCorrespondentTypeID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentTypeID"]);
+ oSub.HCorrespondentID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HCorrespondentID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HStockOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOtherOrgID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOtherOrgID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEID"]);
+ oSub.HNewModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNewModel"]);
+ oSub.HWallThickness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HWallThickness"]);
+ oSub.HHardness = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HHardness"]);
+ oSub.HLastProdModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HLastProdModel"]);
+ oSub.HDiameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDiameter"]);
+ oSub.HBackFlag = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBackFlag"]);
+ oSub.HMouldType = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldType"]);
+ oSub.HInitModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HInitModel"]);
+ oSub.HInitDesignLife = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HInitDesignLife"]);
+ oSub.HLifeUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HLifeUnitID"]);
+ oSub.HNowModel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HNowModel"]);
+ oSub.HNowLife = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HNowLife"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
index 767dd74..fb41ba4 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_StationOutBill.cs"
@@ -591,7 +591,7 @@
{
//鏌ヨ涓昏〃
DataSet Ds ;
- Ds = oCn.RunProcReturn("Select * from Sc_StationOutBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
+ Ds = oCn.RunProcReturn("Select * from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
if(Ds.Tables[0].Rows.Count==0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
@@ -685,7 +685,7 @@
//
//寰幆
DataSet DsSub ;
- DsSub = oCn.RunProcReturn("Select * from Sc_StationOutBillSub Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillSub");
+ DsSub = oCn.RunProcReturn("Select * from Sc_StationOutBillSub with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillSub");
DetailColl.Clear();//娓呯┖
for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
{
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
index e91bf07..47c815a 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBill.cs"
@@ -960,7 +960,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in BillOld.DetailColl)
{
if (i >= grdMain.RowCount - 1)
grdMain.Rows.Add();
@@ -1201,12 +1201,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
{
if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
index f5aa1d1..6325046 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdOutBill.cs"
@@ -956,7 +956,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdOutBillSub oSub in BillOld.DetailColl)
{
if (i >= grdMain.RowCount - 1)
grdMain.Rows.Add();
@@ -1189,12 +1189,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdOutBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
{
if (ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdOutBillSub oSub = new Model.ClsSc_MouldProdOutBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HRemarkCol].Value);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
index 0be1564..383196c 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdBack_SingleBill.cs"
@@ -893,7 +893,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdBackBillSub oSub in BillOld.DetailColl)
{
//鍗曟嵁鍥哄畾璧嬪��
@@ -1164,12 +1164,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
//for (i = 0; i <= grdMain.RowCount - 1; i++)
//{
// if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
// {
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(txtHRemark_Sub.Text);
diff --git "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs" "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
index 9882a4f..a9dc256 100644
--- "a/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
+++ "b/EAM/\346\250\241\345\205\267\347\256\241\347\220\206/\346\250\241\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/\345\215\225\346\250\241\347\256\241\347\220\206/Sc_MouldProdOut_SingleBill.cs"
@@ -928,7 +928,7 @@
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oSub in BillOld.DetailColl)
+ foreach (Model.ClsSc_MouldProdOutBillSub oSub in BillOld.DetailColl)
{
//鍗曟嵁鍥哄畾璧嬪��
@@ -1169,12 +1169,12 @@
BillNew.omodel.HInnerBillNo = ClsPub.isStrNull(this.txtHInnerBillNo.Text);
BillNew.omodel.HRedBlueFlag = redblue.Checked;
//鏄庣粏绫昏祴鍊�
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdOutBillSub>();
//for (i = 0; i <= grdMain.RowCount - 1; i++)
//{
// if (ClsPub.isLong( grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0 )
// {
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdOutBillSub oSub = new Model.ClsSc_MouldProdOutBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(txtHRemark_Sub.Text);
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_MouldProdBackBillMain.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_MouldProdBackBillMain.cs"
index ed53605..10b0a60 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_MouldProdBackBillMain.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_MouldProdBackBillMain.cs"
@@ -6,18 +6,17 @@
{
public class ClsSc_MouldProdBackBillMain : DBUtility.ClsXt_BaseBillMain
{
- public Int64 HSupID;// int --供应商
- public Int64 HSupTypeID;// int --往来类型
- public Int64 HWHID;// int --仓库
- public Int64 HSCWHID;// int --调出仓库
- public Int64 HEmpID;// int --业务员
- public Int64 HManagerID;// int --负责人
- public Int64 HSecManagerID;// int --验收
- public Int64 HKeeperID;// int --保管员
- public Int64 HDeptID;// int --部门
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public string HRemark; //加工要求
- public bool HRedBlueFlag;// bit --红蓝单
+ public Int64 HSupID; // int --往来单位
+ public Int64 HSupTypeID; // int --往来类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HEmpID; // int --业务员
+ public Int64 HManagerID; // int --负责人
+ public Int64 HSecManagerID; // int --验收
+ public Int64 HKeeperID; // int --保管员
+ public Int64 HDeptID; // int --部门
+ public Int64 HWHID; // int --仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public string HExplanation; // varchar(200) --摘要
+ public string HInnerBillNo; // varchar(50) --内部单据号
+ public bool HRedBlueFlag; // bit --红蓝单
}
}
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_MouldProdBackBillSub.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_MouldProdBackBillSub.cs"
index fcb14b4..0f9f405 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_MouldProdBackBillSub.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_MouldProdBackBillSub.cs"
@@ -5,45 +5,51 @@
namespace Model
{
public class ClsSc_MouldProdBackBillSub : DBUtility.ClsXt_BaseBillSub
- {
- public DateTime HEntryCloseDate;// datetime --行关闭 (默认为'') new
- public string HRemark;// varchar(200) --备注
- public Int64 HMaterID;// int --物料ID
- public Int64 HPropertyID;// int --辅助属性
- public Int64 HSecUnitID;// int --辅助计量单位
- public Single HSecUnitRate;// money --换算率
- public Int64 HUnitID;// int --计量单位
- public double HDesignLife;// dec(18,8) --设计寿命
- public double HLeaveLife;// dec(18,8) --剩余寿命
- public double HUseLife;// dec(18,8) --使用寿命
- public double HQtyMust;// dec(18,8) --应收数量
- public double HQty;// dec(18,8) --实收数量
- public double HPrice;// dec(18,8) --单价
- public double HMoney;// dec(18,8) --金额
- public Int64 HWHID;// int --收料仓库
- public Int64 HSCWHID;// int --调出仓库ID
- public Int64 HSPID;// int --仓位ID
- public Int64 HSCSPID;// int --调出仓位ID
- public Int64 HSPGroupID;// int --仓位组ID(仓库选择完自动带出)
- public string HBatchNo;// varchar(50) --批次
- public string HEngineNum;// varchar(50) --发动机号
- public string HUnderPanNum;// varchar(50) --地盘号
- public string HLeaveFactCard;// varchar(50) --出厂证
- public Int64 HPOOrderInterID;// int --采购订单主内码
- public Int64 HPOOrderEntryID;// int --采购订单子内码
- public string HPOOrderBillNo;// varchar(50) --采购订单号
- public Int64 HSeOrderInterID;// int --销售订单主内码
- public Int64 HSeOrderEntryID;// int --销售订单子内码
- public string HSeOrderBillNo;// varchar(50) --销售订单号
-
- public string HNewModel;// varchar(100) --新规格 addnew
- public string HWallThickness;// varchar(100) --壁厚 addnew
- public string HHardness;// varchar(100) --硬度 addnew
- public string HLastProdModel;// varchar(100) --最后生产产品 addnew
- public string HDiameter;// varchar(100) --直径 addnew
- public string HBackFlag;// varchar(100)--退库类型（正常使用，调试不合格） addnew
- public int HStockOrgID; //调出组织
-
-
+ {
+ public Int64 HMaterID; // int --模具ID
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public Int64 HUnitID; // int --计量单位
+ public string HBatchNo; // varchar(50) --批次
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQtyRel; // dec(18,8)
+ public double HQty; // dec(18,8) --实收数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public double HDesignLife; // dec(18,8) --设计寿命
+ public double HLeaveLife; // dec(18,8) --剩余寿命
+ public double HUseLife; // dec(18,8) --使用寿命
+ public double HUseLifeQty; // dec(18,8)
+ public double HNewLifeQty; // dec(18,8)
+ public Int64 HWHID; // int --收料仓库
+ public Int64 HSCWHID; // int --调出仓库ID
+ public Int64 HSPID; // int --仓位ID
+ public Int64 HSCSPID; // int --调出仓位ID
+ public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出)
+ public string HEngineNum; // varchar(50) --发动机号
+ public string HUnderPanNum; // varchar(50) --地盘号
+ public string HLeaveFactCard; // varchar(50) --出厂证
+ public Int64 HPOOrderInterID; // int --采购订单主内码
+ public Int64 HPOOrderEntryID; // int --采购订单子内码
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主内码
+ public Int64 HSeOrderEntryID; // int --销售订单子内码
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
+ public string HBarCode;
+ public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HCorrespondentID; // int --往来单位内码
+ public string HNewModel;
+ public string HWallThickness;
+ public string HHardness;
+ public string HLastProdModel;
+ public string HDiameter;
+ public string HBackFlag;
+ public Int64 HMouldType;
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public string HNowModel;
+ public double HNowLife;
}
}
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_MouldProdMoveBillMain.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_MouldProdMoveBillMain.cs"
index df9504b..0da5260 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_MouldProdMoveBillMain.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_MouldProdMoveBillMain.cs"
@@ -6,21 +6,20 @@
{
public class ClsSc_MouldProdMoveBillMain : DBUtility.ClsXt_BaseBillMain
{
- public Int64 HSupID;// int --供应商
- public Int64 HSupTypeID;// int --往来类型
- public Int64 HWHID;// int --仓库
- public Int64 HSCWHID;// int --调出仓库
- public Int64 HEmpID;// int --业务员
- public Int64 HManagerID;// int --负责人
- public Int64 HSecManagerID;// int --验收
- public Int64 HKeeperID;// int --保管员
- public Int64 HDeptID;// int --部门
- public string HExplanation;// varchar(200) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public string HRemark; //加工要求
- public bool HRedBlueFlag;// bit --红蓝单
- public string HStockStyle; // varchar(100) //调拨类型
- public int HStockInOrgID; // int //调入组织ID
- public int HStockOutOrgID; // int //调出组织ID
+ public Int64 HSupID; // int --往来单位
+ public Int64 HSupTypeID; // int --往来类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HEmpID; // int --业务员
+ public Int64 HManagerID; // int --负责人
+ public Int64 HSecManagerID; // int --验收
+ public Int64 HKeeperID; // int --保管员
+ public Int64 HDeptID; // int --部门
+ public Int64 HWHID; // int --仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public string HExplanation; // varchar(200) --摘要
+ public string HInnerBillNo; // varchar(50) --内部单据号
+ public bool HRedBlueFlag; // bit --红蓝单
+ public string HStockStyle; // varchar(100) --调拨类型
+ public Int64 HStockInOrgID; // int --调入组织ID
+ public Int64 HStockOutOrgID;// int --调出组织ID
}
}
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_MouldProdMoveBillSub.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_MouldProdMoveBillSub.cs"
index af3d982..2d0bf0c 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_MouldProdMoveBillSub.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_MouldProdMoveBillSub.cs"
@@ -6,48 +6,50 @@
{
public class ClsSc_MouldProdMoveBillSub : DBUtility.ClsXt_BaseBillSub
{
- public long HMaterID; // int --物料ID
- public long HPropertyID; // int --辅助属性
- public long HSecUnitID; // int --辅助计量单位
- public Single HSecUnitRate; // money --换算率
- public long HUnitID; // int --计量单位
- public string HBatchNo; // varchar(50) --批次
- public double HQtyMust; // --账存数量
- public double HQtyRel; // --实存数量
- public double HQty; // --盈亏数量
- public double HPrice; // --单价
- public double HMoney; // --盈亏金额
- public double HDesignLife; // money --设计寿命
- public double HLeaveLife; // money --剩余寿命
- public double HUseLife; // money --使用寿命
- public long HWHID; // int --收料仓库
- public long HSCWHID; // int --调出仓库ID 界面上不需要显示，存0进去
- public long HSPID; // int --仓位ID
- public long HSCSPID; // int --调出仓位ID 界面上不需要显示，存0进去
- public long HSPGroupID; // int --仓位组ID 界面上不需要显示，存0进去
+ public Int64 HMaterID; // int --模具ID
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public Int64 HUnitID; // int --计量单位
+ public string HBatchNo; // varchar(50) --批次
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQtyRel; // dec(18,8)
+ public double HQty; // dec(18,8) --实收数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public double HDesignLife; // dec(18,8) --设计寿命
+ public double HLeaveLife; // dec(18,8) --剩余寿命
+ public double HUseLife; // dec(18,8) --使用寿命
+ public double HUseLifeQty; // dec(18,8)
+ public double HNewLifeQty; // dec(18,8)
+ public Int64 HWHID; // int --收料仓库
+ public Int64 HSCWHID; // int --调出仓库ID
+ public Int64 HSPID; // int --仓位ID
+ public Int64 HSCSPID; // int --调出仓位ID
+ public Int64 HSPGroupID; // int --仓位组ID(仓库选择完自动带出)
+ public string HEngineNum; // varchar(50) --发动机号
+ public string HUnderPanNum; // varchar(50) --地盘号
+ public string HLeaveFactCard; // varchar(50) --出厂证
+ public Int64 HPOOrderInterID; // int --采购订单主内码
+ public Int64 HPOOrderEntryID; // int --采购订单子内码
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主内码
+ public Int64 HSeOrderEntryID; // int --销售订单子内码
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
public string HBarCode;
- public double HUseLifeQty;
- public string HNowModel;
- public double HNowLife;
- public Int64 HMouldType;
- public string HInitModel;
- public Single HInitDesignLife;
- public Int64 HLifeUnitID;
+ public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
+ public Int64 HCorrespondentID; // int --往来单位内码
public string HNewModel;
public string HWallThickness;
public string HHardness;
public string HLastProdModel;
public string HDiameter;
public string HBackFlag;
- public double HNewLifeQty;
- public Int64 HPOOrderInterID; // int --采购订单主内码
- public Int64 HPOOrderEntryID; // int --采购订单子内码
- public string HPOOrderBillNo; // varchar(50) --采购订单号
- public Int64 HSeOrderInterID; // int --销售订单主内码
- public Int64 HSeOrderEntryID; // int --销售订单子内码
- public string HSeOrderBillNo; // varchar(50) --销售订单号
- public Int64 HCorrespondentTypeID; // int --往来单位类型（1 供应商、2 客户、 3 车间部门）
- public Int64 HCorrespondentID; // int --往来单位内码
-
+ public Int64 HMouldType;
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ public string HNowModel;
+ public double HNowLife;
}
}
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index d8e48a9..a7e7f70 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 9679f05..75e66e8 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index d8e48a9..a7e7f70 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 9679f05..75e66e8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 2560108..af1c550 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -292,7 +292,7 @@
//鍒ゆ柇褰撳墠宸ュ崟鏄惁寮�宸�
else if (oSystemParameter.omodel.MES_StationOutBill_MustBeginWorkCtl == "Y")
{
- ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
+ ds = oCN.RunProcReturn("select * from Sc_ICMOBillStatus_Tmp with(nolock) where HSourceID = '" + HSourceID + "' and HICMOBillNo = '" + HICMOBillNo + "' and HInterID = '" + HICMOInterID + "' and hicmostatus =1", "Sc_ICMOBillStatus_Tmp");
if (ds.Tables[0].Rows[0]["HICMOStatus"].ToString() != "1")
{
objJsonResult.code = "0";
@@ -437,7 +437,7 @@
else if ("Modify".Equals(eventType))
{
num = 2;
- oCN.RunProc("UpDate Sc_StationOutBillMain set " +
+ oCN.RunProc("UpDate a set " +
"HUpDater='" + HMaker + "'" +
",HUpDateDate=getdate()" +
",HSourceName='" + HSourceName + "'" +
@@ -479,6 +479,7 @@
//",HIsTimeFlag=" + HIsTimeFlag +
//",HRelBeginTime='" + HRelBeginTime + "'" +
//",HRelEndTime='" + HRelEndTime + "'" +
+ " from Sc_StationOutBillMain a with(nolock)" +
" where HInterID=" + HInterID);
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭鍑虹珯鍗曟嵁:" + HBillNo);
@@ -534,8 +535,8 @@
oCN.RunProc("exec h_p_Mes_StationOutBillBackBarCode " + HInterID + " ");
LogService.Write($"7.瀛樺偍杩囩▼缁撴潫锛岀敤鏃�" + sw.Elapsed);
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
- ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a " +
- " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ ds1 = oCN.RunProcReturn(" select HLastProc,HFstProc from Sc_ProcessExchangeBillMain a with(nolock) " +
+ " inner join Sc_ProcessExchangeBillSub b with(nolock) on a.HInterID=b.HInterID " +
" Where a.HInterID=" + HProcExchInterID + " and b.HEntryID=" + HProcExchEntryID + " ", "Sc_ProcessExchangeBillMain");
LogService.Write($"7.1.鏌ヨ锛岀敤鏃�" + sw.Elapsed);
//鍒ゆ柇鏄惁鏄柊澧�
@@ -648,8 +649,8 @@
//娴嬭瘯璇彞===========================================================================================================
string msg_str = "";
string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " +
- "from Sc_ProcessExchangeBillMain as a " +
- "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " +
+ "from Sc_ProcessExchangeBillMain as a with(nolock)" +
+ "inner join Sc_ProcessExchangeBillSub as b with(nolock) on a.HInterID = b.HInterID " +
"where a.HInterID = " + HProcExchInterID;
DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain");
if (ds_str.Tables[0].Rows.Count > 0)
@@ -951,7 +952,7 @@
Int64 HInterID = DBUtility.ClsPub.CreateBillID("3711", ref DBUtility.ClsPub.sExeReturnInfo);
string HBillNo = DBUtility.ClsPub.CreateBillCode("3711", ref DBUtility.ClsPub.sExeReturnInfo, true);
//鑾峰彇缁勭粐浠ｇ爜
- string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
+ string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS with(nolock) where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
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)
@@ -966,7 +967,7 @@
//淇濆瓨
//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)
{
objJsonResult.code = "0";
@@ -1128,7 +1129,7 @@
return objJsonResult;
}
- oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ oCN.RunProc("update a set HRelationQty=1 from Sc_StationOutBillMain a with(nolock) where HBillNo='" + BillNo + "'");
//oCN.Commit();
objJsonResult.code = "0";
@@ -1344,7 +1345,7 @@
return objJsonResult;
}
- oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ oCN.RunProc("update a set HRelationQty=1 from Sc_StationOutBillMain a with(nolock) where HBillNo='" + BillNo + "'");
//oCN.Commit();
objJsonResult.code = "0";
@@ -3099,21 +3100,21 @@
string HChecker = CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
oCN.BeginTran();
- ds = oCN.RunProcReturn("Select * from Sc_StationOutBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
+ ds = oCN.RunProcReturn("Select * from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString(), "Sc_StationOutBillMain");
if (ds.Tables[0].Rows.Count == 0)
{
sReturn = "鍗曟嵁鏈壘鍒帮紒";
return false;
}
- oCN.RunProc(" Update Sc_StationOutBillMain set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc(" Update a set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey.ToString());
oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
//鍒ゆ柇鏄惁鏄� 鏈亾宸ュ簭
DataSet ds1;
ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
- " from Sc_ProcessExchangeBillMain a " +
- " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
- " Where a.HInterID=(Select HProcExchInterID from Sc_StationOutBillMain Where HInterID=" + lngBillKey + ") " +
- " and b.HEntryID=(Select HProcExchEntryID from Sc_StationOutBillMain Where HInterID=" + lngBillKey + ")", "Sc_ProcessExchangeBillMain");
+ " from Sc_ProcessExchangeBillMain a with(nolock)" +
+ " inner join Sc_ProcessExchangeBillSub b with(nolock) on a.HInterID=b.HInterID " +
+ " Where a.HInterID=(Select HProcExchInterID from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey + ") " +
+ " and b.HEntryID=(Select HProcExchEntryID from Sc_StationOutBillMain with(nolock) Where HInterID=" + lngBillKey + ")", "Sc_ProcessExchangeBillMain");
if (ds1 == null || ds1.Tables[0].Rows.Count == 0 || HLastSubProc ==false)
{
}
@@ -3121,8 +3122,8 @@
{
}
- DataSet dataSet = oCN.RunProcReturn(@"select a.HProcExchBillNo,a.HQty,b.HQty HProcExchQty from Sc_StationOutBillMain a
-inner join Sc_ProcessExchangeBillMain b on a.HProcExchInterID = b.HInterID
+ DataSet dataSet = oCN.RunProcReturn(@"select a.HProcExchBillNo,a.HQty,b.HQty HProcExchQty from Sc_StationOutBillMain a with(nolock)
+inner join Sc_ProcessExchangeBillMain b with(nolock) on a.HProcExchInterID = b.HInterID
where a.HInterID = " + lngBillKey, "Sc_ProcessExchangeBillMain");
if (dataSet.Tables[0].Rows.Count > 0)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
new file mode 100644
index 0000000..841a496
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdBackBillController.cs
@@ -0,0 +1,801 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using System.Windows.Forms;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+
+ public class Sc_MouldProdBackBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "3803"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鍣ㄥ叿棰嗙敤閫�搴撳崟"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MouldProdBackBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsSc_MouldProdBackBill oBill = new DAL.ClsSc_MouldProdBackBill();
+
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟鍒嗛〉鍒楄〃
+ [Route("Sc_MouldProdBackBillController/page")]
+ [HttpGet]
+ public json Sc_MouldProdBackBillPage(string sWhere, string user, int page, int size, string Type)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒楄〃杩涘叆鏃跺垽鏂潈闄愶紝閫夋簮鍗曡繘鍏ヤ笉鍒ゆ柇鏉冮檺
+ if (Type == ModName)
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdBackBillList_New " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldProdBackBillList_New");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdBackBillList_New " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldProdBackBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍣ㄥ叿棰嗙敤閫�搴撳崟
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Delete_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Delete_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿棰嗙敤閫�搴撳崟鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿棰嗙敤閫�搴撳崟 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍稿櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Check_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿墠鎺у埗
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdBackBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdBackBill_BeforeUnCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdBackBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿棰嗙敤閫�搴撳崟 鎵归噺瀹℃牳
+ /// <summary>
+ /// 鎵归噺瀹℃牳/鍙嶅鏍稿櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/CheckAll")]
+ [HttpGet]
+ public object CheckAll(string ids, int Type, string HMaker)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(ids))
+ {
+ long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
+ // 澶勭悊idArray...
+ oCn.BeginTran();
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)GetSc_MouldProdBackBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ oCn.Commit();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿棰嗙敤閫�搴撳崟澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂櫒鍏烽鐢ㄩ��搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Close_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿棰嗙敤閫�搴撳崟 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴� 鍣ㄥ叿棰嗙敤閫�搴撳崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Cancelltion_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdBackBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿棰嗙敤閫�搴撳崟 淇濆瓨
+ /// <summary>
+ /// 鍣ㄥ叿棰嗙敤閫�搴撳崟淇濆瓨
+ /// </summary>
+ [Route("Sc_MouldProdBackBillController/GetSc_MouldProdBackBill_Save_Json")]
+ [HttpPost]
+ public object GetSc_MouldProdBackBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdBackBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldProdBackBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdBackBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍣ㄥ叿棰嗙敤閫�搴撳崟 杩斿洖婧愬崟鏁版嵁
+ /// <summary>
+ /// 杩斿洖婧愬崟鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdBackBillController/GetSourceBill_MouldProdBack_Json")]
+ [HttpGet]
+ public object GetSourceBill_MouldProdBack_Json(Int64 HInterID, Int64 HEntryID, string HBillType)
+ {
+ try
+ {
+ string sViewName = "";
+ //鍣ㄥ叿鍏ュ簱鐢宠鍗�
+ if (HBillType== "3851")
+ {
+ sViewName = "h_p_Sc_MouldInRequestBill_Source_MouldProdBack";
+ }
+
+ if (sViewName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶆敮鎸佽婧愬崟绫诲瀷锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("exec " + sViewName + " " + HInterID.ToString() + "," + HEntryID.ToString(), sViewName);
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇婧愬崟淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs
new file mode 100644
index 0000000..65192ec
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillController.cs
@@ -0,0 +1,801 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using System.Windows.Forms;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+
+ public class Sc_MouldProdMoveBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "3814"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鍣ㄥ叿璋冩嫧鍗�"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MouldProdMoveBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsSc_MouldProdMoveBill oBill = new DAL.ClsSc_MouldProdMoveBill();
+
+
+ #region 鍣ㄥ叿璋冩嫧鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldProdMoveBillController/page")]
+ [HttpGet]
+ public json Sc_MouldProdMoveBillPage(string sWhere, string user, int page, int size, string Type)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒楄〃杩涘叆鏃跺垽鏂潈闄愶紝閫夋簮鍗曡繘鍏ヤ笉鍒ゆ柇鏉冮檺
+ if (Type == ModName)
+ {
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList_New " + page + "," + size + ",'','" + Type + "'", "h_p_Sc_MouldProdMoveBillList_New");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList_New " + page + "," + size + ",'" + sWhere + "','" + Type + "'", "h_p_Sc_MouldProdMoveBillList_New");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍣ㄥ叿璋冩嫧鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Delete_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Delete_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿璋冩嫧鍗曟垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿璋冩嫧鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Check_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿墠鎺у埗
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'", "h_p_Sc_MouldProdMoveBill_BeforeUnCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldProdMoveBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿璋冩嫧鍗� 鎵归噺瀹℃牳
+ /// <summary>
+ /// 鎵归噺瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/CheckAll")]
+ [HttpGet]
+ public object CheckAll(string ids, int Type, string HMaker)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(ids))
+ {
+ long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
+ // 澶勭悊idArray...
+ oCn.BeginTran();
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)GetSc_MouldProdMoveBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ oCn.Commit();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿璋冩嫧鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂櫒鍏疯皟鎷ㄥ崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Close_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿璋冩嫧鍗� 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴� 鍣ㄥ叿璋冩嫧鍗�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Cancelltion_Json")]
+ [HttpGet]
+ public object GetSc_MouldProdMoveBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ 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 鍣ㄥ叿璋冩嫧鍗� 淇濆瓨
+ /// <summary>
+ /// 鍣ㄥ叿璋冩嫧鍗曚繚瀛�
+ /// </summary>
+ [Route("Sc_MouldProdMoveBillController/GetSc_MouldProdMoveBill_Save_Json")]
+ [HttpPost]
+ public object GetSc_MouldProdMoveBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdMoveBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldProdMoveBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldProdMoveBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldProdMoveBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鍗� 杩斿洖婧愬崟鏁版嵁
+ /// <summary>
+ /// 杩斿洖婧愬崟鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldProdMoveBillController/GetSourceBill_MouldProdMove_Json")]
+ [HttpGet]
+ public object GetSourceBill_MouldProdMove_Json(Int64 HInterID, Int64 HEntryID, string HBillType)
+ {
+ try
+ {
+ string sViewName = "";
+ //鍣ㄥ叿璋冩嫧鐢宠鍗�
+ if (HBillType== "3850")
+ {
+ sViewName = "h_p_Sc_MouldMoveStockRequestBill_Source_MouldProdMove";
+ }
+
+ if (sViewName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓嶆敮鎸佽婧愬崟绫诲瀷锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("exec " + sViewName + " " + HInterID.ToString() + "," + HEntryID.ToString(), sViewName);
+ 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 = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇婧愬崟淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
index bbe2115..9975a34 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdOutBillController.cs
@@ -604,14 +604,14 @@
}
#endregion
- #region 鍣ㄥ叿棰嗙敤鍑哄簱鍗曟ā鍧� 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+ #region 鍣ㄥ叿鍑哄叆搴撳崟妯″潡 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
/// <summary>
- /// 鍣ㄥ叿棰嗙敤鍑哄簱鍗曠紪杈戞椂锛屾牴鎹崟鎹甀D鑾峰彇鍗曟嵁淇℃伅
+ ///鍣ㄥ叿鍑哄叆搴撳崟缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
/// </summary>
/// <returns></returns>
- [Route("Sc_MouldProdOutBillController/GetSc_MouldProdOutBill_Json")]
+ [Route("Sc_MouldStockBillController/GetSc_MouldStockBill_Json")]
[HttpGet]
- public object GetSc_MouldProdOutBill_Json(Int64 HInterID, string HMaker)
+ public object GetSc_MouldStockBill_Json(Int64 HInterID, string HMaker)
{
List<object> list = new List<object>();
try
@@ -632,7 +632,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏烽鐢ㄥ嚭搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏峰嚭鍏ュ簱鍗曪紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -651,7 +651,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "杩斿洖鍣ㄥ叿棰嗙敤鍑哄簱鍗曚俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "杩斿洖鍣ㄥ叿鍑哄叆搴撳崟淇℃伅澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 5ead2e8..d9ba0a0 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -1545,8 +1545,7 @@
string sErrMsg = "";
if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉"
- || oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒"
+ if (oSystemParameter.omodel.WMS_CampanyName == "甯呭▉"
|| oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧"
|| oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
{
diff --git a/WebAPI/Controllers/Sc_MouldController.cs b/WebAPI/Controllers/Sc_MouldController.cs
index f367f72..ce565e6 100644
--- a/WebAPI/Controllers/Sc_MouldController.cs
+++ b/WebAPI/Controllers/Sc_MouldController.cs
@@ -979,8 +979,8 @@
BillNew.omodel.HExplanation = mainList[0].HExplanation;
BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
- BillNew.DetailColl = new List<Model.ClsSc_MouldStockBillSub>();
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ BillNew.DetailColl = new List<Model.ClsSc_MouldProdBackBillSub>();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
oSub.HEntryID = 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(subList[0].HRemark);
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index e847783..8d5de2c 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -11684,9 +11684,9 @@
sSubStr = sSubStr.Replace("\\", "");
sSubStr = sSubStr.Replace("\n", "");
sSubStr = "[" + sSubStr.ToString() + "]";
- List<Model.ClsSc_MouldStockBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillSub>>(sSubStr);
+ List<Model.ClsSc_MouldProdBackBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdBackBillSub>>(sSubStr);
int i = 0;
- foreach (Model.ClsSc_MouldStockBillSub oItemSub in ls)
+ foreach (Model.ClsSc_MouldProdBackBillSub oItemSub in ls)
{
i++;
oItemSub.HEntryID = i;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index f52ff93..797bf97 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -20230,7 +20230,7 @@
/// <returns></returns>
[Route("Web/GetCheckItemByCheckProjectID")]
[HttpGet]
- public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty)
+ public object GetCheckItemByCheckProjectID(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
{
if (CheckProjectID <= 0)
{
@@ -20243,7 +20243,7 @@
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty;
+ string sql = "exec h_p_Gy_GetQCCheckItemByProject " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index 8aa23fb..0757f38 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -792,7 +792,7 @@
{
for (int i = 0; i <= ds.Tables[0].Rows.Count - 1; i++)
{
- Model.ClsSc_MouldStockBillSub oSub = new Model.ClsSc_MouldStockBillSub();
+ Model.ClsSc_MouldProdBackBillSub oSub = new Model.ClsSc_MouldProdBackBillSub();
//鍥哄畾璧嬪��========================================
oSub.HEntryID = i + 1;
oSub.HRemark = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HRemark"]);
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
index 86e2fec..46e2048 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml
@@ -7,7 +7,7 @@
<DeleteExistingFiles>true</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
index a5e7253..98b37aa 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-02-12T06:57:08.1380239Z;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
+ <History>True|2025-12-02T01:16:07.2877709Z;True|2025-02-12T14:57:08.1380239+08:00;True|2025-02-12T14:47:58.0901509+08:00;True|2025-02-12T14:15:10.5288654+08:00;True|2025-02-12T14:12:22.5382196+08:00;True|2025-02-12T14:07:11.7831540+08:00;True|2024-11-29T13:29:48.1554947+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>02/12/2025 14:04:56</publishTime>
+ <publishTime>12/02/2025 09:15:29</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>02/12/2025 14:04:56</publishTime>
+ <publishTime>12/02/2025 09:15:29</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>02/12/2025 14:04:53</publishTime>
+ <publishTime>12/02/2025 09:15:17</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>02/12/2025 14:04:53</publishTime>
+ <publishTime>12/02/2025 09:15:17</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:14:57</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:14:57</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +111,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:15:04</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>02/12/2025 14:04:51</publishTime>
+ <publishTime>12/02/2025 09:15:04</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>02/12/2025 14:04:49</publishTime>
+ <publishTime>12/02/2025 09:14:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>02/12/2025 14:04:49</publishTime>
+ <publishTime>12/02/2025 09:14:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:50</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:50</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:51</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:14:51</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>02/12/2025 14:04:48</publishTime>
+ <publishTime>12/02/2025 09:06:48</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>02/12/2025 14:04:48</publishTime>
+ <publishTime>12/02/2025 09:06:48</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:07:14</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>02/12/2025 14:04:50</publishTime>
+ <publishTime>12/02/2025 09:07:14</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>02/12/2025 14:57:02</publishTime>
+ <publishTime>12/02/2025 09:15:57</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>02/12/2025 14:57:02</publishTime>
+ <publishTime>12/02/2025 09:15:57</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/12/2025 14:57:06</publishTime>
@@ -312,58 +312,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/15/2022 15:46:13</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:47:46</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -372,7 +372,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -381,118 +381,124 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/18/2023 17:26:29</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/19/2024 08:47:56</publishTime>
+ <publishTime>10/13/2025 14:50:13</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>11/25/2025 17:22:05</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/05/2025 16:16:48</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>03/15/2022 10:06:42</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>03/31/2023 09:57:09</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>03/31/2023 09:57:08</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>02/12/2025 14:07:07</publishTime>
+ <publishTime>12/02/2025 09:16:00</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml
new file mode 100644
index 0000000..6ac6bff
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml
@@ -0,0 +1,17 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>True</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
+ <LastUsedPlatform>x86</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <SiteUrlToLaunchAfterPublish />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
new file mode 100644
index 0000000..e4d0401
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
@@ -0,0 +1,498 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ <History>True|2025-12-01T11:22:21.9416380Z;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 08:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 09:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 12:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 10:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 03:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 11:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 12:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 13:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 02:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 08:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>12/01/2025 19:21:09</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>12/01/2025 19:21:09</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/17/2020 21:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>12/01/2025 19:21:08</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>12/01/2025 19:21:08</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 14:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 05:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/18/2022 23:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 05:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/18/2022 23:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/08/2021 17:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/08/2021 17:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:18:13</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/18/2022 23:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/18/2022 23:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/18/2015 17:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 11:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 07:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 01:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 01:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/30/2012 22:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>12/01/2025 19:21:05</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/15/2015 17:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/01/2025 19:21:03</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/01/2025 19:21:03</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 10:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 10:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/17/2019 16:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/19/2015 20:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 13:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/19/2015 20:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/18/2018 19:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 12:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 13:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 13:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 04:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 15:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 04:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 04:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 02:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>12/01/2025 19:21:06</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 11:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>12/01/2025 19:21:14</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>12/01/2025 19:21:14</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/17/2013 17:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 13:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 13:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>11/27/2023 09:14:13</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>09/05/2022 17:02:53</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>09/05/2022 17:03:02</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>09/05/2022 17:03:06</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:18:13</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>09/05/2022 17:03:07</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>09/05/2022 17:03:08</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>01/10/2023 17:20:14</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 05:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>09/05/2022 17:03:09</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/18/2022 23:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/18/2022 23:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>07/24/2023 08:56:46</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>09/05/2022 17:03:09</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>09/18/2024 18:59:21</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>09/13/2025 17:30:20</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>09/05/2022 17:03:10</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>09/05/2022 17:03:11</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>01/24/2024 11:35:26</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>01/24/2024 11:35:25</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>12/01/2025 19:22:21</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c67f0e3..7eda4bc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -277,12 +277,14 @@
<Content Include="fonts\glyphicons-halflings-regular.svg" />
<Content Include="Global.asax" />
<Content Include="Index.html" />
+ <Content Include="Properties\PublishProfiles\JFAPI.pubxml.user" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
<Content Include="libman.json" />
<Content Include="Template\barCodeTemplateStorage.json" />
<None Include="Properties\PublishProfiles\FolderProfilewtt.pubxml" />
+ <None Include="Properties\PublishProfiles\JFAPI.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -450,6 +452,8 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdBackBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldProdOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOutRequestBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldInRequestBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 9ce4807..6cac8d4 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -3,20 +3,7 @@
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-
- <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
-
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
-
- <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile17.pubxml</NameOfLastUsedPublishProfile>
-
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile16.pubxml</NameOfLastUsedPublishProfile>
-
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index c99160a..c163894 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 2d33b64..6011042 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 35e5324..054e86e 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index c99160a..c163894 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 2d33b64..6011042 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1