From 3878611cba9734824ddc9cb205da396efbe2f487 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期六, 24 十二月 2022 20:40:50 +0800
Subject: [PATCH] 111
---
WebAPI/Models/ClsSc_ICMOReportBillSub.cs | 2 +-
.gitignore | 2 ++
BLL/公用模块/Xt_File.cs | 4 ++--
WebAPI/Models/ClsGy_Material_Model.cs | 1 +
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 4 ++--
WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs | 3 +--
WebAPI/Models/基础资料/Warehouse.cs | 4 ++++
WebAPI/DLL/ClsGy_Material_Ctl.cs | 4 ++--
8 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4b86fef..b7fe30c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,3 +159,5 @@
/OAM/bin/Release
/LMES/bin/Release
/PayM/bin/Release
+/SQLHelper/obj/x86/Release
+/Model/obj/x86/Release
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
index 2363644..7f18c08 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Xt_File.cs"
@@ -128,8 +128,8 @@
Process p = new Process();
p.StartInfo.FileName = sHPath;
p.Start();
- p.WaitForExit();
- File.Delete(sHPath);
+ //p.WaitForExit();
+ //File.Delete(sHPath);
}
private Int32 Fun_GetCol(string sCol)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index fe7bd06..f1f268d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -423,9 +423,9 @@
oCN.RunProc(sql);
oCN.RunProc("Insert into Gy_Warehouse " +
" (HItemID,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HCREATEORGID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HAddress,HPhone,HUSEORGID,HCREATEORGID,HSPFlag,HSPGroupID,HUnderStock,HSTOCKPROPERTY) " +
" Values('" + list[0].HItemID + "','" + list[0].HNumber + "','" +list[0].HName + "','" + list[0].HHelpCode + "','" + list[0].HShortNumber + "'," + list[0].HParentID.ToString() +
- "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "','" + list[0].HCREATEORGID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + list[0].HLevel.ToString() + "," + Convert.ToString(list[0].HEndFlag ? 1 : 0) + "," + Convert.ToString(list[0].HStopFlag ? 1 : 0) + ",'" + list[0].HRemark + "'," + list[0].HEmpID.ToString() + ",'" + list[0].HAddress + "','" + list[0].HPhone + "','" + list[0].HUSEORGID + "','" + list[0].HCREATEORGID + "','" + list[0].HSPFlag + "','" + list[0].HSPGroupID + "','" + list[0].HUnderStock + "','" + list[0].HSTOCKPROPERTY + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Warehouse off";
oCN.RunProc(sql);
diff --git a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
index 8eb1141..35d43ef 100644
--- a/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_ICMOReportBillController.cs
@@ -411,8 +411,7 @@
"," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "','" + oSub.HBarCode + "','" + oSub.HOWNERTYPEID + "'," +
oSub.HISENTRUST + "," + oSub.HSTOCKINORGID + "," + oSub.HOWNERID + "," + oSub.HCHECKPRODUCT + ",'" + oSub.HQAIP + "'," +
oSub.HCOSTRATE + "," + oSub.HISBACKFLUSH + ",'" + oSub.HREQSRC + "','" + oSub.HREQBILLNO + "'," + oSub.HREQBILLID + "," +
- oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID +
- ") ";
+ oSub.HREQENTRYSEQ + "," + oSub.HREQENTRYID + "," + oSub.HMOMAINENTRYID + "," + oSub.HSTOCKINQUASELQTY + "," + oSub.HPRODUCTTYPE + ",'" + oSub.HPROJECTNO + "'," + oSub.HICMOENTRYSEQ + "," + oSub.HSEQ + ",'" + oSub.HPRODUCEDATE + "','" + oSub.HEXPIRYDATE + "'," + oSub.HBASEUNITID + "," + oSub.HDEPTID + "," + oSub.HGroupID + ",'" + oSub.HDESCRIPTION + "','" + oSub.HSourceNumber + "'," + oSub.HQPQty + "," + oSub.HICMOEntryID + "," + oSub.HWhID + "," + oSub.HSPID + ",'" + oSub.HBatChNo + "'," + oSub.HAuxPropID + ",'" + oSub.HMTONo + "'," + oSub.HPlanMode + "," + oSub.HERPInterID + "," + oSub.HERPEntryID + ") ";
oCN.RunProc(sql);
}
oCN.Commit();
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 778fd9a..314e8e0 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -63,14 +63,14 @@
",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
- ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID) " +
+ ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HCREATEORGID,HUSEORGID,HERPItemID,HBatchManager) " +
" 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 + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
- ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HBatchManager + ")", 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 01beea3..75ab2b1 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -42,6 +42,7 @@
public int HUSEORGID;
public int HERPItemID;
public int HCREATEORGID;
+ public int HBatchManager;
public int HSALEUNITID; //閿�鍞閲忓崟浣�(gy_unit)
public int HSALEPRICEUNITID; //閿�鍞浠疯閲忓崟浣�(gy_unit)
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
index f7b45e3..b231e20 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillSub.cs
@@ -38,7 +38,7 @@
public Int64 HOWNERID; //货主,
public Int64 HCHECKPRODUCT; //产品检验,
public string HQAIP; //紧急放行,
- public Int64 HCOSTRATE; //成本权重
+ public decimal HCOSTRATE; //成本权重
public Int64 HISBACKFLUSH; //倒冲领料
public string HREQSRC; //需求来源
public string HREQBILLNO; //需求单号
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
index dc7fb1c..c6e5b67 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Warehouse.cs"
@@ -22,6 +22,10 @@
public string HAddress { get; set; }
public string HPhone { get; set; }
public Int64 HSPGroupID { get; set; }
+ public Int64 HSPFlag { get; set; }
+ public Int64 HSTOCKPROPERTY { get; set; }
+ public Int64 HUnderStock { get; set; }
+
public string HBarCode { get; set; }
public Int64 HUSEORGID { get; set; }
public Int64 HCREATEORGID { get; set; }
--
Gitblit v1.9.1