From 1bbd45a2bf28afc9da6abe335f8072cf29d78456 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 29 十一月 2022 08:58:14 +0800
Subject: [PATCH] 修改了安瑞所需模块解析条码方法
---
WebAPI/Controllers/MateOutController.cs | 41 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 252 +++++-----
WebAPI/Controllers/OtherOutBillController.cs | 37 +
WebAPI/Controllers/MoveStockBillController.cs | 4
WebAPI/Controllers/条码管理/WEBSController.cs | 4
WebAPI/Web.config | 6
WebAPI/Controllers/Sc_ProcessMangementController.cs | 194 ++++++++
WebAPI/Controllers/ProductInController.cs | 7
WebAPI/Controllers/POStockInBillController.cs | 770 +++++++++++++++++++++++++++++++--
WebAPI/Controllers/PublicPageMethodController.cs | 41 +
10 files changed, 1,168 insertions(+), 188 deletions(-)
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index eb1ec8f..2c35c3c 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -581,8 +581,9 @@
{
try
{
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker);
string sExpressNumber = "";
- WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_All(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
//oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
@@ -846,6 +847,44 @@
}
+ //閫変腑琛ㄤ綋 鏍规嵁鍗曟嵁涓籌D杩斿洖宸ュ簭姹囨姤鍗曚竴浜涗俊鎭�
+ [Route("SCStockInCheckBill/DisBillEntryList_Webs_New_Json2")]
+ [HttpGet]
+ public object DisBillEntryList_Webs_New_Json2(long HInterID, long HEntryID)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBillList where HInterID = " + HInterID + " and HEntryID = " + HEntryID + "", "h_v_SCStockInCheckBillList");
+ 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("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
[HttpGet]
diff --git a/WebAPI/Controllers/MoveStockBillController.cs b/WebAPI/Controllers/MoveStockBillController.cs
index 1e612ef..f6586c8 100644
--- a/WebAPI/Controllers/MoveStockBillController.cs
+++ b/WebAPI/Controllers/MoveStockBillController.cs
@@ -542,8 +542,10 @@
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
string sExpressNumber = "";
+
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HStockOutOrgID, sBillNo,sMaker);
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- WebSoBar = oWebs.get_BarCode_MoveStock(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_BarCode_MoveStock(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, HSCWhID, HSCSPID, sQty, SourceFlag, sSourceBillNo, sHSourceBillType, HStockInOrgID,HStockOutOrgID,HScanStyle, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/OtherOutBillController.cs b/WebAPI/Controllers/OtherOutBillController.cs
index 28a23ae..09c64c7 100644
--- a/WebAPI/Controllers/OtherOutBillController.cs
+++ b/WebAPI/Controllers/OtherOutBillController.cs
@@ -88,12 +88,17 @@
// objJsonResult.data = oBar;
// return objJsonResult;
//}
+
+
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
string sExpressNumber = "";
+
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo,sMaker);
+ SourceFlag = true;
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- WebSoBar = oWebs.get_CheckTypeByBarCode_New(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_New(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, HScanStyle, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -378,6 +383,36 @@
}
}
+ [Route("OtherOutBill/set_SavePonderationBillMain_Temp_Source_Fast_Json1")]
+ [HttpGet]
+ public object set_SavePonderationBillMain_Temp_Source_Fast_Json1(Int64 sInterID, string SBillNo, string HBillType, string sSourceBillNo, string sSourceType,bool sRedBlue, string sMaker, Int64 sHOWNERID)
+ {
+
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ string sExpressNumber = "";
+ //WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeBySource_New(sInterID, SBillNo, HBillType, sSourceBillNo, sSourceType,sRedBlue, sMaker, sHOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ if (WebSoBar == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
+ objJsonResult.data = WebSoBar;
+ return objJsonResult;
+ }
+ }
+
+
+
/// <summary>
/// 鐢熸垚鍏朵粬鍏ュ簱鍗�
/// </summary>
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 57446e2..2d5de67 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -82,8 +82,7 @@
{
try
{
-
- var sJXCode = POStockInBillController.JX_Json(sCode, HOWNERID);
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, HBillNo, sMaker);
//if (sRedBlue == true)
//{
// HBillType = "1239";
@@ -175,68 +174,535 @@
[Route("kf_PoStockInBill/JX_Json")]
[HttpGet]
- public static string JX_Json(string sBarCodeNew, Int64 HOrgID)
+ public static string JX_Json(string sBarCodeNew, Int64 hinterid, string HBillType,Int64 HOrgID,string HBillNo,string HMaker)
{
try
{
+ //1.鍒ゆ柇绯荤粺鍙傛暟鏄惁瀹夌憺 涓嶆槸瀹夌憺 鐩存帴璺虫帀
+ //濡傛灉鏄畨鐟� 璧颁笅闈�
+
+ //瑙ｆ瀽鏉＄爜
+ //濡傛灉鍦ㄦ潯鐮佹。妗堥噷闈� 涓嶅鐞� 娌℃湁鐨勮瘽 瀛樺叆鏉＄爜妗ｆ
+
+ //鏍规嵁瑙ｆ瀽鐨勭墿鏂� + 鎵规 鍒ゆ柇 鏉＄爜涓存椂琛� 璁板綍鏄惁瀛樺湪 娌℃湁鐨勮瘽 杩涜鎵簮鍗曠殑鍔ㄤ綔
+
+
//鍔犱簡 鐢熶骇鏃ユ湡 鏈夋晥鏈熻嚦 淇濊川鏈熸爣蹇�
- string[] sArray = sBarCodeNew.Split('@');
- string HMaterNumber = "";
- HMaterNumber = sArray[0];
- Int64 HQty = 0;
- HQty = ClsPub.isInt(sArray[4]);
- string HBarchNo = "";
- HBarchNo = sArray[6];
-
- DateTime HSCRQ = ClsPub.isDate(sArray[3]);
- DateTime HYXQZ = ClsPub.isDate(sArray[5]);
-
-
- Int64 HMaterID = 0;
-
- SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
- DataSet Dss;
- Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
- string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
-
- DataSet Dss1;
- Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
- HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
- string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
- string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
- Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
-
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ //if (oSystemParameter.omodel.WMS_CampanyName == "瀹夌憺")
+ //{
string HTM = "";
- HTM = HOrgNumber + HMaterID + HBarchNo;
- string ModName = "85";
- var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
- Int64 HSupID = 0;
- 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
- ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
- ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
- ") values ("
- + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
- + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
- + ", 0,0,'','',0"
- + ", 0,'',0,0,0,''"
- + ",0,'',''," + HSCRQ.ToShortDateString() + "," + HYXQZ.ToShortDateString() + ",'',getdate()"
- + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
- + ",0,0,0"
- + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+ //閲囪喘鍏ュ簱
+ if (HBillType == "1201")
+ {
+ string[] sArray = sBarCodeNew.Split('@');
+ string HMaterNumber = "";
+ HMaterNumber = sArray[0];
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sArray[4]);
+ string HBarchNo = "";
+ HBarchNo = sArray[6];
+
+ DateTime HSCRQ = ClsPub.isDate(sArray[3]);
+ DateTime HYXQZ = ClsPub.isDate(sArray[5]);
+
+ //閲囪喘璁㈠崟鍙�
+ string HPOOrderBillNo = "";
+ HPOOrderBillNo = ClsPub.isStrNull(sArray[8]);
- string sExpressNumber = "";
+
+ Int64 HMaterID = 0;
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Dss;
+ Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+
+ DataSet Dss1;
+ Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+
+
+ HTM = HOrgNumber + HMaterID + HBarchNo;
+
+ //濡傛灉鏉＄爜妗ｆ涓嶅瓨鍦� 杩涜瀛樺叆鏉＄爜妗ｆ鐨勫姩浣�
+ //鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿
+ DataSet Dss2;
+ Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]);
+ Int64 HSourceInterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["fid"]);
+ Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FENTRYID"]);
+ string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]);
+ //鍒ゆ柇鏉＄爜妗ｆ鏄惁瀛樺湪璇ユ潯鐮�
+ //濡傛灉瀛樺湪 鍐嶅垽鏂壂鐮佷复鏃惰〃鏄惁瀛樺湪璇ユ潯鐮�
+ //濡傛灉涓嶅瓨鍦� 杩涜鎵簮鍗曠殑鏂规硶
+ DataSet Dss5;
+ Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+ DataSet Dss6;
+ Dss6 = oCn.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp");
+ if (Dss6.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+ POStockInBillController POStockInBill = new POStockInBillController();
+ POStockInBill.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", HSourceBillNo, hinterid, HBillNo);
+
+ }
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','1103',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+ DataSet Dss7;
+ Dss7 = oCn.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp");
+ if (Dss7.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+ POStockInBillController POStockInBill = new POStockInBillController();
+ POStockInBill.set_SavePonderationBillMain_Temp_Source_Fast_Json("1103", HSourceBillNo, hinterid, HBillNo);
+
+ }
+
+ }
+ }
+ //浜у搧鍏ュ簱
+ if(HBillType == "1202")
+ {
+ string HMaterNumber = "";
+ HMaterNumber = sBarCodeNew.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + sBarCodeNew.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = sBarCodeNew.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+ ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBill_Json where HYear =" + Year + " and HMonth = " + Month + " and HDay = " + Day + " and HMaterID = " + HMaterID.ToString() + "and 鎵规 = '" + HBatchNo.ToString() + "'", "h_v_SCStockInCheckBill_Json");
+ Int64 HSourceInterID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceInterID"]);
+ Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[0]["HSourceEntryID"]);
+ string HSourceBillNo = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBillNo"]);
+ DataSet Dss;
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+ HTM = HOrgNumber + HMaterID + HBatchNo;
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+ string HYXQZ = "20" + sBarCodeNew.Substring(27, 6);
+ Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4));
+ Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2));
+ Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2));
+ DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1);
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sBarCodeNew.Substring(33,3));
+
+ DataSet Dss5;
+ Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+ DataSet Dss6;
+ Dss6 = oCN.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp");
+ if (Dss6.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+ WEBSController WEBS = new WEBSController();
+ WEBS.get_SourceBarCode_ProductIn_Json(hinterid, HBillNo, HBillType, HSourceBillNo, "3714", HMaker,HOrgID);
+
+ }
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','3714',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+ DataSet Dss7;
+ Dss7 = oCN.RunProcReturn(" select * from KF_PonderationBillMain_Temp where HBarCode= '" + HTM + "' and HInterID = " + hinterid.ToString() + " and HBillType = '" + HBillType + "' and hsourcebillno = '" + HSourceBillNo + "' ", "KF_PonderationBillMain_Temp");
+ if (Dss7.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+ WEBSController WEBS = new WEBSController();
+ WEBS.get_SourceBarCode_ProductIn_Json(hinterid, HBillNo, HBillType, HSourceBillNo, "3714", HMaker, HOrgID);
+
+ }
+
+ }
+
+ }
+ //鐢熶骇閫�鏂�
+ if (HBillType == "1244")
+ {
+ string HMaterNumber = "";
+ HMaterNumber = sBarCodeNew.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + sBarCodeNew.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = sBarCodeNew.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+ DataSet Dss;
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+ HTM = HOrgNumber + HMaterID + HBatchNo;
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+ string HYXQZ = "20" + sBarCodeNew.Substring(27, 6);
+ Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4));
+ Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2));
+ Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2));
+ DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1);
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3));
+
+ DataSet Dss5;
+ Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", 0,0,'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
+ //璋冩嫧鍗�
+ if (HBillType == "1207")
+ {
+ string HMaterNumber = "";
+ HMaterNumber = sBarCodeNew.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + sBarCodeNew.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = sBarCodeNew.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+ DataSet Dss;
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+ HTM = HOrgNumber + HMaterID + HBatchNo;
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+ string HYXQZ = "20" + sBarCodeNew.Substring(27, 6);
+ Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4));
+ Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2));
+ Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2));
+ DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1);
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3));
+
+ DataSet Dss5;
+ Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", 0,0,'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
+ //鍏朵粬鍑哄簱鍗�
+ if (HBillType == "1206")
+ {
+ string HMaterNumber = "";
+ HMaterNumber = sBarCodeNew.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + sBarCodeNew.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = sBarCodeNew.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+ DataSet Dss;
+ Dss = oCN.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+ HTM = HOrgNumber + HMaterID + HBatchNo;
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+ string HYXQZ = "20" + sBarCodeNew.Substring(27, 6);
+ Int64 Year1 = ClsPub.isInt(HYXQZ.Substring(0, 4));
+ Int64 Month1 = ClsPub.isInt(HYXQZ.Substring(4, 2));
+ Int64 Day1 = ClsPub.isInt(HYXQZ.Substring(6, 2));
+ DateTime HYXQZ1 = ClsPub.isDate(Year1 + "-" + Month1 + "-" + Day1);
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sBarCodeNew.Substring(33, 3));
+
+ DataSet Dss5;
+ Dss5 = oCN.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBatchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", 0,0,'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ1.ToShortDateString() + "','" + HYXQZ1.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
+ //棰嗘枡鍑哄簱鏍￠獙
+ if (HBillType == "1204")
+ {
+ string[] sArray = sBarCodeNew.Split('@');
+ string HMaterNumber = "";
+ HMaterNumber = sArray[0];
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sArray[4]);
+ string HBarchNo = "";
+ HBarchNo = sArray[6];
+
+ DateTime HSCRQ = ClsPub.isDate(sArray[3]);
+ DateTime HYXQZ = ClsPub.isDate(sArray[5]);
+
+ //閲囪喘璁㈠崟鍙�
+ string HPOOrderBillNo = "";
+ HPOOrderBillNo = ClsPub.isStrNull(sArray[8]);
+
+
+
+ Int64 HMaterID = 0;
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Dss;
+ Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+
+ DataSet Dss1;
+ Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+
+
+ HTM = HOrgNumber + HMaterID + HBarchNo;
+
+
+ DataSet Dss5;
+ Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+
+ }
+ else
+ {
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", " + 0 + "," + 0 + ",'','',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+
+ }
+
+ }
//objJsonResult.code = "0";
//objJsonResult.count = 1;
//objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
//objJsonResult.data = ;
return HTM;
+
}
catch (Exception e)
{
@@ -248,6 +714,10 @@
}
}
+
+
+
+
@@ -498,12 +968,206 @@
[Route("Kf_QCStockInCheckBill_Fast/BarCode_Json")]
[HttpGet]
- public object BarCode_Json(string HBarCode)
+ public object BarCode_Json(string HBarCode,Int64 HOrgID)
{
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 鏉＄爜缂栧彿 ='" + HBarCode.ToString() + "'", "h_v_QCStockInCheckBill_Json");
+ //string[] sArray = HBarCode.Split('@');
+ //string HMaterNumber = "";
+ //HMaterNumber = sArray[0];
+
+ ////閲囪喘璁㈠崟鍙�
+ //string HPOOrderBillNo = "";
+ //HPOOrderBillNo = ClsPub.isStrNull(sArray[8]);
+
+
+
+ //Int64 HMaterID = 0;
+
+
+ //DataSet Dss1;
+ //Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ //HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+
+
+ ////鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿
+ //DataSet Dss2;
+ //Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery");
+ //HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]);
+ //string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]);
+
+
+ string HTM = "";
+ string[] sArray = HBarCode.Split('@');
+ string HMaterNumber = "";
+ HMaterNumber = sArray[0];
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(sArray[4]);
+ string HBarchNo = "";
+ HBarchNo = sArray[6];
+
+ DateTime HSCRQ = ClsPub.isDate(sArray[3]);
+ DateTime HYXQZ = ClsPub.isDate(sArray[5]);
+
+ //閲囪喘璁㈠崟鍙�
+ string HPOOrderBillNo = "";
+ HPOOrderBillNo = ClsPub.isStrNull(sArray[8]);
+
+
+
+ Int64 HMaterID = 0;
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Dss;
+ Dss = oCn.RunProcReturn(" select HNumber from h_v_CLD_ORGANIZATIONSList where HItemID= " + HOrgID, "h_v_CLD_ORGANIZATIONSList");
+ string HOrgNumber = Pub_Class.ClsPub.isStrNull(Dss.Tables[0].Rows[0]["HNumber"]);
+
+ DataSet Dss1;
+ Dss1 = oCn.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+
+
+ HTM = HOrgNumber + HMaterID + HBarchNo;
+
+ //濡傛灉鏉＄爜妗ｆ涓嶅瓨鍦� 杩涜瀛樺叆鏉＄爜妗ｆ鐨勫姩浣�
+ //鏍规嵁鐗╂枡 + 鎵规 + 閲囪喘璁㈠崟鍙� 鎵惧埌瀵瑰簲鐨勬敹鏂欓�氱煡鍗曞彿
+ DataSet Dss2;
+ Dss2 = oCn.RunProcReturn(" select fid,FMATERIALID,FENTRYID,FBILLNO from h_v_RECEIVEQuery where FSRCBILLNO= '" + HPOOrderBillNo + "' and FMATERIALID = " + HMaterID, "h_v_RECEIVEQuery");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FMATERIALID"]);
+ Int64 HSourceInterID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["fid"]);
+ Int64 HSourceEntryID = Pub_Class.ClsPub.isLong(Dss2.Tables[0].Rows[0]["FENTRYID"]);
+ string HSourceBillNo = Pub_Class.ClsPub.isStrNull(Dss2.Tables[0].Rows[0]["FBILLNO"]);
+ //鍒ゆ柇鏉＄爜妗ｆ鏄惁瀛樺湪璇ユ潯鐮�
+ //濡傛灉瀛樺湪 鍐嶅垽鏂壂鐮佷复鏃惰〃鏄惁瀛樺湪璇ユ潯鐮�
+ //濡傛灉涓嶅瓨鍦� 杩涜鎵簮鍗曠殑鏂规硶
+ DataSet Dss5;
+ Dss5 = oCn.RunProcReturn(" select * from Gy_BarCodeBill where HBarCode= '" + HTM + "'", "Gy_BarCodeBill");
+ if (Dss5.Tables[0].Rows.Count > 0)
+ {
+ DataSet ds;
+ ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where HSourceBillNo ='" + HSourceBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json");
+ 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;
+ }
+ }
+ else
+ {
+
+
+
+ string ModName = "85";
+ var HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ Int64 HSupID = 0;
+ 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,HProduceDate,HExpiryDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HExpirationDateFlag " +
+ ") values ("
+ + "'" + HTM + "','鎵规鏉＄爜'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty.ToString()
+ + ",'" + HBarchNo + "'," + HSupID.ToString() + ",0,'" + ClsPub.CurUserName + "',getdate(),0," + HQty.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','1103',0"
+ + ", 0,'',0,0,0,''"
+ + ",0,'','','" + HSCRQ.ToShortDateString() + "','" + HYXQZ.ToShortDateString() + "','',getdate()"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",''," + HInterID.ToString() + ",1"
+ + ",0,0,0"
+ + ",'" + HMaterName + "','" + HMaterModel + "','',0,'','',1)");
+ DataSet ds;
+ ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where HSourceBillNo ='" + HSourceBillNo.ToString() + "'", "h_v_QCStockInCheckBill_Json");
+ 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;
+ }
+ }
+ //ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBill_Json where 鏉＄爜缂栧彿 ='" + HBarCode.ToString() + "'", "h_v_QCStockInCheckBill_Json");
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ [Route("Kf_SCStockInCheckBill_Fast/BarCode_Json1")]
+ [HttpGet]
+ public object BarCode_Json1(string HBarCode,Int64 HOrgID)
+ {
+ try
+ {
+
+ //鏍规嵁鎷嗗垎鐨勭墿鏂橧D + 鎵规 + 鐢熶骇鏃ユ湡 鑳芥壘鍒板敮涓�鐨勫伐搴忔眹鎶ュ崟
+ string HMaterNumber = "";
+ HMaterNumber = HBarCode.Substring(0, 10);
+ string HSCRQ = "";
+ HSCRQ = "20" + HBarCode.Substring(10, 6);
+ Int64 Year = ClsPub.isInt(HSCRQ.Substring(0, 4));
+ Int64 Month = ClsPub.isInt(HSCRQ.Substring(4, 2));
+ Int64 Day = ClsPub.isInt(HSCRQ.Substring(6, 2));
+
+ string HBatchNo = "";
+ HBatchNo = HBarCode.Substring(16, 11);
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ Int64 HMaterID = 0;
+ DataSet Dss1;
+ Dss1 = oCN.RunProcReturn(" select HItemID,HName,HModel,HUnitID from Gy_Material where HNumber= '" + HMaterNumber + "' and huseorgid = " + HOrgID, "Gy_Material");
+ HMaterID = Pub_Class.ClsPub.isLong(Dss1.Tables[0].Rows[0]["HItemID"]);
+ string HMaterName = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HName"]);
+ string HMaterModel = Pub_Class.ClsPub.isStrNull(Dss1.Tables[0].Rows[0]["HModel"]);
+ Int64 HUnitID = Pub_Class.ClsPub.isInt(Dss1.Tables[0].Rows[0]["HUnitID"]);
+
+
+ DateTime HSCRQ1 = ClsPub.isDate(Year + "-" + Month + "-" + Day);
+
+
+
+ Int64 HQty = 0;
+ HQty = ClsPub.isInt(HBarCode.Substring(33, 3));
+
+
+ ds = oCN.RunProcReturn("select * from h_v_SCStockInCheckBill_Json where HYear =" + Year.ToString() + "and HMonth = " + Month.ToString() + "and HDay = " + Day.ToString() + " and HMaterID = " + HMaterID.ToString() + "and 鎵规 = '" + HBatchNo.ToString() + "'", "h_v_SCStockInCheckBill_Json");
if (ds == null || ds.Tables[0].Rows.Count <= 0)
{
diff --git a/WebAPI/Controllers/ProductInController.cs b/WebAPI/Controllers/ProductInController.cs
index 2c655bb..d184a0a 100644
--- a/WebAPI/Controllers/ProductInController.cs
+++ b/WebAPI/Controllers/ProductInController.cs
@@ -332,8 +332,10 @@
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
string sExpressNumber = "";
+
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_CheckTypeByBarCode_BillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
@@ -363,9 +365,10 @@
{
WebS.WebService1 oWebs = new WebS.WebService1();
WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
+ var sJXCode = POStockInBillController.JX_Json(sCode, sInterID, HBillType, HOWNERID, sBillNo, sMaker);
string sExpressNumber = "";
//WebSoBar = oWebs.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
- WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
+ WebSoBar = oWebs.get_BarCode_MoveStockBillCheck(sJXCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, SCWhID, SCSPID, sQty, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index b4ec766..80c23d0 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1481,6 +1481,47 @@
}
#endregion
+
+
+ #region 鍑哄簱鐢宠鍗曟煡璇㈠垪琛�
+ [Route("OtherOutRequestBillList/CX")]
+ [HttpGet]
+ public object CX(string sWhere)
+ {
+ try
+ {
+
+ string sql1 = "Select * from Kf_StockOutRequestBillMain where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Kf_StockOutRequestBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ 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 = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鏍规嵁鏍戝瀷id鏌ユ壘璁惧鍒楄〃
[Route("Gy_MaintenanceMode/EqpCX")]
[HttpGet]
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 226e296..af39f81 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -1019,6 +1019,200 @@
}
#endregion
+
+
+
+
+ /// <summary>
+ /// 鐢熸垚閲戣澏浜戜骇鍝佹楠屽崟
+ /// </summary>
+ /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ /// <returns></returns>
+ [Route("SCStockInCheckBill/set_SaveSCStockInCheckBill_Json")]
+ [HttpGet]
+ public object set_SaveSCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
+ double HCheckQty, double HRightQty, double HBadQty,
+ string HCheckResult, string HSupNumber, string HWHNumber,
+ string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
+ Int64 HSourceEntryID, string HSourceBillNo, string user,
+ Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
+ Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
+ Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ)
+ {
+ try
+ {
+ //鑾峰彇鐢熶骇姹囨姤鍗曟渶澶nterID鍜屽崟鎹彿
+ Int64 HInterID = DBUtility.ClsPub.CreateBillID("7501", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode("7501", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ //淇濆瓨
+ oCN.BeginTran();
+ //鐢熸垚浜у搧妫�楠屽崟
+ //oCN.RunProc("Insert Into QC_POStockInCheckBillMain " +
+ //"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate,HBillStatus,HChecker,HCheckDate" +
+ //",HYear,HPeriod,HRemark,HSupID,HMaterID" +
+ //",HInstockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp" +
+ //",HCheckerResult,HSteelStoveNo,HSteelCompReport,HAspect,HSize" +
+ //") " +
+ //" values('7503','7503'," + HInterID.ToString() + ",'" + HBillNo + "',getdate(),'" + user + "',getdate(),2,'" + user + "',getdate()" +
+ //",DATENAME(YEAR,GETDATE()),0,''," + HSupID.ToString() + "," + HMaterID.ToString() +
+ //",'" + HCheckQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HKeeperID.ToString() + "'" +
+ //",'" + HCheckResult.ToString() + "','', '','',''" +
+ //") ");
+ ////鐢熶骇姹囨姤鍗曞瓙琛�
+ //oCN.RunProc("Insert into QC_POStockInCheckBillSub " +
+ // " (HInterID,HEntryID,HCloseMan,HCloseType" +
+ // ",HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ // ",HRelationQty,HRelationMoney,HQCCheckClassID,HQCCheckItemID,HQCStd," +
+ // "HResult,HQCRelValue,HProcCheckEmp,HProcCheckTime" +
+ // ") values("
+ // + HInterID.ToString() + ",1,'',''" +
+ // ",''," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HSourceBillType.ToString() + "'" +
+ // ",0,0,0,0,''" +
+ // ",'" + HCheckResult.ToString() + "','" + HCheckResult.ToString() + "','" + HKeeperID.ToString() + "',getdate()" +
+ // ") ");
+ //鍚屾閲戣澏
+ //璁块棶閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎿嶄綔澶辫触,閲戣澏璐﹀彿鐧诲綍寮傚父銆�" + loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ JObject model = new JObject();
+ model.Add("FBillTypeID", new JObject() { ["Fnumber"] = "JYD002_SYS" }); //鍗曟嵁绫诲瀷 浜у搧妫�楠屽崟JYD002_SYS
+ model.Add("FBusinessType", "3"); //涓氬姟绫诲瀷
+ model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡
+ model.Add("FSourceOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //鏉ユ簮缁勭粐
+ model.Add("FInspectOrgId", new JObject() { ["Fnumber"] = HZJOrgNumber.ToString() }); //璐ㄦ缁勭粐
+ model.Add("FISSYNCED", "false");// 鏄惁宸插悓姝�
+ model.Add("FBillNo", HBillNo);
+
+ JArray Fentity = new JArray();
+ JObject FentityModel = new JObject();
+ FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜
+ FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//璁￠噺鍗曚綅鍐呯爜
+ FentityModel.Add("FInspectQty", HCheckQty.ToString());// 妫�楠屾暟閲�
+ FentityModel.Add("FQualifiedQty", HRightQty.ToString());// 鍚堟牸鏁伴噺
+ FentityModel.Add("FInspectResult", HCheckResult.ToString());// 妫�楠岀粨鏋�
+ FentityModel.Add("FQCStatus", "1");// 璐ㄦ鐘舵��
+ FentityModel.Add("FIsRelated", false);// 涓嶈壇鍝佸叧鑱旀爣蹇�
+ FentityModel.Add("FSrcBillType0", "SFC_OperationReport");// 婧愬崟绫诲瀷
+ FentityModel.Add("FBaseUnitId", new JObject() { ["Fnumber"] = HUnitNumber.ToString() });//鍩烘湰鍗曚綅
+ FentityModel.Add("FBaseInspectQty", HCheckQty.ToString());//鍩烘湰鍗曚綅妫�楠屾暟閲�
+ //FentityModel.Add("FSupplierId", new JObject() { ["Fnumber"] = HSupNumber.ToString() }); // 渚涘簲鍟�
+ FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = HWHNumber.ToString() }); // 浠撳簱
+ FentityModel.Add("FInspectTimes", "1"); // 妫�楠屾鏁�
+ FentityModel.Add("FTimeUnit", "24");//鏃堕棿鍗曚綅
+ FentityModel.Add("FSAMPLEDAMAGEBEARER", "2");//鏍锋湰鐮村潖鎵挎媴鏂�
+ FentityModel.Add("FISFIRSTINSPECT", false);//棣栨
+ FentityModel.Add("FBaseQualifiedQty", HRightQty.ToString());//鍩烘湰鍗曚綅鍚堟牸鏁�
+ FentityModel.Add("FCurrency", new JObject() { ["Fnumber"] = "PRE001" });//甯佸埆
+ FentityModel.Add("FIsSplitRow ", false);// 鏄惁鎷嗗垎琛�
+
+ JArray Fentity2 = new JArray();
+ JObject FentityModel2 = new JObject();
+ FentityModel2.Add("FPolicyMaterialId", new JObject() { ["Fnumber"] = HMaterNumber.ToString() });// 鐗╂枡鍐呯爜
+ FentityModel2.Add("FPolicyStatus", "1"); //鐘舵��
+ FentityModel2.Add("FPolicyQty", HRightQty.ToString()); //鏁伴噺
+ FentityModel2.Add("FBasePolicyQty", HRightQty.ToString()); //鍩烘湰鍗曚綅鏁伴噺
+ FentityModel2.Add("FUsePolicy", HUseResult.ToString()); //浣跨敤鍐崇瓥
+ FentityModel2.Add("FIsCheck", false); //鏄惁鎶芥
+ FentityModel2.Add("FIsDefectProcess", false); //涓嶈壇澶勭悊
+ FentityModel2.Add("FCanSale", false); //鍙攢鍞�
+ FentityModel2.Add("FIsMRBReview", false); //MRP璇勫
+ FentityModel2.Add("FIsReturn", false); //鍒ら��
+ FentityModel2.Add("FIsRelatedDefect", false); //涓嶈壇鍝佸叧鑱旀爣蹇�
+ Fentity2.Add(FentityModel2);
+ FentityModel.Add("FPolicyDetail", Fentity2);
+
+
+
+ //JArray Fentity3 = new JArray();
+ //JObject FentityModel3 = new JObject();
+ //FentityModel3.Add("FSrcBillType", "SFC_OperationReport"); //婧愬崟绫诲瀷
+ //FentityModel3.Add("FSrcBillNo", HSLBillNo.ToString()); //宸ュ簭姹囨姤鍗曞崟鍙�
+ //FentityModel3.Add("FSrcInterId", HSLInterID.ToString()); //宸ュ簭姹囨姤鍗曚富ID
+ //FentityModel3.Add("FSrcEntryId", HSLEntryID.ToString()); //宸ュ簭姹囨姤鍗曞瓙ID
+ //FentityModel3.Add("FSrcEntrySeq", HSLSeQ.ToString()); //宸ュ簭姹囨姤鍗曡鍙�
+ //FentityModel3.Add("FOrderType", new JObject() { ["FID"] = "PUR_PurchaseOrder" }); // 宸ュ簭璁″垝绫诲瀷
+ //FentityModel3.Add("FOrderBillNo", HSourceBillNo.ToString()); //宸ュ簭璁″垝鍗曞彿
+ //FentityModel3.Add("FOrderId", HSourceInterID.ToString()); //宸ュ簭璁″垝涓籌D
+ //FentityModel3.Add("FOrderEntryId", HSourceEntryID.ToString()); //宸ュ簭璁″垝瀛怚D
+ //FentityModel3.Add("FOrderEntrySeq", HSeQ.ToString()); //宸ュ簭璁″垝琛屽彿
+ //Fentity3.Add(FentityModel3);
+ //FentityModel.Add("FReferDetail", Fentity3);
+ Fentity.Add(FentityModel);
+ model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
+ JObject jsonRoot = new JObject()
+ {
+ ["Creator"] = "",
+ ["NeedUpDateFields"] = new JArray(),
+ ["NeedReturnFields"] = new JArray(),
+ ["IsDeleteEntry"] = "false",
+ ["SubSystemId"] = "",
+ ["IsVerifyBaseDataField"] = "false",
+ //["IsAutoSubmitAndAudit"] = true,//鑷姩璋冪敤鎻愪氦鍜屽鏍稿姛鑳�
+ ["Model"] = model
+ };
+
+ string result = InvokeHelper.Save("QM_InspectBill", JsonConvert.SerializeObject(jsonRoot));//淇濆瓨
+ //鍒ゆ柇淇濆瓨鏄惁鎴愬姛
+ if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ LogService.Write("鏉ユ枡妫�楠屽崟淇濆瓨閿欒jsonRoot:" + jsonRoot);
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍚屾閲戣澏浜戝け璐ワ紒鍗曞彿:{HBillNo.ToString()}" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鎻愪氦瀹℃牳
+ string result1 = string.Empty;
+ string result2 = string.Empty;
+ var fID = JObject.Parse(result)["Result"]["Id"].ToString();
+ var fBillNo = JObject.Parse(result)["Result"]["Number"].ToString();
+ var json = new
+ {
+ Ids = fID,
+ };
+ result1 = InvokeHelper.Submit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ result2 = InvokeHelper.Audit("QM_InspectBill", JsonConvert.SerializeObject(json));//鎻愪氦
+ if (JObject.Parse(result1)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"鏉ユ枡妫�楠屽崟鍙凤細{fBillNo}锛屾彁浜ゅけ璐�" + result;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 杩斿洖鐢熶骇姹囨姤鍗曞垪琛�
///鍙傛暟锛歴tring sql銆�
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index aa7007f..18b11de 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -353,7 +353,9 @@
{
try
{
- WebSoBar = oWebs.get_BarCode(sBarCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
+ var sJXCode = POStockInBillController.JX_Json(sBarCode, HInterID, HBillType, HStockOrgID, HBillNo,HMaker);
+ SourceFlag = true;
+ WebSoBar = oWebs.get_BarCode(sJXCode, HInterID, HBillType, HBillNo, HMaker, HWhID, HSPID, HQty, HRedBlueFlag, SourceFlag, HSourceBillNo, HSourceBillType, HStockOrgID, HScanStyle, HCustom1, HCustom2, ref DBUtility.ClsPub.sErrInfo);
if (WebSoBar == null)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 6ad12ef..e922e0a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,79 +9,79 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/22/2022 20:23:50</publishTime>
+ <publishTime>11/28/2022 23:01:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>11/22/2022 20:23:50</publishTime>
+ <publishTime>11/28/2022 23:01:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
- <publishTime>12/17/2020 21:32:28</publishTime>
+ <publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/22/2022 20:23:46</publishTime>
+ <publishTime>11/28/2022 23:01:18</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>11/22/2022 20:23:46</publishTime>
+ <publishTime>11/28/2022 23:01:18</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>11/22/2022 20:23:20</publishTime>
+ <publishTime>11/28/2022 23:01:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/22/2022 20:23:20</publishTime>
+ <publishTime>11/28/2022 23:01:16</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
- <publishTime>03/22/2022 05:17:26</publishTime>
+ <publishTime>03/22/2022 13:17:26</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.pdb">
- <publishTime>03/18/2022 23:39:42</publishTime>
+ <publishTime>03/19/2022 07:39:42</publishTime>
</File>
<File Include="bin/Grpc.Core.dll">
- <publishTime>03/22/2022 05:17:20</publishTime>
+ <publishTime>03/22/2022 13:17:20</publishTime>
</File>
<File Include="bin/Grpc.Core.pdb">
- <publishTime>03/18/2022 23:39:48</publishTime>
+ <publishTime>03/19/2022 07:39:48</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
- <publishTime>05/08/2021 17:08:30</publishTime>
+ <publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
- <publishTime>05/08/2021 17:08:30</publishTime>
+ <publishTime>05/09/2021 01:08:30</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/19/2021 09:43:58</publishTime>
+ <publishTime>03/15/2022 10:06:40</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -90,96 +90,96 @@
<publishTime>09/20/2018 19:28:34</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/18/2022 23:38:44</publishTime>
+ <publishTime>03/19/2022 07:38:44</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.so">
- <publishTime>03/18/2022 23:38:42</publishTime>
+ <publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
+ <publishTime>03/19/2015 01:02:50</publishTime>
</File>
<File Include="bin/Microsoft.CSharp.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Microsoft.Web.Infrastructure.dll">
- <publishTime>07/25/2012 11:48:56</publishTime>
+ <publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/22/2022 20:23:21</publishTime>
+ <publishTime>11/28/2022 23:01:16</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>11/22/2022 20:23:21</publishTime>
+ <publishTime>11/28/2022 23:01:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>08/03/2014 20:33:56</publishTime>
+ <publishTime>08/04/2014 04:33:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
- <publishTime>10/23/2021 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OOXML.dll">
- <publishTime>10/23/2021 01:07:56</publishTime>
- </File>
- <File Include="bin/NPOI.OOXML.pdb">
<publishTime>10/23/2021 09:07:56</publishTime>
</File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
<File Include="bin/NPOI.OpenXml4Net.dll">
- <publishTime>10/23/2021 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.dll">
- <publishTime>10/23/2021 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/22/2022 20:23:00</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>11/22/2022 20:23:00</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/22/2022 20:23:02</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/22/2022 20:23:02</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/22/2022 20:23:19</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>11/22/2022 20:23:19</publishTime>
+ <publishTime>11/28/2022 23:01:15</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
+ <publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 10:01:28</publishTime>
+ <publishTime>07/19/2017 18:01:28</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -203,19 +203,19 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
+ <publishTime>08/19/2014 18:03:34</publishTime>
</File>
<File Include="bin/System.Memory.dll">
- <publishTime>04/17/2019 16:24:34</publishTime>
+ <publishTime>04/18/2019 00:24:34</publishTime>
</File>
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
+ <publishTime>11/28/2018 21:00:36</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/18/2018 19:38:10</publishTime>
+ <publishTime>09/19/2018 03:38:10</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -224,7 +224,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>11/28/2018 20:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -239,37 +239,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
+ <publishTime>11/28/2018 21:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
+ <publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>01/28/2015 12:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>02/11/2014 23:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <publishTime>01/28/2015 12:02:32</publishTime>
</File>
<File Include="bin/System.Web.Services.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Deployment.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -278,12 +278,12 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
+ <publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/22/2022 20:24:13</publishTime>
+ <publishTime>11/28/2022 23:01:23</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -291,196 +291,196 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>11/22/2022 20:24:13</publishTime>
+ <publishTime>11/28/2022 23:01:23</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
+ <publishTime>07/18/2013 01:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
+ <publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
+ <publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>08/19/2022 08:17:39</publishTime>
+ <publishTime>08/16/2022 22:31:46</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>11/01/2021 09:26:33</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/18/2022 23:38:44</publishTime>
+ <publishTime>03/19/2022 07:38:44</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.so">
- <publishTime>03/18/2022 23:38:42</publishTime>
+ <publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="packages.config">
- <publishTime>05/09/2022 11:30:19</publishTime>
+ <publishTime>05/07/2022 09:07:20</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>08/19/2021 09:44:01</publishTime>
+ <publishTime>03/15/2022 10:06:42</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>11/22/2022 10:33:25</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>11/22/2022 10:33:24</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>11/22/2022 10:33:29</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>11/22/2022 10:33:27</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>11/22/2022 10:33:28</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>11/22/2022 10:33:26</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>11/22/2022 10:33:23</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>11/22/2022 10:33:29</publishTime>
+ <publishTime>11/17/2022 21:02:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>11/22/2022 10:33:18</publishTime>
+ <publishTime>11/17/2022 20:03:04</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -491,7 +491,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>11/22/2022 20:24:36</publishTime>
+ <publishTime>11/28/2022 23:01:37</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 681abba..5fcd0f4 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -28,7 +28,7 @@
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
<!--<add key="sUrl" value="http://192.168.0.214/WEBS-WMS/WebService1.asmx"/> 鐟炰笌绁�-->
<!--<add key="sUrl" value="http://60.191.27.141:8090/WEBS-WMS/WebService1.asmx"/> 妫シ-->
- <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> 鍏徃浜戞湇鍔″櫒-->
+ <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -96,7 +96,7 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://192.168.80.90:9090/WEBS/WebService1.asmx" binding="basicHttpBinding"
+ <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding"
bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap"
name="WebService1Soap" />
</client>
@@ -105,7 +105,7 @@
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://192.168.63.195/WEBS-WMS/WebService1.asmx</value>
+ <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
--
Gitblit v1.9.1