From 649d2f185800392aa0a0a44d437862afe9d863e6 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期四, 23 十二月 2021 15:39:35 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/源单/Cls_S_Xt_BaseBill.cs | 57 ++++
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 149 +++++-----
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache | 0
WebAPI/Controllers/WebAPIController.cs | 39 +++
WebAPI/Controllers/ProductInController.cs | 92 +++++++
Model/obj/Release/Model.csprojAssemblyReference.cache | 0
WarM/条码打印/Gy_BarCodeBill.cs | 118 ++++++++
DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs | 64 ++++
WebAPI/Controllers/SellOutController.cs | 85 ++++++
DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs | 35 ++
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/WebServer.cs | 35 ++
WarM/条码打印/Gy_BarCodeBill.designer.cs | 61 ++--
WebAPI/WebAPI.csproj | 4
14 files changed, 632 insertions(+), 107 deletions(-)
diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
index a2890db..938647e 100644
--- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
+++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_Ctl.cs
@@ -14,6 +14,41 @@
+ //宸蹭笂浼犲垪琛ㄧ晫闈紝鎾ら攢鍔熻兘锛屽垹闄MS琛ㄥ拰鏈湴鍑哄叆搴撳崟璁板綍锛屽苟鏇存柊TEMP琛ㄤ腑鐨勪笂浼犲瓧娈� HRelationInterID=0
+ public bool DeleteICStockBillAndWMS(Int64 sHInterID, string sHBillNo, string sHBillType, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ oCn.BeginTran();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + sHInterID + ",'" + sHBillNo + "','" + sHBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鎾ら攢鍗曟嵁澶辫触锛屾暟鎹簱杩炴帴澶辫触锛�";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 0)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ oCn.Commit();
+ return true;
+ }
+ else
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+
//鍒ゆ柇鏉＄爜 鍏ュ簱鏁伴噺鏄惁瓒呰繃鏉＄爜鏈韩棰濆畾鏁伴噺
public bool IsBarCode(string sBarCode, string sBillType, bool sRedBlueFlag, ref double sQty, ref string sReturn)
{
diff --git a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
index 55bbd3d..204ff44 100644
--- a/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
+++ b/DAL/WMS/ClsKF_PonderationBillMain_Temp_View.cs
@@ -25,6 +25,70 @@
//
+ #region 鍗曟嵁鍒楄〃鏁版嵁澶勭悊
+
+ //鏄剧ず鐗╂枡鏄庣粏鍒楄〃銆佹ā娌诲叿鍒楄〃銆佸厛杩涘厛鍑哄垪琛ㄤ俊鎭�
+ public DataSet GetBillEntry_TmpList(long HInterID, string HBillNo, string HBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ string sSimpleMode = "N"; //鏄惁鍚敤鎵爜绠�鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N)
+
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref sErrMsg) == false)
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涜繑鍥炵墿鏂欐槑缁嗗垪琛ㄦ椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ return null;
+ }
+
+ //鍒ゆ柇鏄惁鍚敤鍣ㄥ叿绠＄悊(Y,N)
+ if (oSystemParameter.omodel.WMS_MouldManagerCtl == "Y") //鍚敤妯℃不鍏风鐞�
+ {
+ sMouldManagerCtl = "Y";
+ }
+ //鍒ゆ柇鏄惁鍚敤鍏堣繘鍏堝嚭绠＄悊(Y,N)锛屾槸鍚﹀惎鐢ㄦ壂鐮佺畝鏄撴ā寮忥紝鍙樉绀哄凡鎵爜婧愬崟璁板綍(Y,N)
+ if (HBillType == "1204") //鐢熶骇棰嗘枡鍗�
+ {
+ if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y") //鐢熶骇棰嗘枡鍗�-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+ if (oSystemParameter.omodel.Kf_MateOutBill_SimpleMode == "Y") //鐢熶骇棰嗘枡鍗�-鎵爜绠�鏄撴ā寮�
+ {
+ sSimpleMode = "Y";
+ }
+ }
+ if (HBillType == "1205" && oSystemParameter.omodel.Kf_SellOutBill_FIFOCtl == "Y") //閿�鍞嚭搴撳崟-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+ if (HBillType == "1211" && oSystemParameter.omodel.Kf_EntrustOutBill_FIFOCtl == "Y") //濮斿鍑哄簱鍗�-鍏堣繘鍏堝嚭鎺у埗
+ {
+ sFIFOCtl = "Y";
+ }
+
+ DataSet DS = oCn.RunProcReturn("exec h_p_WMS_BillEntryTmpList " + HInterID.ToString() + ",'" + HBillType + "','" + sMouldManagerCtl + "','" + sFIFOCtl + "','" + sSimpleMode + "'", "h_p_WMS_BillEntryTmpList");
+ return DS;
+ }
+
+
+ #endregion
+
+
+ public DataSet GetKf_ICStockBillList(string sHBillType, string sHMaker, Int64 sHOWNERID)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds = oCn.RunProcReturn("exec h_p_Kf_ICStockBillList '" + sHBillType + "','" + sHMaker + "'," + sHOWNERID.ToString(), "h_p_Kf_ICStockBillList");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return Ds;
+ }
+ }
+
//鎵弿鏉＄爜杩斿洖鍑哄叆搴撴潯鐮佷复鏃惰〃淇℃伅
public DataSet GetInfoByID_View(long HInterID, string sBillType, string sWhere)
{
diff --git "a/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs" "b/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
index 2c3f12d..027945d 100644
--- "a/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
+++ "b/DAL/\346\272\220\345\215\225/Cls_S_Xt_BaseBill.cs"
@@ -25,7 +25,8 @@
public string sOrderSql2 = "";
public string sKeyCol2 = "";
public string sShowItemSql2 = "";
- public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList();
+ public frmHlpBillList oFrm;
+ //public DAL.frmHlpBillList oFrm = new DAL.frmHlpBillList();
public List<DBUtility.BillSelect> oBillSelectColl = new List<DBUtility.BillSelect>();
public List<DBUtility.BillSelect_A3> oBillSelectColl2 = new List<DBUtility.BillSelect_A3>();
//
@@ -53,6 +54,7 @@
tSQL = sWhere + sCondtion + sOrderSql;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol;
oFrm.Text = mvarReportTitle;
oFrm.lblCaption.Text = mvarReportTitle;
@@ -112,6 +114,7 @@
tSQL = sWhere + sCondtion2 + sOrderSql2;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol2;
oFrm.Text = mvarReportTitle2;
oFrm.lblCaption.Text = mvarReportTitle2;
@@ -168,6 +171,7 @@
tSQL = sWhere + sCondtion2 + sOrderSql2;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol2;
oFrm.Text = mvarReportTitle2;
oFrm.lblCaption.Text = mvarReportTitle2;
@@ -257,6 +261,7 @@
tSQL = sWhere + sCondtion + sOrderSql;
try
{
+ oFrm = new frmHlpBillList();
oFrm.sPrimaryCol = sKeyCol;
oFrm.Text = mvarReportTitle;
oFrm.lblCaption.Text = mvarReportTitle;
@@ -295,6 +300,56 @@
return true;
}
+ //鏍规嵁婧愬崟鍙� 妯℃嫙鏌ヨ鏁版嵁
+ /// <summary>
+ /// 鏄剧ず鏁版嵁
+ /// </summary>
+ /// <param name="sWhere">涓籗QL</param>
+ /// <param name="sCondtion">杩囨护鏉′欢</param>
+ /// <param name="sOrderSql">鎺掑簭鏉′欢</param>
+ /// <param name="sKeyCol">涓嶅彲閲嶅鍒�</param>
+ /// <returns></returns>
+ public virtual bool RefreshBySourceBillNo(string sWhere)
+ {
+ string sErr = "";
+ string tSQL;
+ ClsCN oCn = new ClsCN();
+ tSQL = " select hmainid,hsubid,鍗曟嵁鍙� from " + ViewName + sWhere + sOrderSql;
+ try
+ {
+ DataSet ds = oCn.RunProcReturn(tSQL, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ return false;
+ }
+ //杩斿洖鏁版嵁鍒伴泦鍚堜腑
+ oBillSelectColl.Clear();
+
+ //寰幆 閫変腑琛�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ BillSelect oSelect = new BillSelect();
+ oSelect.BillNo = ClsPub.isStrNull(ds.Tables[0].Rows[i]["鍗曟嵁鍙�"]);
+ oSelect.BillMainID = ClsPub.isLong(ds.Tables[0].Rows[i]["hmainid"]);
+ oSelect.BillSubID = ClsPub.isLong(ds.Tables[0].Rows[i]["hsubid"]);
+ oSelect.BillTitle = mvarReportTitle;
+ oSelect.BillType = mvarItemKey;
+ oBillSelectColl.Add(oSelect);
+ }
+ //
+ if (oBillSelectColl.Count > 0)
+ return true;
+ else
+ return false;
+ }
+ catch (Exception e)
+ {
+ sErr = e.Message;
+ }
+ return true;
+ }
+
+
}
}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 9f5519e..a1123a1 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
index 07206dc..7bf5a5e 100644
--- a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.csprojAssemblyReference.cache b/Model/obj/Release/Model.csprojAssemblyReference.cache
new file mode 100644
index 0000000..0a0fd3c
--- /dev/null
+++ b/Model/obj/Release/Model.csprojAssemblyReference.cache
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index bf863fe..7987c2b 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -1832,7 +1832,14 @@
//grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (cmbHBarCodeType.Text == "鎵规鏉＄爜" && CampanyName == "鍗氭棩绉戞妧")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
@@ -1882,7 +1889,14 @@
grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
- grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ if (cmbHBarCodeType.Text == "鎵规鏉＄爜" && CampanyName == "鍗氭棩绉戞妧")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�"|| cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
|| cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
@@ -2505,6 +2519,106 @@
}
}
+ private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+ {
+ long sHOrgID = -1;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+ {
+ sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ }
+
+ if (txtHSourceBillNo.Text.Length < 4)
+ {
+ MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+ return;
+ }
+ //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
+ if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
+ if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+ {
+ DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
+ if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POInStockBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
+ {
+ DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
+ if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
+ {
+ DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
+ if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+ return;
+ }
+
+ }
+ }
+
+
+
+
+
}
}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
index c63493e..167abf2 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.designer.cs"
@@ -51,6 +51,8 @@
this.tb = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.gl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.BatchNo = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.lblCaption = new System.Windows.Forms.Label();
@@ -67,7 +69,7 @@
this.label1 = new System.Windows.Forms.Label();
this.cmdHEmpID = new System.Windows.Forms.Button();
this.cmdSourceBillNo = new System.Windows.Forms.Button();
- this.textBox2 = new System.Windows.Forms.TextBox();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label();
@@ -104,8 +106,6 @@
this.grdSub = new System.Windows.Forms.DataGridView();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.grdList = new System.Windows.Forms.DataGridView();
- this.BatchNo = new System.Windows.Forms.ToolStripButton();
- this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -374,6 +374,25 @@
this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.gl.Click += new System.EventHandler(this.gl_Click);
//
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
+ //
+ // BatchNo
+ //
+ this.BatchNo.AutoSize = false;
+ this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+ this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+ this.BatchNo.Name = "BatchNo";
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
+ this.BatchNo.Text = "鎵规";
+ this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
+ //
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
@@ -438,7 +457,7 @@
this.gbUp.Controls.Add(this.label1);
this.gbUp.Controls.Add(this.cmdHEmpID);
this.gbUp.Controls.Add(this.cmdSourceBillNo);
- this.gbUp.Controls.Add(this.textBox2);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
this.gbUp.Controls.Add(this.label14);
this.gbUp.Controls.Add(this.cmbSourceBillType);
this.gbUp.Controls.Add(this.label10);
@@ -547,13 +566,14 @@
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
//
- // textBox2
+ // txtHSourceBillNo
//
- this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textBox2.Location = new System.Drawing.Point(394, 46);
- this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(166, 21);
- this.textBox2.TabIndex = 41;
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(394, 46);
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(166, 21);
+ this.txtHSourceBillNo.TabIndex = 41;
+ this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
//
// label14
//
@@ -965,25 +985,6 @@
this.grdList.Size = new System.Drawing.Size(929, 288);
this.grdList.TabIndex = 46;
//
- // BatchNo
- //
- this.BatchNo.AutoSize = false;
- this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
- this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
- this.BatchNo.Name = "BatchNo";
- this.BatchNo.Size = new System.Drawing.Size(36, 47);
- this.BatchNo.Text = "鎵规";
- this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
- //
- // toolStripSeparator7
- //
- this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
- //
// Gy_BarCodeBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1068,7 +1069,7 @@
private System.Windows.Forms.Label label10;
private System.Windows.Forms.ComboBox cmbSourceBillType;
private System.Windows.Forms.Button cmdSourceBillNo;
- private System.Windows.Forms.TextBox textBox2;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.ToolStripButton tc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 13a7233..fc04bad 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -165,6 +165,94 @@
}
}
+
+
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱缂撳瓨鍒楄〃缂栬緫鎸夐挳 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("ProdIn/ProdInDetaiNew")]
+ [HttpGet]
+ public object ProdInDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ /// <summary>
+ /// 杩斿洖浜у搧鍏ュ簱鎵爜鏄庣粏
+ /// </summary>
+ /// <returns></returns>
+ [Route("ProductIn/DisPlayBarCodeList_Json")]
+ [HttpGet]
+ public object DisPlayBarCodeList_Json(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
+ {
+ try
+ {
+ ds = webserver.GetBarcodeList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
+ if (ds == null || ds.Tables[3].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[3];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
[Route("ProductIn/DisBillEntryList_Mate_Webs_Json")]
[HttpGet]
public object DisBillEntryList_Mate_Webs_Json(string HBillType, string sWhere)
@@ -210,6 +298,7 @@
[HttpGet]
public object set_SavePonderationBillMain_Temp_Source_Fast_Json(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
{
+ string aa = "";
try
{
// DataSet ds = new DataSet();
@@ -217,6 +306,7 @@
string sWhere = " Where 鍗曟嵁鍙� like '%" + HSourceBillNo.Trim() + "%'";
if (HSourceBillType == "3710")
{
+ aa = "鎵ц浜�";
ds = webserver.GetSc_ICMOBillList(sWhere + " ");
}
if (HSourceBillType == "3711")
@@ -227,7 +317,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒";
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍,婧愬崟绫诲瀷鏈夐敊璇紒"+aa;
objJsonResult.data = null;
return objJsonResult; ;
}
diff --git a/WebAPI/Controllers/SellOutController.cs b/WebAPI/Controllers/SellOutController.cs
index b4a122e..3e0e9a6 100644
--- a/WebAPI/Controllers/SellOutController.cs
+++ b/WebAPI/Controllers/SellOutController.cs
@@ -64,6 +64,91 @@
}
+ /// <summary>
+ /// 閿�鍞嚭搴撶紦瀛樺垪琛ㄧ紪杈戞寜閽� 鑾峰彇琛ㄤ綋淇℃伅
+ /// </summary>
+ /// <param name="HSourceBillNo"></param>
+ /// <returns></returns>
+ [Route("SellOut/SellOutDetaiNew")]
+ [HttpGet]
+ public object SellOutDetaiNew(string HInterID)
+ {
+
+ DataSet ds;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇閿�鍞嚭搴撶紪杈戞暟鎹�
+ string sql = "select 鏁伴噺 HQty,搴旀敹鏁伴噺 HQtyMust,鐗╂枡浠ｇ爜 HMaterNumber,鐗╂枡鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterModel,婧愬崟涓诲唴鐮� HSourceInterID,婧愬崟瀛愬唴鐮� HSourceEntryID,婧愬崟鍗曞彿 HSourceBillNo,鎵规 HBatchNo,杈呭姪灞炴�� HAuxPropID,璁″垝璺熻釜鍙� HMTONo,ck HWHID from h_v_SelloutDetail where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_SelloutDetail");
+
+ list.Add(ds.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+
+
+ //宸蹭笂浼犲垪琛ㄥ埛鏂�
+ [Route("Web/DisBillUpdateLoad_Json")]
+ [HttpGet]
+ public object DisBillUpdateLoad_Json(string HBillType, string HMaker, Int64 HOrgID)
+ {
+ try
+ {
+ ds = webserver.GetDisBillUpdateLoad_Json(HBillType, HMaker, HOrgID);
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+ }
+ 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;
+ }
+ }
+
+
+
[Route("SellOut/GetMAXNum")]
[HttpGet]
public object GetMAXNum()
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 8efa4cc..c4dec73 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -187,6 +187,45 @@
}
+
+ //鎾ら攢缂撳瓨鍒楄〃璁板綍
+ [Route("Web/Rescind_Json")]
+ [HttpGet]
+ public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+ {
+ string sErrMsg = string.Empty;
+ try
+ {
+ if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ 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)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+
//鍒犻櫎缂撳瓨鍒楄〃璁板綍
[Route("Web/Delete_Json")]
[HttpGet]
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0db68b7..fdef600 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/22/2021 13:51:29</publishTime>
+ <publishTime>12/22/2021 22:01:30</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/22/2021 13:51:29</publishTime>
+ <publishTime>12/22/2021 22:01:30</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/22/2021 13:51:28</publishTime>
+ <publishTime>12/22/2021 22:01:29</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/22/2021 13:51:28</publishTime>
+ <publishTime>12/22/2021 22:01:29</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/22/2021 13:51:26</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/22/2021 13:51:26</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:25</publishTime>
+ <publishTime>12/22/2021 19:58:31</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/22/2021 13:51:26</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/22/2021 13:51:26</publishTime>
+ <publishTime>12/22/2021 22:01:27</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/22/2021 13:51:24</publishTime>
+ <publishTime>12/22/2021 22:01:25</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/22/2021 13:51:24</publishTime>
+ <publishTime>12/22/2021 22:01:25</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/22/2021 13:51:25</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/22/2021 13:51:25</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/22/2021 13:51:25</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/22/2021 13:51:25</publishTime>
+ <publishTime>12/22/2021 22:01:26</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/22/2021 13:51:31</publishTime>
+ <publishTime>12/22/2021 20:38:25</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll.config">
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/22/2021 13:51:31</publishTime>
+ <publishTime>12/22/2021 20:38:25</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +207,166 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/29/2021 17:42:10</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:33</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/09/2021 09:06:27</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/10/2021 08:30:51</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/10/2021 08:30:52</publishTime>
+ <publishTime>12/22/2021 19:58:34</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/22/2021 13:51:36</publishTime>
+ <publishTime>12/22/2021 22:01:31</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1594a73..a3c8fd6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -173,6 +173,10 @@
<HintPath>..\packages\WebActivatorEx.2.0.6\lib\net40\WebActivatorEx.dll</HintPath>
<Private>True</Private>
</Reference>
+ <Reference Include="WebAPI, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\WebAPI.dll</HintPath>
+ </Reference>
<Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
<Private>True</Private>
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index 6509869..b44ef78 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -7832,5 +7832,40 @@
return ds;
}
#endregion
+
+ /// <summary>
+ /// 杩斿洖鎵爜鏄庣粏淇℃伅
+ /// </summary>
+ public DataSet GetBarcodeList(long HInterID, string HBillNo, string sBillType, ref string sMouldManagerCtl, ref string sFIFOCtl, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View bll = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return bll.GetBillEntry_TmpList(HInterID, HBillNo, sBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref sErrMsg);
+ //DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ //return dal.GetInfoByID_View(HInterID, sBillType, sWhere);
+ }
+
+ //鎾ら攢缂撳瓨鍒楄〃閫変腑鏁版嵁
+ public bool RescindBillList(Int64 sHInterID, string sBillNo, string sBillType, ref string sErrMsg)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_Ctl dal = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
+ if (dal.DeleteICStockBillAndWMS(sHInterID, sBillNo, sBillType, ref sErrMsg))
+ {
+ sErrMsg = "鍒犻櫎鎴愬姛锛�";
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍒犻櫎澶辫触锛�";
+ return false;
+ }
+ }
+
+ //杩斿洖缂撳瓨鍒楄〃宸蹭笂浼犲垪琛ㄤ俊鎭�
+ public DataSet GetDisBillUpdateLoad_Json(string sHBillType, string HMaker, Int64 HOrgID)
+ {
+ DAL.ClsKF_PonderationBillMain_Temp_View dal = new DAL.ClsKF_PonderationBillMain_Temp_View();
+ return dal.GetKf_ICStockBillList(sHBillType, HMaker, HOrgID);
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.1