From 072542b45cf7cef612f55b445461eaf8d3765a6b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 26 三月 2024 17:12:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 370 insertions(+), 31 deletions(-)
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 044e63c..7416774 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1,4 +1,5 @@
-锘縰sing DBUtility;
+锘縰sing DAL;
+using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
@@ -68,7 +69,7 @@
}
else
{
- list.Add("");
+ list.Add(CampanyName);
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -131,7 +132,7 @@
list.Add("鍞竴鏉＄爜");
list.Add("鍝佺鏉＄爜");
list.Add("鎵规鏉＄爜");
- //list.Add("鎵樼洏鏉＄爜");
+ list.Add("鎵樼洏鏉＄爜");
}
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -155,6 +156,7 @@
[HttpGet]
public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
List<object> columnNameList = new List<object>();
try
{
@@ -176,39 +178,55 @@
case "鐢熶骇璁㈠崟":
tabname = "h_v_IFCLD_ICMOBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source "+sWhere+ " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙�) as HRowNumber,* from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴') as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇姹囨姤鍗�":
tabname = "h_v_IF_ICMOReportBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "閲囪喘璁㈠崟":
tabname = "h_v_IF_POOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鏀舵枡閫氱煡鍗�":
tabname = "h_v_IF_POInStockBillList_Source";
- count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
+ else
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
break;
case "濮斿璁㈠崟":
tabname = "h_v_IF_EntrustOrderBillList_Source";
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "閫�璐ч�氱煡鍗�":
+ case "鐢熶骇鍏ュ簱鍗�":
+ tabname = "h_v_IF_ProductInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProductInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "鍏朵粬鍏ュ簱鍗�":
+ case "閲囪喘鍏ュ簱鍗�":
+ tabname = "h_v_IF_POStockInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POStockInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
- case "鐩存帴璋冩嫧鍗�":
- break;
- case "閲囪喘閫�鏂欏崟":
+ case "閿�鍞��璐у崟":
+ tabname = "h_v_IF_SellOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBackBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
case "鐢熶骇閫�鏂欏崟":
- break;
- case "缁勮鎷嗗嵏鍗�":
+ tabname = "h_v_IF_MateOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_MateOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
default:
break;
@@ -217,8 +235,8 @@
string aa = ds.Tables[0].Columns[0].ToString();
//ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
//ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
- ds.Tables[0].Columns["hmainid"].ColumnName= "HMainID";
- ds.Tables[0].Columns["hsubid"].ColumnName= "HSubID";
+ ds.Tables[0].Columns["hmainid"].ColumnName = "HMainID";
+ ds.Tables[0].Columns["hsubid"].ColumnName = "HSubID";
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -249,6 +267,34 @@
catch (Exception e)
{
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region [閫氳繃鏉＄爜缂栧彿鑾峰彇HItemId]
+ [Route("Sc_BarCode/Get_HItemId")]
+ [HttpGet]
+ public object Get_HItemId(string sWhere)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList where 鏉＄爜缂栧彿 = '" + sWhere + "'", "h_v_IF_BarCodeBillList");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = e.Message.ToString();
@@ -316,6 +362,30 @@
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
+ case "1202": //鐢熶骇鍏ュ簱
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_ProductInBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_ProductInBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1201": //閲囪喘鍏ュ簱
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_POStockInBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source ", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1247": //閿�鍞��璐�
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_SellOutBackBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_SellOutBackBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1244": //鐢熶骇閫�鏂�
+ //寰楀埌淇℃伅
+ ds = oWebs.getDataSetBySQL("select * from h_v_IF_MateOutBackBillList_Source where HMainID=" + oSelectRow.BillMainID + " and HSubID=" + oSelectRow.BillSubID, "h_v_IF_MateOutBackBillList_Source", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鍐欏叆淇℃伅
+ ListRows.Add(Sub_WriteInForm_InOut(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
case "1403": //閫�璐ч�氱煡鍗�
break;
case "1203": //鍏朵粬鍏ュ簱鍗�
@@ -323,8 +393,6 @@
case "1207": //鐩存帴璋冩嫧鍗�
break;
case "1239": //閲囪喘閫�鏂欏崟
- break;
- case "1244": //鐢熶骇閫�鏂欏崟
break;
case "1255": //缁勮鎷嗗嵏鍗�
break;
@@ -387,6 +455,7 @@
ordrlist.HPinfan = dt.Rows[i]["HPinfan"].ToString();
ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString();
ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -405,6 +474,7 @@
public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)
{
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
for (int i = 0; i < dt.Rows.Count; i++)
{
ordrlist.HQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -428,6 +498,17 @@
ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
ordrlist.HRemark = dt.Rows[i]["澶囨敞"].ToString();
ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+
+ if(HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName != "鐟炰笌绁�")
+ {
+ ordrlist.HFurnaceNO = dt.Rows[i]["鐐夊彿"].ToString();
+ ordrlist.HCoilNO = dt.Rows[i]["閽㈠嵎鎹嗗寘鍙�"].ToString();
+ ordrlist.HheatNO = dt.Rows[i]["鐑鐞�"].ToString();
+ }
+ }
+
if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
{
ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
@@ -478,6 +559,112 @@
return ordrlist;
}
+ //鏍规嵁TABLE鍐欏叆鐣岄潰(鍑哄叆搴撳崟鎹�)
+ private object Sub_WriteInForm_InOut(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType, string HSourceBillType)
+ {
+
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HinitQty = dt.Rows[i]["鍙敓鎴愭潯鐮佹暟閲�"].ToString();
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ ordrlist.HMainID = dt.Rows[i]["HMainID"].ToString();
+ ordrlist.HSubID = dt.Rows[i]["HSubID"].ToString();
+ ordrlist.HBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDeptID = dt.Rows[i]["HDeptID"].ToString();
+ ordrlist.HDeptNumber = dt.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString();
+ ordrlist.HDeptName = dt.Rows[i]["閮ㄩ棬"].ToString();
+ ordrlist.HMaterID = dt.Rows[i]["HMaterID"].ToString();
+ ordrlist.HMaterNumber = dt.Rows[i]["鐗╂枡浠ｇ爜"].ToString();
+ ordrlist.HMaterName = dt.Rows[i]["鐗╂枡鍚嶇О"].ToString();
+ ordrlist.HMaterModel = dt.Rows[i]["瑙勬牸鍨嬪彿"].ToString();
+ ordrlist.HBatchNo = dt.Rows[i]["鎵瑰彿"].ToString();
+ ordrlist.HUnitID = dt.Rows[i]["HUnitID"].ToString();
+ ordrlist.HUnitNumber = dt.Rows[i]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ ordrlist.HUnitName = dt.Rows[i]["璁￠噺鍗曚綅"].ToString();
+ ordrlist.HAuxPropID = dt.Rows[i]["HAuxPropID"].ToString();
+ ordrlist.HAuxPropNumber = dt.Rows[i]["杈呭姪灞炴�т唬鐮�"].ToString();
+ ordrlist.HAuxPropName = dt.Rows[i]["杈呭姪灞炴��"].ToString();
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString();
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ }
+ return ordrlist;
+ }
+ #endregion
+
+ #region [鍚屾璧勬枡]
+ [Route("Sc_BarCode/Sync_data")]
+ [HttpGet]
+ public object Sync_data()
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ try
+ {
+ oCn.RunProc("exec h_p_IF_ERPDataToLocal", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚屾鍩虹璧勬枡鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚屾鍩虹璧勬枡澶辫触锛�" + e;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鎵规]
+ [Route("Sc_BarCode/Batch")]
+ [HttpGet]
+ public object Batch(int HMaterID, string HBatchNo)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ bool b = false;
+ if (HMaterID != 0)
+ {
+ DataSet oDs = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_GetBatchNo " + HMaterID.ToString() + ",'" + HBatchNo + "','" + "" + "','" + "" + "'", "h_p_Gy_BarCodeBill_GetBatchNo");
+ //
+ if (oDs == null && oDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.Message="鐢熸垚鎵规澶辫触锛�";
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0][0]) == "1")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.Message = "鐢熸垚鎵规鎴愬姛锛�";
+ objJsonResult.data = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
+ HBatchNo = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
+ b = true;
+ return objJsonResult;
+ }
+ }
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ if (b == false)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.Message="娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒";
+ return objJsonResult;
+ }
+ else //瀹屽叏灏侀棴
+ {
+ return null;
+ }
+ }
#endregion
#region [鏉＄爜鐢熸垚鎺ュ彛]
@@ -492,10 +679,11 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string HOrgType = sArray[1].ToString();
- string HSourceBillType = sArray[2].ToString();
+ string HSourceBillTypeName = sArray[2].ToString();
string HSelectBarCodeType = sArray[3].ToString();
string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
string UserName = sArray[5].ToString();
+ ClsPub.CurUserName = UserName;
//鑾峰彇鍐呯爜
HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -524,7 +712,7 @@
else
{
//鐢熸垚鏉＄爜
- SaveBarCode(msg2, HSelectBarCodeType, CampanyName);
+ SaveBarCode(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
}
}
catch (Exception e)
@@ -536,7 +724,7 @@
}
return objJsonResult;
}
- #endregion
+ #endregion
#region[鍗曟嵁瀹屾暣鎬у垽鏂璢
private bool Sub_AllowSave(string msg2, string HSelectBarCodeType)
@@ -586,7 +774,7 @@
#endregion
#region[鏉＄爜鐢熸垚鏂规硶]
- private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName)
+ private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName,string HSourceBillTypeName)
{
int LSHlen = 6; //娴佹按鍙烽暱搴�
int SumLen = 10; //鎬婚暱搴�
@@ -613,6 +801,13 @@
int k = 0;
int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+
+ string HCoilNO = "";
+ string HFurnaceNO = "";
+ string HFactory = "";
+ decimal HAuxQty = 0;
+ string HheatNO = "";
+
DataSet Ds;
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -625,6 +820,12 @@
HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
+
+ HCoilNO = ClsPub.isStrNull(ordrlist[j].HCoilNO);
+ HFurnaceNO = ClsPub.isStrNull(ordrlist[j].HFurnaceNO);
+ HFactory = ClsPub.isStrNull(ordrlist[j].HFactory);
+ HAuxQty = ClsPub.isLong(ordrlist[j].HAuxQty);
+ HheatNO = ClsPub.isStrNull(ordrlist[j].HheatNO);
//鏃ユ湡鑾峰彇鏂瑰紡
sDate = DateTime.Now.ToString();
//
@@ -678,6 +879,72 @@
Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
//oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (CampanyName == "鐟炰笌绁�") {
+ var date = DateTime.Now.ToString("yyMMdd");//鏃ユ湡
+ if (HSourceBillTypeName == "鏀舵枡閫氱煡鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-渚涘簲鍟嗕唬鐮�-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+
+ DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_TEZV_BASE from AIS20220308151944..T_PUR_Receive a
+inner join AIS20220308151944..T_PUR_RECEIVEENTRY b on a.FID = b.FID
+left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_TEZV_BASE=pr.FID
+where a.FID={ordrlist[j].HMainID} and b.FENTRYID={ordrlist[j].HSubID}", "T_PUR_Receive");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_TEZV_BASE"].ToString() + "-" + date + "-" + ordrlist[j].HSupNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-" + date + "-" + ordrlist[j].HSupNumber + "-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else if (HSourceBillTypeName == "鐢熶骇鍏ュ簱鍗�")
+ {
+ //鐗╂枡浠ｇ爜-鍖呰鏍囪瘑-鏃ユ湡-缁勭粐浠ｇ爜-鍏綅娴佹按鍙�
+ LSHlen = 8;//娴佹按鍙锋槸8浣�
+ DataSet dataDs = oCN.RunProcReturn($@"select isnull(pr.FNUMBER,'') F_bsv_Base1,a.FPRDORGID from AIS20220308151944..T_PRD_INSTOCK a
+inner join AIS20220308151944..T_PRD_INSTOCKENTRY b on a.FID = b.FID
+join(
+select HERPInterID, HERPEntryID, HInterID, HEntryID from Kf_ICStockBillSub
+)kf on b.FID = kf.HERPInterID and b.FENTRYID = kf.HERPEntryID
+left join AIS20220308151944..T_BAS_PREBDONE pr on b.F_bsv_Base1=pr.FID
+where kf.HInterID = {ordrlist[j].HMainID} and kf.HEntryID = {ordrlist[j].HSubID}", "T_PRD_INSTOCK");
+ if (dataDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ return objJsonResult;
+ }
+ string RQHNumber = "";
+ if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100014")//姹熻嫃
+ {
+ RQHNumber = "1.07.008";
+ }
+ else if (dataDs.Tables[0].Rows[0]["FPRDORGID"].ToString() == "100012")//涓婃捣
+ {
+ RQHNumber = "1.04.008";
+ }
+
+ sTMNumber = ordrlist[j].HMaterNumber + "-" + dataDs.Tables[0].Rows[0]["F_bsv_Base1"].ToString() + "-" + date + "-" + RQHNumber + "-";
+
+ //sTMNumber = ordrlist[j].HMaterNumber + "-鍖呰鏍囪瘑-"+ date + "-缁勭粐浠ｇ爜-";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
}
else //閫氱敤鏂规硶
{
@@ -772,10 +1039,14 @@
LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
LSHlen = 5;
}
- //else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
- //{
- // TM = HOrgNumber + HNumber + LSH2;
- //}
+ else if (HSelectBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ LSHlen = 4; //娴佹按鍙烽暱搴�
+ //鏉＄爜鍓嶇紑 = 鐗╂枡鍐呯爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ }
else
{
objJsonResult.code = "0";
@@ -815,7 +1086,7 @@
{
LSH2 = "0" + LSH2;
}
- if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ if (HSelectBarCodeType == "鍞竴鏉＄爜" || HSelectBarCodeType == "鎵樼洏鏉＄爜")
{
//鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
TM = sTMNumber + LSH2;
@@ -895,6 +1166,12 @@
barcode.HInnerBillNo2 = ordrlist[j].HInnerBillNo;
barcode.HMaker2 = ordrlist[j].HMaker;
barcode.HGiveAwayFlag2 = ordrlist[j].HGiveAwayFlag;
+
+ barcode.HCoilNO = ordrlist[j].HCoilNO;
+ barcode.HFurnaceNO = ordrlist[j].HFurnaceNO;
+ barcode.HFactory = ordrlist[j].HFactory;
+ barcode.HAuxQty = ordrlist[j].HAuxQty;
+ barcode.HheatNO = ordrlist[j].HheatNO;
ListRows.Add(barcode);
k = k + 1;
n = n + 1;
@@ -935,6 +1212,14 @@
string HInnerBillNo = "";
bool HGiveAwayFlag = false;
Int64 HEntryID = 0;
+
+ string HCoilNO2 = "";
+ string HFurnaceNO2 = "";
+ string HFactory2 = "";
+ decimal HAuxQty2 = 0;
+ string HheatNO2 = "";
+ DateTime HProduceDate;
+ DateTime HExpiryDate;
try
{
oCN.BeginTran();
@@ -979,6 +1264,14 @@
HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+
+ HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
+ HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
+ HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
+ HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
+ HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
+ HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
+ HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
@@ -986,7 +1279,8 @@
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
",HGiveAwayFlag " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate " +
") values ("
+ "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
@@ -995,7 +1289,7 @@
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "','" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'" + ")");
//HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
@@ -1030,6 +1324,23 @@
//澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
//
+
+
+ //鏉＄爜鐢熸垚鏃跺悓姝ョ敓鎴愭潯鐮佸嚭鍏ュ簱璁板綍
+ if (HSourceBillTypeName.Trim() == "鐢熶骇鍏ュ簱鍗�" || HSourceBillTypeName.Trim() == "閲囪喘鍏ュ簱鍗�"
+ || HSourceBillTypeName.Trim() == "閿�鍞��璐у崟" || HSourceBillTypeName.Trim() == "鐢熶骇閫�鏂欏崟")
+ {
+ if (!oWebs.set_BarCodeAutoWMS(HInterID, HSourceBillType, HOrgID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ objJsonResult.list = null;
+ return objJsonResult;
+ }
+ }
+
oCN.Commit();
List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
//鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
@@ -1066,6 +1377,34 @@
}
#endregion
+ #region[鏉＄爜鎵撳嵃鏇存柊鎵撳嵃娆℃暟]
+ /// <summary>
+ /// 鏇存柊鎵撳嵃娆℃暟
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <param name="msg2"></param>
+ /// <returns></returns>
+ [Route("Sc_BarCode/UpdateBarcodePrintQty")]
+ [HttpPost]
+ public object UpdateBarcodePrintQty(string msg)
+ {
+ try
+ {
+ oCN.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HitemID in("+msg+")", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏇存柊鎵撳嵃娆℃暟鎴愬姛";
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.ToString();
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
}
--
Gitblit v1.9.1