From 4c25e51217a6122f509c0c07de07cb65f878f71a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 14:31:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WarM/条码打印/Gy_BarCodeBill_XiaBao.cs | 117 +++++++++++++++++------------
WebAPI/Web References/WebS/Reference.cs | 14 +++
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 2
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 93 ++++++++++++++++++++++-
WebAPI/Models/ClsGy_Material_Model.cs | 1
WebAPI/DLL/ClsGy_Material_Ctl.cs | 4
6 files changed, 175 insertions(+), 56 deletions(-)
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
index c02460a..033956e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XiaBao.cs"
@@ -8,6 +8,7 @@
using gregn6Lib;
using Pub_Class;
using System.Threading;
+using System.Text.RegularExpressions;
namespace WarM
{
@@ -37,51 +38,53 @@
public const Int16 HBarCodeTypeCol = 16;
public const Int16 HQtyCol = 17;
public const Int16 HMinQtyCol = 18;
- public const Int16 HBQtyCol = 19;
- public const Int16 HinitQtyCol = 20;
- public const Int16 HISKFPERIODCol = 21;
- public const Int16 HProduceDateCol = 22;
- public const Int16 HExpiryDateCol = 23;
- public const Int16 HEXPUNITCol = 24;
- public const Int16 HEXPPERIODCol = 25;
- public const Int16 HGiveAwayFlagCol = 26;
- public const Int16 HUnitIDCol = 27;
- public const Int16 HUnitNumberCol = 28;
- public const Int16 HUnitNameCol = 29;
- public const Int16 HWhIDCol = 30;
- public const Int16 HWhNumberCol = 31;
- public const Int16 HWhNameCol = 32;
- public const Int16 HSPIDCol = 33;
- public const Int16 HSPNumberCol = 34;
- public const Int16 HSPNameCol = 35;
- public const Int16 HMTONoCol = 36;
- public const Int16 HRemarkCol = 37;
- public const Int16 HDeptIDCol = 38;
- public const Int16 HDeptNumberCol = 39;
- public const Int16 HDeptNameCol = 40;
- public const Int16 HSourceIDCol = 41;
- public const Int16 HSourceNumberCol = 42;
- public const Int16 HSourceNameCol = 43;
- public const Int16 HSupIDCol = 44;
- public const Int16 HSupNumberCol = 45;
- public const Int16 HSupNameCol = 46;
- public const Int16 HGroupIDCol = 47;
- public const Int16 HGroupNumberCol = 48;
- public const Int16 HGroupNameCol = 49;
- public const Int16 HCusIDCol = 50;
- public const Int16 HCusNumberCol = 51;
- public const Int16 HCusNameCol = 52;
- public const Int16 HCusTypeCol = 53;
- public const Int16 HSeOrderBillNoCol = 54;
- public const Int16 HSeOrderSEQCol = 55;
- public const Int16 HInnerBillNoCol = 56;
- public const Int16 HEndDateCol = 57;
- public const Int16 HSourceBillQtyCol = 58;
- public const Int16 HAuxPropFlagCol = 59;
- public const Int16 HBarCodeCol = 60; //鏉＄爜缂栧彿
- public const Int16 HTMNumberCol = 61; //鏉＄爜鍓嶇紑
- public const Int16 HLSHCol = 62; //鐢熸垚鏉＄爜鏃惰幏鍙栧搴旀祦姘村彿
- public const Int16 HBarcodeNoCol = 63; //璁板綍闇�鍥炲～鐨勬祦姘村彿鏁伴噺
+ public const Int16 HPackBarQtyCol = 19; //瑙勬牸鏁伴噺锛屽瓧娈靛唴瀹逛负鎵嬪姩杈撳叆
+ public const Int16 HBQtyCol = 20;
+ public const Int16 HinitQtyCol = 21;
+ public const Int16 HISKFPERIODCol = 22;
+ public const Int16 HProduceDateCol = 23;
+ public const Int16 HExpiryDateCol = 24;
+ public const Int16 HEXPUNITCol = 25;
+ public const Int16 HEXPPERIODCol = 26;
+ public const Int16 HGiveAwayFlagCol = 27;
+ public const Int16 HUnitIDCol = 28;
+ public const Int16 HUnitNumberCol = 29;
+ public const Int16 HUnitNameCol = 30;
+ public const Int16 HWhIDCol = 31;
+ public const Int16 HWhNumberCol = 32;
+ public const Int16 HWhNameCol = 33;
+ public const Int16 HSPIDCol = 34;
+ public const Int16 HSPNumberCol = 35;
+ public const Int16 HSPNameCol = 36;
+ public const Int16 HMTONoCol = 37;
+ public const Int16 HRemarkCol = 38;
+ public const Int16 HDeptIDCol = 39;
+ public const Int16 HDeptNumberCol = 40;
+ public const Int16 HDeptNameCol = 41;
+ public const Int16 HSourceIDCol = 42;
+ public const Int16 HSourceNumberCol = 43;
+ public const Int16 HSourceNameCol = 44;
+ public const Int16 HSupIDCol = 45;
+ public const Int16 HSupNumberCol = 46;
+ public const Int16 HSupNameCol = 47;
+ public const Int16 HGroupIDCol = 48;
+ public const Int16 HGroupNumberCol = 49;
+ public const Int16 HGroupNameCol = 50;
+ public const Int16 HCusIDCol = 51;
+ public const Int16 HCusNumberCol = 52;
+ public const Int16 HCusNameCol = 53;
+ public const Int16 HCusTypeCol = 54;
+ public const Int16 HSeOrderBillNoCol = 55;
+ public const Int16 HSeOrderSEQCol = 56;
+ public const Int16 HInnerBillNoCol = 57;
+ public const Int16 HEndDateCol = 58;
+ public const Int16 HSourceBillQtyCol = 59;
+ public const Int16 HAuxPropFlagCol = 60;
+ public const Int16 HBarCodeCol = 61; //鏉＄爜缂栧彿
+ public const Int16 HTMNumberCol = 62; //鏉＄爜鍓嶇紑
+ public const Int16 HLSHCol = 63; //鐢熸垚鏉＄爜鏃惰幏鍙栧搴旀祦姘村彿
+ public const Int16 HBarcodeNoCol = 64; //璁板綍闇�鍥炲～鐨勬祦姘村彿鏁伴噺
+
//
public string ModName = "85";
public string ModCaption = "璋冩嫧鏉＄爜鐢熸垚";
@@ -598,6 +601,14 @@
{
sHRemark = sHRemark + " 绗�" + HSno + "琛岋紝鐗╂枡锛�" + HMaterNumber + sHRemark2;
}
+
+ // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏁存暟銆佹诞鐐规暟銆佹璐熷彿銆佺瀛﹁鏁版硶锛堝彲鏍规嵁闇�姹傝皟鏁达級
+ string numericRegex = @"^[+-]?(\d+(\.\d*)?|\.\d+)([eE][+-]?\d+)?$";
+ if (!Regex.IsMatch(DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPackBarQtyCol].Value), numericRegex) && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPackBarQtyCol].Value) != "")
+ {
+ sHRemark = sHRemark + " 绗�" + HSno + "琛岋紝瑙勬牸鏁伴噺涓嶄负鏁板瓧鏍煎紡锛岃杈撳叆姝ｇ‘鐨勬暟鍊硷紒" ;
+ }
+
}
}
if (sHRemark != "")
@@ -674,6 +685,7 @@
string HMaterModel = ""; //浜у搧瑙勬牸鍨嬪彿
string HPinfan = ""; //鍝佺暘
DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
+ double HPackBarQty = 0; //瑙勬牸鏁伴噺
oCn.BeginTran();
Application.DoEvents();
@@ -828,6 +840,7 @@
HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value);
HPinfan = ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value);
HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[HEndDateCol].Value);
+ HPackBarQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HPackBarQtyCol].Value == "" ? 0 : grdMain.Rows[j].Cells[HPackBarQtyCol].Value);
oCn.RunProc("insert into Gy_BarCodeBill" +
"(HInterID,HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID" +
@@ -838,7 +851,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HInitSourceEntryID,HRemark" +
",HPrintQty,HSTOCKORGID,HOWNERID,HDeptID,HSupID,HGroupID" +
",HCusID,HCusType,HSeOrderBillNo,HSeOrderSEQ,HInnerBillNo,HWorkLineName" +
- ",HMaterName,HMaterModel,HPinfan,HEndDate,HMaker,HMakeDate" +
+ ",HMaterName,HMaterModel,HPinfan,HEndDate,HMaker,HMakeDate,HPackBarQty" +
") values ("
+ " " + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString()
+ ", " + HAuxPropID.ToString() + ",'" + HBatchNo + "','" + HMTONo + "'," + HQty.ToString() + "," + HinitQty.ToString() + "," + HSourceBillQty.ToString()
@@ -848,7 +861,7 @@
+ ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HInitSourceEntryID.ToString() + ",'" + HRemark + "'"
+ ", " + HPrintQty.ToString() + "," + HSTOCKORGID.ToString() + "," + HOWNERID.ToString() + "," + HDeptID.ToString() + "," + HSupID.ToString() + "," + HGroupID.ToString()
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
- + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" + "," + HPackBarQty +
")");
}
pb1.Value = j + 1;
@@ -946,7 +959,7 @@
private void initGrid()
{
grdMain.RowCount = 0;
- grdMain.ColumnCount = 64; //鎬诲垪鏁�
+ grdMain.ColumnCount = 65; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -970,6 +983,7 @@
grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
grdMain.Columns[HMinQtyCol].HeaderText = "閲嶉噺";
grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
+ grdMain.Columns[HPackBarQtyCol].HeaderText = "瑙勬牸鏁伴噺";
grdMain.Columns[HinitQtyCol].HeaderText = "鍒濆鍖栨暟閲�";
grdMain.Columns[HSourceBillQtyCol].HeaderText = "婧愬崟鍙敓鎴愭潯鐮佹暟閲�";
grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉＄爜绫诲瀷";
@@ -1067,6 +1081,7 @@
"," + HBatchNoCol.ToString() +
"," + HBarCodeTypeCol.ToString() +
"," + HProduceDateCol.ToString() +
+ "," + HPackBarQtyCol.ToString() +
"," + HRemarkCol.ToString();
//璁剧疆鍚堣鍒�
@@ -1179,6 +1194,7 @@
grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = oMater.omodel.HBarCodeType;
grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
+ grdMain.Rows[sRow].Cells[HPackBarQtyCol].Value = 0;
//鍚敤鎵规
if (oMater.omodel.HBatchManager)
{
@@ -1227,6 +1243,7 @@
grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HPackBarQtyCol].Value = 0;
}
}
else
@@ -1251,6 +1268,7 @@
grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HPackBarQtyCol].Value = 0;
}
break;
@@ -1522,6 +1540,7 @@
grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
grdMain.Rows[i].Cells[HAuxPropFlagCol].Value = oTable.Rows[0]["HAuxPropFlag"].ToString();
+
//鍚敤杈呭姪灞炴��
if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HAuxPropFlag"].ToString()))
{
@@ -1574,6 +1593,7 @@
"," + HBatchNoCol.ToString() +
"," + HBarCodeTypeCol.ToString() +
"," + HProduceDateCol.ToString() +
+ "," + HPackBarQtyCol.ToString() +
"," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
@@ -1965,6 +1985,7 @@
grdMain.Rows[row + r].Cells[HBatchNoCol].Value = grdMain.Rows[row].Cells[HBatchNoCol].Value;
grdMain.Rows[row + r].Cells[HQtyCol].Value = grdMain.Rows[row].Cells[HQtyCol].Value;
grdMain.Rows[row + r].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[row + r].Cells[HPackBarQtyCol].Value = 0;
grdMain.Rows[row + r].Cells[HBQtyCol].Value = grdMain.Rows[row].Cells[HBQtyCol].Value;
grdMain.Rows[row + r].Cells[HinitQtyCol].Value = grdMain.Rows[row].Cells[HinitQtyCol].Value;
grdMain.Rows[row + r].Cells[HISKFPERIODCol].Value = grdMain.Rows[row].Cells[HISKFPERIODCol].Value;
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index d90dc1f..8fbe91d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -5138,7 +5138,7 @@
{
try
{
- ds = oCN.RunProcReturn($"select *,b.hnumber HMaterNumber,b.hname HMaterName_m from Gy_BarCodeBill a left join Gy_Material b on a.HMaterID=b.HItemID where HBarCode='{HbarCode}' ", "Gy_Material");
+ ds = oCN.RunProcReturn($"select *,b.hnumber HMaterNumber,b.hname HMaterName_m from Gy_BarCodeBill a with(nolock) left join Gy_Material b with(nolock) on a.HMaterID=b.HItemID where HBarCode='{HbarCode}' ", "Gy_Material");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 935fcab..457663d 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -10767,11 +10767,23 @@
if (bResult)
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
- objJsonResult.data = null;
- return objJsonResult;
+ if(setOutBill(msg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
}
else
{
@@ -10791,6 +10803,77 @@
return objJsonResult;
}
}
+
+ public bool setOutBill([FromBody] JObject msg)
+ {
+
+
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string HMaker = sArray[2].ToString(); //鍒跺崟浜�
+ try
+ {
+ //List<Model.ClsKf_OtherOutBillMain> lsmain = new List<Model.ClsKf_OtherOutBillMain>();
+ ListModels oListModels = new ListModels();
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ //lsmain = oListModels.getOtherOutBillMainByJson(sMainStr);
+ List<Model.ClsSc_MouldStockBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldStockBillMain>>(sMainStr);
+ //lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
+ string sSourceBillType = "3832";
+
+ WebAPI.WebS.ClsKf_OtherOutBillMain websLsmain = new WebS.ClsKf_OtherOutBillMain();
+ websLsmain.HInterID = lsmain[0].HInterID;
+ websLsmain.HDate = lsmain[0].HDate;
+ websLsmain.HBillNo = lsmain[0].HBillNo;
+ websLsmain.HSupID = lsmain[0].HSupID;
+ websLsmain.HDeptID = lsmain[0].HDeptID;
+ websLsmain.HEmpID = lsmain[0].HKeeperID;
+ websLsmain.HKeeperID = lsmain[0].HKeeperID;
+ websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
+ websLsmain.HRemark = lsmain[0].HRemark??"test";
+ websLsmain.HMaker = lsmain[0].HMaker;
+ websLsmain.HBillerID = 0;
+ websLsmain.HSTOCKORGID = 100038;
+ websLsmain.HOWNERID = 100038;
+ websLsmain.HBillType = "1206";//鍥哄畾鍊�
+ websLsmain.HBillSubType = "test";
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
+ if (oWebs.set_SaveOtherOutBill_New_haicheng(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return true;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "涓婁紶澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return false;
+ }
+ return true;
+ }
+
#endregion
#region [妯″叿澶勭悊鍑哄簱鍗曞垹闄ゅ姛鑳絔
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 2b8e64c..fcbdeb2 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -128,7 +128,7 @@
",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
- ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume" +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume,HNetWeight" +
",HWeight,HColor,HMaxPOQty,HSubjoin,HEngName) " +
" Values('" + oModel.HItemID + "','" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
@@ -141,7 +141,7 @@
oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
- oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "'"+
+ oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "','"+oModel.HNetWeight+"'"+
",'" + oModel.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
sql = "set identity_insert gy_material off";
oCn.RunProc(sql);
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 5288163..a4164c2 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -50,6 +50,7 @@
public double HHeight;
public double HJQty;
public double HWeight; //鍏嬮噸
+ public double HNetWeight; //鍏嬮噸
public string HColorRemark; //鏌撹壊瑕佹眰
public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 773f20f..ddb72d0 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -15020,6 +15020,20 @@
sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
+
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveOtherOutBill_New_haicheng", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_SaveOtherOutBill_New_haicheng(ClsKf_OtherOutBillMain oMain, string sHSourceType, ref string sErrMsg)
+ {
+ object[] results = this.Invoke("set_SaveOtherOutBill_New_haicheng", new object[] {
+ oMain,
+ sHSourceType,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_Bill_New", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
public bool set_Bill_New(ClsCg_POOrderBillMain oMain, string sHSourceType, ref string sErrMsg)
{
--
Gitblit v1.9.1