From 7005627d7faa817c0ab4c1b559aaaa458ab8d191 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 五月 2024 17:15:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillMain.cs | 5
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 117 ++++++++
WebAPI/WebAPI.csproj.user | 2
Model/生产管理/模具管理/ClsSc_MouldProdMoveBillSub.cs | 63 +++-
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 53 ++-
DAL/生产管理/模具管理/ClsSc_MouldProdMoveBill.cs | 187 ++++++++++--
WebAPI/Controllers/条码管理/MouldController.cs | 255 ++++++++++++++++++
WorkM/报表分析/Sc_OverProdReport.cs | 30 +-
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 86 ++++++
10 files changed, 703 insertions(+), 97 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_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 67f216b..2a26939 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"
@@ -29,8 +29,63 @@
{
DetailColl = null;
}
-
+
#endregion 鑷畾涔夋柟娉�
+
+ //淇濆瓨鍓嶆帶鍒�
+ public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 HSecManagerID, Int64 HKeeperID, Int64 HSupID, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + HSecManagerID.ToString() + "," + HKeeperID.ToString() + "," + HSupID.ToString() + "," + OperationType.ToString(), "h_p_Sc_MouldProdMoveBill_BeforeSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇濆瓨鍚庢帶鍒�
+ public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Sc_MouldProdMoveBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Sc_MouldProdMoveBill_AfterSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -38,6 +93,12 @@
{
//
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(lngBillKey, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
//鏇存柊涓昏〃
oCn.RunProc("UpDate Sc_MouldStockBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
@@ -49,16 +110,21 @@
",HUpDateDate=getdate()" +
//========================================
",HSupID=" + omodel.HSupID.ToString() +
- ",HWHID=" + omodel.HWHID.ToString() +
- ",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HSupTypeID=" + omodel.HSupTypeID.ToString() +
",HEmpID=" + omodel.HEmpID.ToString() +
",HManagerID=" + omodel.HManagerID.ToString() +
",HSecManagerID=" + omodel.HSecManagerID.ToString() +
",HKeeperID=" + omodel.HKeeperID.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HSCWHID=" + omodel.HSCWHID.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
- ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ",HStockOrgID=" + omodel.HSTOCKORGID.ToString() +
+ ",HStockStyle='" + omodel.HStockStyle + "'" +
+ ",HStockInOrgID=" + omodel.HStockInOrgID.ToString() +
+ ",HStockOutOrgID=" + omodel.HStockOutOrgID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -69,22 +135,32 @@
foreach (Model.ClsSc_MouldProdMoveBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
- " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
- ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
- ",HDesignLife,HLeaveLife,HUseLife" +
- ",HSCSPID,HSPGroupID,HBatchNo" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HBatchNo" +
+ ",HQtyMust,HQtyRel,HQty,HPrice,HMoney,HDesignLife" +
+ ",HLeaveLife,HUseLife,HUseLifeQty,HNewLifeQty,HWHID,HSCWHID" +
+ ",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
- "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
- "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HQtyRel.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HDesignLife.ToString() +
+ "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + "," + oSub.HUseLifeQty.ToString() + "," + oSub.HNewLifeQty.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() +
+ "," + 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 + "'" +
") ");
}
- sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -100,42 +176,79 @@
{
try
{
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false)
+ {
+ sReturn = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sReturn;
+ return false;
+ }
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
- //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ if (omodel.HInterID == 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(omodel.HInterID, omodel.HBillNo, omodel.HSecManagerID, omodel.HKeeperID, omodel.HSupID, 1, ref sReturn))
+ {
+ return false;
+ }
+
oCn.BeginTran();
//涓昏〃
oCn.RunProc("Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
+ ",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 + "'" +
+ " 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.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
- ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
+ ", " + 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() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_MouldProdMoveBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldStockBillSub " +
- " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
- ",HQty,HPrice,HMoney,HWHID,HSCWHID,HSPID" +
- ",HDesignLife,HLeaveLife,HUseLife" +
- ",HSCSPID,HSPGroupID,HBatchNo" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HBatchNo" +
+ ",HQtyMust,HQtyRel,HQty,HPrice,HMoney,HDesignLife" +
+ ",HLeaveLife,HUseLife,HUseLifeQty,HNewLifeQty,HWHID,HSCWHID" +
+ ",HSPID,HSCSPID,HSPGroupID,HBarCode,HCorrespondentTypeID,HCorrespondentID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
- "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() +
- "," + oSub.HDesignLife.ToString() + "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() +
- "," + oSub.HSCSPID.ToString() + "," + oSub.HSPGroupID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + ",'" + oSub.HBatchNo + "'" +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HQtyRel.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HDesignLife.ToString() +
+ "," + oSub.HLeaveLife.ToString() + "," + oSub.HUseLife.ToString() + "," + oSub.HUseLifeQty.ToString() + "," + oSub.HNewLifeQty.ToString() + "," + oSub.HWHID.ToString() + "," + oSub.HSCWHID.ToString() +
+ "," + 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 + "'" +
") ");
}
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+
+ if (oSystemParameter.omodel.Sc_MouldProdMoveBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ //瀹℃牳鍗曟嵁
+ oCn.RunProc("Update Sc_MouldStockBillMain Set HChecker='" + DBUtility.ClsPub.CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID= " + omodel.HInterID.ToString());
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板瀹℃牳鎴愬姛锛�";
+ }
+ else
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
+ }
oCn.Commit();
return true;
}
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 9fd49b6..df9504b 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"
@@ -7,6 +7,7 @@
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 --业务员
@@ -18,6 +19,8 @@
public string HInnerBillNo;// varchar(50) --内部单据号
public string HRemark; //加工要求
public bool HRedBlueFlag;// bit --红蓝单
- public string HStockStyle;//
+ public string HStockStyle; // varchar(100) //调拨类型
+ public int HStockInOrgID; // int //调入组织ID
+ public int 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 5219ef6..af3d982 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"
@@ -5,28 +5,49 @@
namespace Model
{
public class ClsSc_MouldProdMoveBillSub : 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 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 string HBarCode;
+ public double HUseLifeQty;
+ public string HNowModel;
+ public double HNowLife;
+ public Int64 HMouldType;
+ public string HInitModel;
+ public Single HInitDesignLife;
+ public Int64 HLifeUnitID;
+ 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 --往来单位内码
}
}
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 2224c0a..3e4fccf 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1415,10 +1415,18 @@
{
omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具领用出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck")
{
omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew")
{
@@ -1441,60 +1449,108 @@
{
omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具改制出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck")
{
omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具改制入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck")
{
omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具其他入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck")
{
omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具其他出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck")
{
omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具暂借入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck")
{
omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具暂借出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck")
{
omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具报废入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck")
{
omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具报废出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck")
{
omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具直接调拨单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck")
{
omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具分步调出单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck")
{
omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具分步调入单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck")
{
omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具盘点单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck")
@@ -3268,10 +3324,18 @@
{
omodel.Sc_MouldProdInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具领用出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_AutoCheck")
{
omodel.Sc_MouldProdOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdOutBill_SaveAutoAddnew")
{
@@ -3294,60 +3358,108 @@
{
omodel.Sc_MouldProdBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdBackBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdBackBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具改制出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_AutoCheck")
{
omodel.Sc_MouldRepairOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldRepairOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具改制入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_AutoCheck")
{
omodel.Sc_MouldRepairInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldRepairInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldRepairInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具其他入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_AutoCheck")
{
omodel.Sc_MouldOtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldOtherInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具其他出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_AutoCheck")
{
omodel.Sc_MouldOtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldOtherOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldOtherOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具暂借入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_AutoCheck")
{
omodel.Sc_MouldBorrowInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldBorrowInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具暂借出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_AutoCheck")
{
omodel.Sc_MouldBorrowOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldBorrowOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldBorrowOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具报废入库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_AutoCheck")
{
omodel.Sc_MouldScrapInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldScrapInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具报废出库单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_AutoCheck")
{
omodel.Sc_MouldScrapOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldScrapOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldScrapOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具直接调拨单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_AutoCheck")
{
omodel.Sc_MouldProdMoveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdMoveBill_BarCodeQty")
+ {
+ omodel.Sc_MouldProdMoveBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具分步调出单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_AutoCheck")
{
omodel.Sc_MouldMoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepOutBill_BarCodeQty")
+ {
+ omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========器具分步调入单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_AutoCheck")
{
omodel.Sc_MouldMoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldMoveStockStepInBill_BarCodeQty")
+ {
+ omodel.Sc_MouldMoveStockStepInBill_BarCodeQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//===========器具盘点单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MouldProdCheckStockBill_AutoCheck")
@@ -3562,6 +3674,11 @@
{
omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //刷卡验证
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_SwipeCardStart")
+ {
+ omodel.Sc_MESBeginWorkBill_SwipeCardStart = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========返工单
//自动审核
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 69b1f5f..5d5ea3a 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -414,53 +414,67 @@
//====================================================器具管理EAM
//器具采购入库单
- public string Sc_MouldProdInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具领用出库单
- public string Sc_MouldProdOutBill_AutoCheck; //保存后是否自动审核
- public string Sc_MouldProdOutBill_SaveAutoAddnew; //保存后变为新增状态
- public string Sc_MouldProdOutBill_DeleterAndMakerMustSame; //删除人必须是制单人
- public string Sc_MouldProdOutBill_MouldLifeCtrl; //保存时器具寿命控制 （Y 控制， N 不控制 当器具预计寿命或者当前寿命不足时，不允许领用）
- public string Sc_MouldProdOutBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
+ public string Sc_MouldProdOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
+ public string Sc_MouldProdOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Sc_MouldProdOutBill_DeleterAndMakerMustSame; //删除人必须是制单人
+ public string Sc_MouldProdOutBill_MouldLifeCtrl; //保存时器具寿命控制 （Y 控制， N 不控制 当器具预计寿命或者当前寿命不足时，不允许领用）
+ public string Sc_MouldProdOutBill_MouldLifeCtrlType; //保存时器具寿命控制类型 （Y 强制控制， N 仅提示）
//器具领用退库单
- public string Sc_MouldProdBackBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdBackBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdBackBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具改制出库单
- public string Sc_MouldRepairOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldRepairOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldRepairOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具改制入库单
- public string Sc_MouldRepairInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldRepairInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldRepairInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具其他入库单
- public string Sc_MouldOtherInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldOtherInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldOtherInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具其他出库单
- public string Sc_MouldOtherOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldOtherOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldOtherOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具暂借入库单
- public string Sc_MouldBorrowInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldBorrowInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldBorrowInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具暂借出库单
- public string Sc_MouldBorrowOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldBorrowOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldBorrowOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具报废入库单
- public string Sc_MouldScrapInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldScrapInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldScrapInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具报废出库单
- public string Sc_MouldScrapOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldScrapOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldScrapOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具直接调拨单
- public string Sc_MouldProdMoveBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdMoveBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdMoveBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具分步调出单
- public string Sc_MouldMoveStockStepOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldMoveStockStepOutBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldMoveStockStepOutBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具分步调入单
- public string Sc_MouldMoveStockStepInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldMoveStockStepInBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldMoveStockStepInBill_BarCodeQty; //允许扫描条码个数（0、1、2、3.....，其中0为不控制）
//器具盘点单
- public string Sc_MouldProdCheckStockBill_AutoCheck; //保存后是否自动审核
+ public string Sc_MouldProdCheckStockBill_AutoCheck; //保存后是否自动审核
//====================================================工序流转WIP
@@ -543,6 +557,7 @@
public string Sc_MESBeginWorkBill_AutoCheck; //保存后是否自动审核
public string Sc_MESBeginWorkBill_SaveAutoAddnew; //保存后变为新增状态
public string Sc_MESBeginWorkBill_DeleterAndMakerMustSame; //删除人必须是制单人
+ public string Sc_MESBeginWorkBill_SwipeCardStart; //开工单需要刷卡验证
//返工单
public string Sc_MESReturnWorkBill_AutoCheck; //保存后是否自动审核
public string Sc_MESReturnWorkBill_SaveAutoAddnew; //保存后变为新增状态
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index bd708fd..e1ab597 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -634,6 +634,92 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟淇濆瓨鍓嶇郴缁熼獙璇�
+ [Route("Sc_MESBeginWorkBill/Xt_AllowLoadData")]
+ [HttpGet]
+ public object Xt_AllowLoadData(string HKey)
+ {
+ try
+ {
+ ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+ string Key = "N";
+ string sCapName = oClsXt_SystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (sCapName.Contains("鏉窞鏂帿灏�"))
+ {
+ Key = oClsXt_SystemParameter.GetSingleSystemParameter(HKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = null;
+ objJsonResult.Verify = Key;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
+ #region 鎶ュ伐骞冲彴寮�宸ュ崟娴佹按鍙峰洖杞﹁幏鍙栨潯鐮佷俊鎭�
+ [Route("Sc_MESBeginWorkBill/txtHBarCode_KeyDown")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown(string HBarCode, string HSourceInterID)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绌虹櫧鐮�,鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("exec h_p_Sc_MESBeginWorkBill_AllowLoadData '"+ HBarCode + "',"+ HSourceInterID, "h_p_Sc_MESBeginWorkBill_AllowLoadData");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌鏉＄爜淇℃伅锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows.Count ==1)
+ {
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = 1;
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = ds.Tables[0].Rows[0][0].ToString();
+ objJsonResult.count = 1;
+ objJsonResult.Message = ds.Tables[0].Rows[0][1].ToString();
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鎶ュ伐骞冲彴寮�宸ュ崟淇濆瓨/缂栬緫
/// <summary>
/// 寮�宸ュ崟
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 663c5fc..26a9602 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"
@@ -25,6 +25,7 @@
public DataSet ds = new DataSet();
private json objJsonResult = new json();
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
#region 鍣ㄥ叿鎵爜妯″潡璋冪敤鏂规硶
@@ -36,11 +37,99 @@
/// <returns></returns>
[Route("MouldController/Get_CheckTypeByMouldBarCode_Json")]
[HttpGet]
- public object Get_CheckTypeByMouldBarCode_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, bool HRedBlueFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID)
+ public object Get_CheckTypeByMouldBarCode_Json(string sBarCode, Int64 HInterID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Int64 HSCWhID, Int64 HSCSPID, bool HRedBlueFlag, string HSourceBillNo, string HSourceBillType, Int64 HStockOrgID, Int64 HStockOutOrgID)
{
+ Int64 HBarCodeQty = 0; //鍏佽鎵弿鏉＄爜涓暟锛�0銆�1銆�2銆�3.....锛屽叾涓�0涓轰笉鎺у埗锛�
+
+ #region 鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
+ {
+ //鍣ㄥ叿閲囪喘鍏ュ簱鍗�
+ if (HBillType == "3801")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldProdInBill_BarCodeQty);
+ }
+ //鍣ㄥ叿棰嗙敤鍑哄簱鍗�
+ else if (HBillType == "3802")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldProdOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿棰嗙敤閫�搴撳崟
+ else if (HBillType == "3803")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldProdBackBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鏀瑰埗鍑哄簱鍗�
+ else if (HBillType == "3825")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldRepairOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鏀瑰埗鍏ュ簱鍗�
+ else if (HBillType == "3826")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldRepairInBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鍏朵粬鍏ュ簱鍗�
+ else if (HBillType == "3827")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldOtherInBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鍏朵粬鍑哄簱鍗�
+ else if (HBillType == "3828")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldOtherOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鏆傚�熷叆搴撳崟
+ else if (HBillType == "3829")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldBorrowInBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鏆傚�熷嚭搴撳崟
+ else if (HBillType == "3830")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldBorrowOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鎶ュ簾鍏ュ簱鍗�
+ else if (HBillType == "3831")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldScrapInBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鎶ュ簾鍑哄簱鍗�
+ else if (HBillType == "3832")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldScrapOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鐩存帴璋冩嫧鍗�
+ else if (HBillType == "3814")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldProdMoveBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鍒嗘璋冨嚭鍗�
+ else if (HBillType == "3840")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldMoveStockStepOutBill_BarCodeQty);
+ }
+ //鍣ㄥ叿鍒嗘璋冨叆鍗�
+ else if (HBillType == "3841")
+ {
+ HBarCodeQty = DBUtility.ClsPub.isLong(oSystemParameter.omodel.Sc_MouldMoveStockStepInBill_BarCodeQty);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ #endregion
+
try
{
- ds = oCn.RunProcReturn("exec h_p_WMS_AddMouldBarCode_New '" + sBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HSCWhID.ToString() + "," + HSCSPID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HRedBlueFlag + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddMouldBarCode_New");
+ ds = oCn.RunProcReturn("exec h_p_WMS_CheckMouldBarCode_Add '" + sBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'," + HWhID.ToString() + "," + HSPID.ToString() + "," + HSCWhID.ToString() + "," + HSCSPID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HRedBlueFlag + "','" + HMaker + "'," + HStockOrgID.ToString() + "," + HStockOutOrgID.ToString() + "," + HBarCodeQty.ToString(), "h_p_WMS_CheckMouldBarCode_Add");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -482,6 +571,168 @@
#endregion
+ #region 妯″叿璋冩嫧鍗� 涓婁紶鐢熷崟
+
+ /// <summary>
+ /// 妯″叿璋冩嫧鍗曟柊澧炰笂浼�
+ /// </summary>
+ /// <returns></returns>
+ [Route("MouldController/set_SaveMouldProdMoveBill_Json")]
+ [HttpPost]
+ public object set_SaveMouldProdMoveBill_Json([FromBody] JObject oMain)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ DAL.ClsSc_MouldProdMoveBill BillNew = new DAL.ClsSc_MouldProdMoveBill();
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ try
+ {
+ string sMainStr = "[" + msg1.ToString() + "]";
+ List<Model.ClsSc_MouldProdMoveBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldProdMoveBillMain>>(sMainStr);
+
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, mainList[0].HBillNo, BillStatus, mainList[0].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(mainList[0].HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍥哄畾璧嬪��=================================
+ BillNew.omodel.HYear = sYear;
+ BillNew.omodel.HPeriod = sPeriod;
+ BillNew.omodel.HBillType = "3814";
+ BillNew.omodel.HInterID = mainList[0].HInterID;
+ BillNew.omodel.HBillNo = mainList[0].HBillNo;
+ BillNew.omodel.HDate = mainList[0].HDate;
+ BillNew.omodel.HRemark = mainList[0].HRemark;
+ BillNew.omodel.HMaker = mainList[0].HMaker;
+ BillNew.omodel.HSTOCKORGID = mainList[0].HSTOCKORGID;
+ DBUtility.ClsPub.CurUserName = mainList[0].HMaker;
+ //====================================================
+ BillNew.omodel.HSupID = mainList[0].HSupID;
+ BillNew.omodel.HSupTypeID = mainList[0].HSupTypeID;
+ BillNew.omodel.HEmpID = mainList[0].HEmpID;
+ BillNew.omodel.HManagerID = mainList[0].HManagerID;
+ BillNew.omodel.HSecManagerID = mainList[0].HSecManagerID;
+ BillNew.omodel.HKeeperID = mainList[0].HKeeperID;
+ BillNew.omodel.HDeptID = mainList[0].HDeptID;
+ BillNew.omodel.HWHID = mainList[0].HWHID;
+ BillNew.omodel.HSCWHID = mainList[0].HSCWHID;
+ BillNew.omodel.HExplanation = mainList[0].HExplanation;
+ BillNew.omodel.HInnerBillNo = mainList[0].HInnerBillNo;
+ BillNew.omodel.HRedBlueFlag = mainList[0].HRedBlueFlag;
+ BillNew.omodel.HStockStyle = mainList[0].HStockStyle;
+ BillNew.omodel.HStockInOrgID = mainList[0].HStockInOrgID;
+ BillNew.omodel.HStockOutOrgID = mainList[0].HStockOutOrgID;
+ //瀛愯〃璧嬪��
+ ds = oCn.RunProcReturn("exec h_p_Sc_GetMouldStockBill_Temp " + BillNew.omodel.HInterID.ToString() + ",'" + BillNew.omodel.HBillType + "'", "h_p_Sc_GetMouldStockBill_Temp");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵爜淇℃伅锛岃鍏堟壂鎻忔潯鐮侊紝纭鏃犺鍚庡啀鎻愪氦锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ for (int i = 0; i <= ds.Tables[0].Rows.Count - 1; i++)
+ {
+ Model.ClsSc_MouldProdMoveBillSub oSub = new Model.ClsSc_MouldProdMoveBillSub();
+ //鍥哄畾璧嬪��========================================
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HRemark"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HSourceBillType"]);
+ oSub.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HSourceBillNo"]);
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HRelationMoney"]);
+ //=============================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HAuxPropID"]);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSecUnitID"]);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(ds.Tables[0].Rows[i]["HSecUnitRate"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HBatchNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBatchNo"]);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQtyRel = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HQtyRel"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HMoney"]);
+ oSub.HDesignLife = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HDesignLife"]);
+ oSub.HLeaveLife = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HLeaveLife"]);
+ oSub.HUseLife = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HUseLife"]);
+ oSub.HUseLifeQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HUseLifeQty"]);
+ oSub.HNewLifeQty = DBUtility.ClsPub.isDoule(ds.Tables[0].Rows[i]["HNewLifeQty"]);
+ oSub.HWHID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HWHID"]);
+ oSub.HSCWHID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSCWHID"]);
+ oSub.HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSPID"]);
+ oSub.HSCSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSCSPID"]);
+ oSub.HSPGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSPGroupID"]);
+ oSub.HBarCode = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBarCode"]);
+ oSub.HCorrespondentTypeID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HCorrespondentTypeID"]);
+ oSub.HCorrespondentID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HCorrespondentID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HStockOrgID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HStockOrgID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOtherOrgID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[i]["HOtherOrgID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HOWNERTYPEID"]);
+ BillNew.DetailColl.Add(oSub);
+ }
+ }
+ //淇濆瓨
+ bool bResult;
+ bResult = BillNew.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ 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
+
#endregion
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 605cead..c405028 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -489,7 +489,7 @@
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>04/28/2024 17:32:35</publishTime>
+ <publishTime>05/13/2024 10:26:00</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index d89ece0..6e704ac 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OverProdReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OverProdReport.cs"
index 4f33691..3f029ac 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OverProdReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_OverProdReport.cs"
@@ -191,21 +191,21 @@
//}
BCol = 7;
//鑾峰彇鍔ㄦ�佸唴瀹� 锛堟暟閲忎俊鎭級
- for (int row = 0; row <= grdMain.RowCount - 1; row++)
- {
- for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
- {
- //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
- //HMaterID = DBUtility.ClsPub.isLong(grdMain.Columns[col].Tag);
- //HEmpID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HEmpID")].Value);
- //HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HProcID")].Value);
- DsQty = SubCn.RunProcReturn("exec h_p_CCBB", "Gy_Czygl");
- if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
- {
- //grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
- }
- }
- }
+ //for (int row = 0; row <= grdMain.RowCount - 1; row++)
+ //{
+ // for (int col = BCol; col <= grdMain.ColumnCount - 1; col++)
+ // {
+ // //HDeptID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HDeptID")].Value);
+ // //HMaterID = DBUtility.ClsPub.isLong(grdMain.Columns[col].Tag);
+ // //HEmpID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HEmpID")].Value);
+ // //HProcID = DBUtility.ClsPub.isLong(grdMain.Rows[row].Cells[Fun_GetCol("HProcID")].Value);
+ // DsQty = SubCn.RunProcReturn("exec h_p_CCBB", "Gy_Czygl");
+ // if (DsQty != null && DsQty.Tables[0].Rows.Count > 0)
+ // {
+ // //grdMain.Rows[row].Cells[col].Value = DBUtility.ClsPub.isDoule(DsQty.Tables[0].Rows[0]["HQty"], 2);
+ // }
+ // }
+ //}
//璁剧疆鍚堣鍒�
string sTotalCol = "";
--
Gitblit v1.9.1