From 0cf6c137b9217f2f34c8f5bd105929a9f396491c Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 24 二月 2022 17:22:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 837 +++++++++++++++++++++++++++++++++++++++++++++++++
WebAPI/ListModels.cs | 2
WebAPI/Models/HSouceOrderList.cs | 65 +++
WarM/条码打印/Gy_BarCodeBill.designer.cs | 4
WebAPI/WebAPI.csproj | 2
WebAPI/Models/HBarCodeList.cs | 66 +++
WebAPI/Models/json.cs | 3
7 files changed, 970 insertions(+), 9 deletions(-)
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 546555a..bdf497c 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"
@@ -1058,7 +1058,7 @@
this.tabPage3.Location = new System.Drawing.Point(4, 28);
this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Size = new System.Drawing.Size(1397, 419);
+ this.tabPage3.Size = new System.Drawing.Size(1398, 420);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "妗ｆ鍒楄〃";
this.tabPage3.UseVisualStyleBackColor = true;
@@ -1078,7 +1078,7 @@
this.grdList.ReadOnly = true;
this.grdList.RowHeadersWidth = 30;
this.grdList.RowTemplate.Height = 23;
- this.grdList.Size = new System.Drawing.Size(1397, 419);
+ this.grdList.Size = new System.Drawing.Size(1398, 420);
this.grdList.TabIndex = 46;
//
// Gy_BarCodeBill
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 c5143ee..044e63c 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,5 +1,7 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing DBUtility;
+using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -22,8 +24,12 @@
private WebS.WebService1 oWebs = new WebS.WebService1();
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public Int64 HInterID = 0; //鍐呯爜
+ public string ModName = "85";
+ public string HOrgNumber = "";
+ public Int64 HOrgID = -1;
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
-
#region 鏉＄爜鐢熸垚
@@ -169,16 +175,28 @@
{
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 鍗曟嵁鍙�", "h_v_IFCLD_ICMOBillList_Source").Tables[0].Rows.Count;
+ 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)");
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)");
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)");
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)");
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)");
break;
case "閫�璐ч�氱煡鍗�":
break;
@@ -197,7 +215,10 @@
}
ds = new SQLHelper.ClsCN().RunProcReturn(sql, tabname);
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";
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -238,6 +259,814 @@
}
#endregion
+ #region [閫氳繃閫夋嫨鐨勬簮鍗曚俊鎭煡鎵炬簮鍗曟暟鎹甝
+ [Route("Sc_BarCode/SelectReportFromBillList")]
+ [HttpPost]
+ public object SelectReportFromBillList([FromBody] JObject msg)
+ {
+ //List<DBUtility.BillSelect> oList,string HBarCodeType
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HSourceBillType = sArray[1].ToString();
+ string HBarCodeType = sArray[2].ToString();
+ string UserName = sArray[3].ToString();
+ ClsPub.CurUserName = UserName;
+ ListModels oListModels = new ListModels();
+ List<object> ListRows = new List<object>();
+ try
+ {
+
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<DBUtility.BillSelect> oList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DBUtility.BillSelect>>(msg2);
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ HSouceOrderList ordrlist = new HSouceOrderList();
+ switch (oSelectRow.BillType)
+ {
+ case "3710": //鐢熶骇璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList(ds.Tables[0],ordrlist, HBarCodeType));
+ break;
+ case "3711": //鐢熶骇姹囨姤鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1102": //閲囪喘璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1103": //鏀舵枡閫氱煡鍗�
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1601": //濮斿璁㈠崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_EntrustOrderList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1403": //閫�璐ч�氱煡鍗�
+ break;
+ case "1203": //鍏朵粬鍏ュ簱鍗�
+ break;
+ case "1207": //鐩存帴璋冩嫧鍗�
+ break;
+ case "1239": //閲囪喘閫�鏂欏崟
+ break;
+ case "1244": //鐢熶骇閫�鏂欏崟
+ break;
+ case "1255": //缁勮鎷嗗嵏鍗�
+ break;
+ default:
+ break;
+ }
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇鏁版嵁鎴愬姛!";
+ objJsonResult.data = null;
+ objJsonResult.list = ListRows;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = ListRows;
+ }
+ return objJsonResult;
+ }
+
+ public object HSourceOrderList(DataTable dt, HSouceOrderList ordrlist,string HBarCodeType)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = 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.HSourceBillNo = dt.Rows[i]["鍗曟嵁鍙�"].ToString();
+ ordrlist.HBillType = dt.Rows[i]["HBillType"].ToString();
+ ordrlist.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.ToString();
+ ordrlist.HSupID = dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].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.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName = dt.Rows[i]["瀹㈡埛"].ToString();
+ ordrlist.HCusType = dt.Rows[i]["瀹㈡埛鍨嬪彿"].ToString();
+ ordrlist.HPinfanBarCode = dt.Rows[i]["HPinfanBarCode"].ToString();
+ ordrlist.HPinfan = dt.Rows[i]["HPinfan"].ToString();
+ ordrlist.HSourceName = dt.Rows[i]["鐢熶骇绾�"].ToString();
+ ordrlist.HEndDate = dt.Rows[i]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�"|| HBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯"|| HBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ }
+ return ordrlist;
+ }
+
+ public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)
+ {
+ for (int i = 0; i < dt.Rows.Count; i++)
+ {
+ ordrlist.HQty = 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.HDate = dt.Rows[i]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ ordrlist.HShowDate = DateTime.Now.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.HRemark = dt.Rows[i]["澶囨敞"].ToString();
+ ordrlist.HMTONo = dt.Rows[i]["璁″垝璺熻釜鍙�"].ToString();
+ if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈敓鎴愭潯鐮佹暟閲�"].ToString();
+ }
+ else if (HBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+ {
+ ordrlist.HMinQty = "1";
+ }
+ else
+ {
+ ordrlist.HMinQty = dt.Rows[i]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ ordrlist.HMaker = ClsPub.CurUserName;
+ if (HSourceBillType== "鏀舵枡閫氱煡鍗�"|| HSourceBillType== "閲囪喘璁㈠崟"|| HSourceBillType=="濮斿璁㈠崟"|| HSourceBillType== "閲囪喘鍏ュ簱鍗�")
+ {
+ ordrlist.HInnerBillNo = dt.Rows[i]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
+ ordrlist.HSupID= dt.Rows[i]["hsupid"].ToString();
+ ordrlist.HSupNumber = dt.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString();
+ ordrlist.HSupName = dt.Rows[i]["渚涘簲鍟�"].ToString();
+ if (HSourceBillType == "鏀舵枡閫氱煡鍗�")
+ {
+ if (dt.Rows[i]["鏄惁璧犲搧"].ToString() == "鏄�")
+ {
+ ordrlist.HGiveAwayFlag = 1;
+ }
+ else
+ {
+ ordrlist.HGiveAwayFlag = 0;
+ }
+ }
+ }
+ if (HSourceBillType == "閫�璐ч�氱煡鍗�")
+ {
+ ordrlist.HCusID = dt.Rows[i]["HCusID"].ToString();
+ ordrlist.HCusNumber = dt.Rows[i]["瀹㈡埛浠ｇ爜"].ToString();
+ ordrlist.HCusName= dt.Rows[i]["瀹㈡埛"].ToString();
+ }
+ if (HSourceBillType == "鍏朵粬鍏ュ簱鍗�")
+ {
+ 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();
+ }
+ }
+ return ordrlist;
+ }
+
+ #endregion
+
+ #region [鏉＄爜鐢熸垚鎺ュ彛]
+ [Route("Sc_BarCode/Sub_SaveBill")]
+ [HttpPost]
+ public object Sub_SaveBill([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HOrgType = sArray[1].ToString();
+ string HSourceBillType = sArray[2].ToString();
+ string HSelectBarCodeType = sArray[3].ToString();
+ string CampanyName = sArray[4].ToString()=="xxx"?"": sArray[4].ToString();
+ string UserName = sArray[5].ToString();
+
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return objJsonResult;
+ }
+ if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //瀹㈡埛瀹氬埗
+ }
+ else
+ {
+ //鐢熸垚鏉＄爜
+ SaveBarCode(msg2, HSelectBarCodeType, CampanyName);
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触!"+e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[鍗曟嵁瀹屾暣鎬у垽鏂璢
+ private bool Sub_AllowSave(string msg2, string HSelectBarCodeType)
+ {
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+
+ string sHRemark = "";
+ for (int i = 0; i < ordrlist.Count; i++)
+ {
+ long HSno = i + 1; // 搴忓彿
+ string HBarCodeType = HSelectBarCodeType; // 鏉＄爜绫诲瀷
+ string HSourceBillNo = DBUtility.ClsPub.isStrNull(ordrlist[i].HBillNo); // 婧愬崟鍗曞彿
+ long HMaterID = DBUtility.ClsPub.isLong(ordrlist[i].HMaterID); // 鐗╂枡鍐呯爜
+ string HBatchNo = DBUtility.ClsPub.isStrNull(ordrlist[i].HBatchNo); // 鎵瑰彿
+ long HAuxPropID = DBUtility.ClsPub.isLong(ordrlist[i].HAuxPropID); // 杈呭姪灞炴�D
+ double HSourceQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // 婧愬崟鏁伴噺
+ double HQty = DBUtility.ClsPub.isDoule(ordrlist[i].HQty); // 鏁伴噺
+ double HMinQty = DBUtility.ClsPub.isDoule(ordrlist[i].HMinQty); // 鏈�灏忓寘瑁呮暟
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇�";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sHRemark;
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region[鏉＄爜鐢熸垚鏂规硶]
+ private object SaveBarCode(string msg2, string HSelectBarCodeType, string CampanyName)
+ {
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ string HNumber = ""; //鐗╂枡鍐呯爜
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ int HBQty = 0; //绠辨暟
+ double HQty = 0; //鏁伴噺
+ string WeiShu = ""; //灏炬暟
+ int LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string HBatchNo = ""; //鎵规
+ string HYasuoji = ""; //鍘嬬缉鏈�
+ string HModelName = ""; //鏈哄瀷
+ string HICMOBillNo = ""; //婧愬崟鍙�
+ string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
+ string HBarCodeDate = ""; //鏉＄爜鏃ユ湡
+ int k = 0;
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ DataSet Ds;
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+ for (int j = 0; j < ordrlist.Count; j++)
+ {
+ if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
+ {
+ HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
+ HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = DateTime.Now.ToString();
+ //
+ if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�") //鍗曟嵁鏃ユ湡(鏀舵枡閫氱煡鍗�)
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ else if (HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HEndDate);
+ }
+ else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉＄爜鏃ユ湡
+ {
+ sDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HDate);
+ }
+ HYasuoji = DBUtility.ClsPub.isStrNull(ordrlist[j].HPinfan); //鍘嬬缉鏈轰唬鐮侊紙澶忓疂鐢靛櫒锛�
+ HModelName = DBUtility.ClsPub.isStrNull(ordrlist[j].HCusType); //鏈哄瀷锛堝瀹濈數鍣級
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HSourceBillNo); //鐢熶骇璁㈠崟鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeBatchNo = DBUtility.ClsPub.isStrNull(ordrlist[j].HPinfanBarCode); //鏉＄爜鎵规鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeDate = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber); //鏉＄爜鏃ユ湡锛堝瀹濈數鍣級
+ //
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ {
+ if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ {
+ //鏉＄爜鍓嶇紑 = 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HNumber + sYear + sPeriod + sDay;
+ 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 == "椋為緳")
+ {
+ string HWorksNumber = "";
+ HWorksNumber = CampanyName;
+ if (HWorksNumber == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ巶浠ｇ爜涓嶈兘涓虹┖!";
+ return objJsonResult;
+ }
+ //鏉＄爜鍓嶇紑 = 宸ュ巶浠ｇ爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+ sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+ 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 //閫氱敤鏂规硶
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ 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 (HSelectBarCodeType == "鍝佺鏉＄爜")
+ {
+ if (CampanyName == "浜斾簯") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ {
+ TM = HNumber + ";" + DBUtility.ClsPub.isStrNull(ordrlist[j].HMTONo);
+ }
+ else
+ {
+ TM = HOrgNumber + HNumber;
+ }
+ }
+ else if (HSelectBarCodeType == "鎵规鏉＄爜")
+ {
+ TM = HOrgNumber + HNumber + HBatchNo;
+ }//鍗氭棩鐗规畩澶勭悊
+ else if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ //鐗╂枡缂栫爜+鍗曟嵁鏃ユ湡锛圷YMMDD锛�+娴佹按4浣�
+ sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 4;
+ }
+ else if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯") //鍙﹀澶勭悊浜�
+ {
+ //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+ //sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+ //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 (HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+娴佹按鍙�6浣�-
+ sTMNumber = HMaterNumber + HBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 6;
+ }
+ else if (HSelectBarCodeType == "鍐呴攢鏈烘潯鐮�")
+ {
+ //鍒堕�犳湰閮�1浣嶏紙榛樿1锛�+鏈哄瀷浠ｇ爜5浣嶏紙锛�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�
+ //+鏃�2浣�+鏉＄爜鎵规鐮�2浣�+鍘嬬缉鏈轰唬鐮�1浣�+00+娴佹按鍙�4浣�+鏍￠獙鐮侊紙榛樿0锛�
+ sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00";
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ if (sTMNumber.Length != 16)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜闀垮害涓嶅16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠ｇ爜5浣�:[" + HModelName + "] + 骞存湀鏃�5浣�:[" + HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:[" + HYasuoji + "]+00 ; ";
+ return objJsonResult;
+ }
+ }
+ else if (HSelectBarCodeType == "澶栭攢鏈烘潯鐮�")
+ {
+ //鐗╂枡浠ｇ爜11浣�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠ｆ浛10鏈堜唤锛�+鏃�2浣�+鎵规2浣�+娴佹按鍙�4浣�
+ //sTMNumber = HMaterNumber.Replace(Convert.ToChar("."),Convert.ToChar("")) + HBarCodeDate + HBarCodeBatchNo;
+ sTMNumber = HMaterNumber.Replace(".", "") + HBarCodeDate + HBarCodeBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ if (sTMNumber.Length != 18)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜闀垮害涓嶅18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:[" + HMaterNumber.Replace(".", "") + "]+骞存湀鏃�5浣�:[" + HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];";
+ return objJsonResult;
+ }
+ }
+ else if (HSelectBarCodeType == "鍗婃垚鍝佹潯鐮�")
+ {
+ //鐢熶骇璁㈠崟鍙�+4浣嶆祦姘村彿
+ sTMNumber = HICMOBillNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ LSHlen = 5;
+ }
+ //else if (cmbHBarCodeType.Text == "鎵樼洏鏉＄爜")
+ //{
+ // TM = HOrgNumber + HNumber + LSH2;
+ //}
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+
+ HBQty = HBQty + ClsPub.isInt(ordrlist[j].HBQty);
+ HMinQty = ClsPub.isDoule(ordrlist[j].HMinQty);
+ HSumQty = ClsPub.isDoule(ordrlist[j].HQty);
+ n = 0;
+
+ for (int i = k; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ if (HSelectBarCodeType == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+ else if (HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || HSelectBarCodeType == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�" || HSelectBarCodeType == "璇曞墏鎴愬搧鏉＄爜瑙勫垯"
+ || HSelectBarCodeType == "鍗婃垚鍝佹潯鐮�" || HSelectBarCodeType == "澶栭攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2;
+
+ }
+ else if (HSelectBarCodeType == "鍐呴攢鏈烘潯鐮�")
+ {
+ TM = sTMNumber + LSH2 + "0";
+ }
+ //
+ if (TM.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = TM;
+ barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
+ barcode.HMaterID2 = ordrlist[j].HMaterID;
+ barcode.HMaterNumber2 = ordrlist[j].HMaterNumber;
+ barcode.HMaterName2 = ordrlist[j].HMaterName;
+ barcode.HMaterModel2 = ordrlist[j].HMaterModel;
+ barcode.HPinfan2 = ordrlist[j].HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist[j].HPinfanBarCode;
+
+
+ barcode.HAuxPropID2 = ordrlist[j].HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist[j].HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist[j].HAuxPropName;
+
+ barcode.HUnitID2 = ordrlist[j].HUnitID;
+ barcode.HUnitNumber2 = ordrlist[j].HUnitNumber;
+ barcode.HUnitName2 = ordrlist[j].HUnitName;
+
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist[j].HBatchNo;
+ barcode.HSourceInterID2 = ordrlist[j].HMainID;
+ barcode.HSourceEntryID2 = ordrlist[j].HSubID;
+ barcode.HSourceBillNo2 = ordrlist[j].HBillNo;
+ barcode.HSourceBillType2 = ordrlist[j].HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist[j].HBQty;
+ barcode.HSupID2 = ordrlist[j].HSupID;
+ barcode.HSupNumber2 = ordrlist[j].HSupNumber;
+ barcode.HSupName2 = ordrlist[j].HSupName;
+ barcode.HDeptID2 = ordrlist[j].HDeptID;
+ barcode.HDeptNumber2 = ordrlist[j].HDeptNumber;
+ barcode.HDeptName2 = ordrlist[j].HDeptName;
+ barcode.HRemark2 = ordrlist[j].HRemark;
+ barcode.HDate2 = ordrlist[j].HDate;
+ barcode.HShowDate2 = ordrlist[j].HShowDate;
+ barcode.HWhID2 = ordrlist[j].HWhID;
+ barcode.HWhNumber2 = ordrlist[j].HWhNumber;
+ barcode.HWhName2 = ordrlist[j].HWhName;
+ barcode.HSPID2 = ordrlist[j].HSPID;
+ barcode.HSPNumber2 = ordrlist[j].HSPNumber;
+ barcode.HSPName2 = ordrlist[j].HSPName;
+ barcode.HMTONo2 = ordrlist[j].HMTONo;
+ barcode.HCusID2 = ordrlist[j].HCusID;
+ barcode.HCusNumber2 = ordrlist[j].HCusNumber;
+ barcode.HCusName2 = ordrlist[j].HCusName;
+ barcode.HCusType2 = ordrlist[j].HCusType;
+ barcode.HSourceID2 = ordrlist[j].HSourceID;
+ barcode.HSourceNumber2 = ordrlist[j].HSourceNumber;
+ barcode.HSourceName2 = ordrlist[j].HSourceName;
+ barcode.HEndDate2 = ordrlist[j].HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist[j].HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist[j].HInnerBillNo;
+ barcode.HMaker2 = ordrlist[j].HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist[j].HGiveAwayFlag;
+ ListRows.Add(barcode);
+ k = k + 1;
+ n = n + 1;
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
+ Int64 HEntryID = 0;
+ try
+ {
+ oCN.BeginTran();
+ for (int i = 0; i < ListRows.Count; i++)
+ {
+ if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
+ {
+ HWei = ClsPub.isStrNull(ListRows[i].HWei);
+ HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
+ //
+ HBarCodeType = ClsPub.isStrNull(HSelectBarCodeType);
+ if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+ {
+ HBarCodeType = "鍞竴鏉＄爜";
+ }
+ //
+ HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
+ HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
+ HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
+ HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
+ HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
+ HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
+ HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
+ HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
+ HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
+ HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
+ HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
+ HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
+ HSupID = ClsPub.isLong(ListRows[i].HSupID2);
+ HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
+ HWhID = ClsPub.isLong(ListRows[i].HWhID2);
+ HSPID = ClsPub.isLong(ListRows[i].HSPID2);
+ HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
+ HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
+ HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
+ HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
+ HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
+ HCusID = ClsPub.isLong(ListRows[i].HCusID2);
+ HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
+ HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
+ HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
+ HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
+ HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
+ HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + 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 + "')");
+
+
+ //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ //if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ //{
+ // if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ // {
+ // //鏉＄爜鍓嶇紑 = 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HNumber + sYear + sPeriod + sDay;
+ // }
+ // else if (CampanyName == "椋為緳")
+ // {
+ // string HWorksNumber = "";
+ // HWorksNumber = cmbHWorksNumber.Text;
+ // if (HWorksNumber == "")
+ // {
+ // MessageBox.Show("宸ュ巶浠ｇ爜涓嶈兘涓虹┖锛�");
+ // return;
+ // }
+ // //鏉＄爜鍓嶇紑 = 宸ュ巶浠ｇ爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+ // sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ // else //閫氱敤鏂规硶
+ // {
+ // //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ // sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ // }
+ //}
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ oCN.Commit();
+ List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
+ //鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
+ string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index fc9e98b..f9d1ad9 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1954,6 +1954,6 @@
List<Models.ClsSc_ProcessReportSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_ProcessReportSub>>(jsonString);
return list;
}
-
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
new file mode 100644
index 0000000..9ac3310
--- /dev/null
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -0,0 +1,66 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class HBarCodeList
+ {
+ public string HBarCode2 { get; set; } //鏉＄爜缂栧彿
+ public string HBarCodeType2 { get; set; } //鏉＄爜绫诲瀷
+ public string HMaterID2 { get; set; } // "鐗╂枡ID";
+ public string HMaterNumber2 { get; set; } // "鐗╂枡浠ｇ爜";
+ public string HMaterName2 { get; set; } // "鐗╂枡鍚嶇О";
+ public string HMaterModel2 { get; set; } // "瑙勬牸鍨嬪彿";
+ public string HModel2 { get; set; } // "鑷畾涔夎鏍�";
+ public string HAuxPropID2 { get; set; } // "杈呭姪灞炴�D";
+ public string HAuxPropNumber2 { get; set; } // "杈呭姪灞炴�т唬鐮�";
+ public string HAuxPropName2 { get; set; } // "杈呭姪灞炴�у悕绉�";
+ public string HPinfan2 { get; set; } //鍝佺暘
+ public string HPinfanBarCode2 { get; set; } //HPinfanBarCode
+ public string HBatchNo2 { get; set; } //"鎵瑰彿";
+ public int HGiveAwayFlag2 { get; set; } //"鏄惁璧犲搧";
+ public string HUnitID2 { get; set; } //"璁￠噺鍗曚綅ID";
+ public string HUnitNumber2 { get; set; } //"璁￠噺鍗曚綅浠ｇ爜";
+ public string HUnitName2 { get; set; } //"璁￠噺鍗曚綅";
+ public string HQty2 { get; set; } //"鏁伴噺";
+ public string HWei { get; set; } //"灏炬暟";
+ public string HPrint { get; set; } //"鎵撳嵃娆℃暟";
+ public string HSourceInterID2 { get; set; } //"婧愬崟涓籌D";
+ public string HSourceEntryID2 { get; set; } //"婧愬崟瀛怚D";
+ public string HSourceBillNo2 { get; set; } //"婧愬崟鍗曞彿";
+ public string HSourceBillType2 { get; set; } //"婧愬崟绫诲瀷";
+ public string HSeOrderBillNo2 { get; set; } //"閿�鍞鍗曞彿";
+ public string HBarcodeNo { get; set; } //"鎵樺彿";
+ public string HBarcodeQtys { get; set; } //"鎬绘墭鏁�";
+ public string HSupID2 { get; set; } //"渚涘簲鍟咺D";
+ public string HSupNumber2 { get; set; } //"渚涘簲鍟嗕唬鐮�";
+ public string HSupName2 { get; set; } //"渚涘簲鍟�";
+ public string HDeptID2 { get; set; } //"杞﹂棿ID";
+ public string HDeptNumber2 { get; set; } //"杞﹂棿浠ｇ爜";
+ public string HDeptName2 { get; set; } //"杞﹂棿";
+ public string HWhID2 { get; set; } //"浠撳簱ID";
+ public string HWhNumber2 { get; set; } //"浠撳簱浠ｇ爜";
+ public string HWhName2 { get; set; } //"浠撳簱";
+ public string HSPID2 { get; set; } //"浠撲綅ID";
+ public string HSPNumber2 { get; set; } //"浠撲綅浠ｇ爜";
+ public string HSPName2 { get; set; } //"浠撲綅";
+ public string HInstructNo2 { get; set; } //"鎸囦护鍗曞彿";
+ public string HDate2 { get; set; } //"杩涙枡鏃ユ湡";
+ public string HRemark2 { get; set; } //"澶囨敞";
+ public string HMTONo2 { get; set; } //"璁″垝璺熻釜鍙�";
+ public string HCusID2 { get; set; } //"瀹㈡埛ID";
+ public string HCusNumber2 { get; set; } //"瀹㈡埛浠ｇ爜";
+ public string HCusName2 { get; set; } //"瀹㈡埛";
+ public string HCusType2 { get; set; } //"瀹㈡埛鍨嬪彿";
+ public string HEndDate2 { get; set; } //"璁″垝瀹屽伐鏃ユ湡";
+ public string HSourceID2 { get; set; } //"鐢熶骇绾縄D";
+ public string HSourceNumber2 { get; set; } //"鐢熶骇绾夸唬鐮�";
+ public string HSourceName2 { get; set; } //"鐢熶骇绾�";
+ public string HShowDate2 { get; set; } //"鏃ユ湡";
+ public string HInnerBillNo2 { get; set; } //"鍐呴儴閲囪喘璁㈠崟鍙�";
+ public string HMaker2 { get; set; } //"鍒跺崟浜�";
+ public string HEntryID2 { get; set; } //"琛屽彿";
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
new file mode 100644
index 0000000..565e388
--- /dev/null
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -0,0 +1,65 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class HSouceOrderList
+ {
+ public string HMainID { get; set; } //婧愬崟涓籌D
+ public string HSubID { get; set; } //婧愬崟瀛怚D
+ public string HBillNo{get;set;} // "婧愬崟鍗曞彿";
+ public string HSourceBillNo { get; set; } // "婧愬崟鍗曞彿";
+ public string HBillType{get;set;} // "鍗曟嵁绫诲瀷";
+ public string HMaterID{get;set;} // "鐗╂枡ID";
+ public string HMaterNumber{get;set;} // "鐗╂枡浠ｇ爜";
+ public string HMaterName{get;set;} // "鐗╂枡鍚嶇О";
+ public string HMaterModel{get;set;} // "瑙勬牸鍨嬪彿";
+ public string HModel{get;set;} // "鑷畾涔夎鏍�";
+ public string HPinfan{get;set;} // "鍝佺暘";
+ public string HPinfanBarCode{get;set;} // "HPinfanBarCode";
+ public string HAuxPropID{get;set;} // "杈呭姪灞炴�D";
+ public string HAuxPropNumber{get;set;} // "杈呭姪灞炴�т唬鐮�";
+ public string HAuxPropName{get;set;} // "杈呭姪灞炴�у悕绉�";
+ public string HUnitID{get;set;} // "璁￠噺鍗曚綅ID";
+ public string HUnitNumber{get;set;} // "璁￠噺鍗曚綅浠ｇ爜";
+ public string HUnitName{get;set;} // "璁￠噺鍗曚綅鍚嶇О";
+ public string HBarCodeType{get;set;} // "鏉＄爜绫诲瀷";
+ public string HBatchManager{get;set;} // "鏄惁鍚敤鎵规";
+ public string HBatchNo{get;set;} // "鎵瑰彿";
+ public int HGiveAwayFlag{get;set;} // "鏄惁璧犲搧";
+ public string HQty{get;set;} // "鏁伴噺";
+ public string HMinQty{get;set;} // "鏈�灏忓寘瑁呮暟";
+ public string HPackQty{get;set;} // "澶栫鏁�";
+ public string HBQty{get;set;} // "绠辨暟";
+ public string HSupID{get;set;} // "渚涘簲鍟咺D";
+ public string HSupNumber{get;set;} // "渚涘簲鍟嗕唬鐮�";
+ public string HSupName{get;set;} // "渚涘簲鍟�";
+ public string HDeptID{get;set;} // "杞﹂棿ID";
+ public string HDeptNumber{get;set;} // "杞﹂棿浠ｇ爜";
+ public string HDeptName{get;set;} // "杞﹂棿";
+ public string HWhID{get;set;} // "浠撳簱ID";
+ public string HWhNumber{get;set;} // "浠撳簱浠ｇ爜";
+ public string HWhName{get;set;} // "浠撳簱";
+ public string HSPID{get;set;} // "浠撲綅ID";
+ public string HSPNumber{get;set;} // "浠撲綅浠ｇ爜";
+ public string HSPName{get;set;} // "浠撲綅";
+ public string HInstructNo{get;set;} // "鎸囦护鍗曞彿";
+ public string HSeOrderBillNo{get;set;} // "閿�鍞鍗曞彿";
+ public string HDate{get;set;} // "杩涙枡鏃ユ湡";
+ public string HRemark{get;set;} // "澶囨敞";
+ public string HMTONo{get;set;} // "璁″垝璺熻釜鍙�";
+ public string HCusID{get;set;} // "瀹㈡埛ID";
+ public string HCusNumber{get;set;} // "瀹㈡埛浠ｇ爜";
+ public string HCusName{get;set;} // "瀹㈡埛";
+ public string HCusType{get;set;} // "瀹㈡埛鍨嬪彿";
+ public string HEndDate{get;set;} // "璁″垝瀹屽伐鏃ユ湡";
+ public string HSourceID{get;set;} // "鐢熶骇绾縄D";
+ public string HSourceNumber{get;set;} // "鐢熶骇绾夸唬鐮�";
+ public string HSourceName{get;set;} // "鐢熶骇绾�";
+ public string HShowDate{get;set;} // "鏃ユ湡";
+ public string HInnerBillNo{get;set;} // "鍐呴儴閲囪喘璁㈠崟鍙�";
+ public string HMaker{get;set;} // "鍒跺崟浜�";
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/json.cs b/WebAPI/Models/json.cs
index ed49eab..edf95f6 100644
--- a/WebAPI/Models/json.cs
+++ b/WebAPI/Models/json.cs
@@ -11,9 +11,8 @@
public int count { get; set; }
public string Message { get; set; }
public object data { get; set; }
-
public List<object> list { get; set; }
-
+ public Dictionary<object, object> Dictlist { get; set; }
public string Verify { get; set; }
public string HInterID { get; set; }
}
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3c1b5e5..f1be162 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -523,6 +523,8 @@
<Compile Include="Models\ClsWW_PPBomBillSub.cs" />
<Compile Include="Models\Cls_InventoryAnalysisList.cs" />
<Compile Include="Models\GetWeekList.cs" />
+ <Compile Include="Models\HBarCodeList.cs" />
+ <Compile Include="Models\HSouceOrderList.cs" />
<Compile Include="Models\jsonScanline.cs" />
<Compile Include="Models\ScanLineCode.cs" />
<Compile Include="Models\宸ヨ祫绠＄悊\ClsGy_ClassTimePrj_Model.cs" />
--
Gitblit v1.9.1