'20220814_3'

临时发布20240103
ddlucky 2 years ago
parent b934890cc8
commit e042430e09

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

@ -2171,26 +2171,32 @@ namespace DSWeb.Common.DB
public DateTime? MODIFYTIME { get; set; }
public string MODIFYUSER { get; set; }
public string CUSTOMERNAME { get; set; }
public string OPERATOR { get; set; }
public string OPERATORTEL { get; set; }
public string OPERATOREMAIL { get; set; }
public string ORDERNO { get; set; }
public void GetFenValue(crm_seaeorder_fen_md fenitem) {
AS_ID = Guid.NewGuid().ToString();
SHIPPERID = fenitem.SHIPPERID;
var _shipper = v_info_shipper_md.GetShipper(SHIPPERID);
if (_shipper == null)
if (_shipper != null)
{
SHIPPER = _shipper.shipperdetail;
}
CONSIGNEEID = fenitem.CONSIGNEEID;
var _CONSIGNEE = v_info_shipper_md.GetShipper(CONSIGNEEID);
if (_CONSIGNEE == null)
if (_CONSIGNEE != null)
{
CONSIGNEE = _CONSIGNEE.shipperdetail;
}
NOTIFYPARTYID = fenitem.NOTIFYPARTYID;
var _NOTIFYPARTY = v_info_shipper_md.GetShipper(NOTIFYPARTYID);
if (_NOTIFYPARTY == null)
if (_NOTIFYPARTY != null)
{
NOTIFYPARTY = _NOTIFYPARTY.shipperdetail;
}

File diff suppressed because it is too large Load Diff

@ -73,7 +73,6 @@ D:\DS7\DSWeb.Interface\bin\Debug\Microsoft.Practices.Unity.dll
D:\DS7\DSWeb.Interface\bin\Debug\DSWeb.Common.pdb
D:\DS7\DSWeb.Interface\bin\Debug\DSWeb.Common.dll.config
D:\DS7\DSWeb.Interface\bin\Debug\HcDBUtility.pdb
D:\DS7\DSWeb.Interface\bin\Debug\EntityFramework.xml
D:\DS7\DSWeb.Interface\bin\Debug\log4net.xml
D:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.AssemblyReference.cache
D:\DS7\DSWeb.Interface\obj\Debug\DSWeb.Interface.csproj.CoreCompileInputs.cache

@ -198,9 +198,9 @@ namespace DSWeb.MvcShipping.Controllers
if (opstatus == "add")
{
//MsSysBillNoSetDAL.GetBillNo(billnoset, enumValue.ETD.ToString().Trim(), enumValue.ACCDATE.ToString().Trim(), "", "", enumValue.SALECORPID);
//headData.ORDNO = PubSysDAL.GetBillNo("0309");
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='销售订舱' AND RULEBLNO='委托编号' ", headData.SALECORPID );
headData.ORDNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD, headData.ETD, "", "", headData.SALECORPID);
headData.ORDNO = PubSysDAL.GetBillNo("0309");
//var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='销售订舱' AND RULEBLNO='委托编号' ", headData.SALECORPID );
//headData.ORDNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD, headData.ETD, "", "", headData.SALECORPID);
headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]);
headData.BSDATE = DateTime.Now;
headData.ORSTATUS ="9";
@ -927,7 +927,8 @@ namespace DSWeb.MvcShipping.Controllers
headData.CORPID = Convert.ToString(Session["COMPANYID"]);
headData.SALECORPID = OrderData.SALECORPID;
headData.CORPID = OrderData.SALECORPID;
headData.INPUTBY = Convert.ToString(Session["SHOWNAME"]);
headData.BSDATE = DateTime.Now;
@ -1075,12 +1076,15 @@ namespace DSWeb.MvcShipping.Controllers
if (headData.ISSUEDATE == "") headData.ISSUEDATE = null;
if (headData.CLOSINGDATE == "") headData.CLOSINGDATE = null;
var cdc = new CommonDataContext();
var _sale = cdc.VW_user.FirstOrDefault(x => x.SHOWNAME == headData.SALE);
var isuse = MsBaseInfoDAL.GetRuleUse("委托编号", "1");
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'", Convert.ToString(Session["COMPANYID"]));
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'", headData.SALECORPID);
if (billnoset.BILLTYPE != "")
headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP);
headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP, headData.SALECORPID);
else
headData.CUSTNO = MsOpSeaeDAL.getCodeRule("委托编号", "CUSTNO", headData.BSDATE.ToString().Trim(), accdate, Convert.ToString(Session["USERID"]), Convert.ToString(Session["COMPANYID"]));
headData.CUSTNO = MsOpSeaeDAL.getCodeRule("委托编号", "CUSTNO", headData.BSDATE.ToString().Trim(), accdate, _sale.USERID, headData.SALECORPID);
T_ALL_DA T_ALL_DA = new T_ALL_DA();
if (!string.IsNullOrEmpty(headData.SALECORPID))
{
@ -1203,7 +1207,7 @@ namespace DSWeb.MvcShipping.Controllers
}
//20220719 增加海运出口的分单信息(根据销售订舱的分单信息)
MsSeaeOrderDAL.OrderToOp_MakeFen(headData, Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
MsSeaeOrderDAL.OrderToOp_MakeFen(headData,OrderData, Convert.ToString(Session["USERID"]).ToString().Trim(), Convert.ToString(Session["COMPANYID"]).ToString().Trim());
}

@ -26,7 +26,8 @@ using DSWeb.MvcShipping.DAL.MsInfoClient;
using DSWeb.SoftMng.DAL.SoftSysTable;
using DSWeb.Areas.MvcShipping.DAL.BookingConfirm;
using DSWeb.Areas.MvcShipping.DAL;
using DSWeb.Common.DB;
using System.Linq;
namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
{
@ -1717,12 +1718,17 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
var result = new DBResult();
var cdc = new CommonDataContext();
var _sale = cdc.VW_user.FirstOrDefault(x => x.SHOWNAME == headData.SALE);
headData.SALECORPID = _sale.COMPANYID;
var isPost = true;
var errorstr = "";
var isuse = false;
var iscreatecustno = false;
var custno = "";
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号' ", companyid);
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号' ", _sale.COMPANYID);
if (billnoset.BILLTYPE != "")
isuse = true;
else

@ -1199,20 +1199,29 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
headData.ORDERNO = OrderData.BCNO;
headData.APPLYNO = OrderData.DIANSHANGORDERNO;
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'",COMPANYID);
if (billnoset.BILLTYPE != "")
headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP);
T_ALL_DA T_ALL_DA = new T_ALL_DA();
if (!string.IsNullOrEmpty(headData.SALECORPID))
{
//var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号'",COMPANYID);
//if (billnoset.BILLTYPE != "")
// headData.CUSTNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP);
//T_ALL_DA T_ALL_DA = new T_ALL_DA();
//if (!string.IsNullOrEmpty(headData.SALECORPID))
//{
// headData.SALECORPID = OrderData.SALECORPID;
//}
//else
//{
// var SALECORPID = T_ALL_DA.GetStrSQL("COMPANYID", "select top 1 COMPANYID from [VW_user] where SHOWNAME='" + op + "'");
// headData.SALECORPID = SALECORPID;
//}
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='海运出口' AND RULEBLNO='委托编号' ", OrderData.SALECORPID);
var custno = MsSysBillNoSetDAL.GetBillNo(billnoset, headData.ETD.ToString().Trim(), headData.ACCDATE.ToString().Trim(), "", headData.OP, headData.SALECORPID);
headData.SALECORPID = OrderData.SALECORPID;
}
else
{
headData.CORPID = OrderData.SALECORPID;
headData.CUSTNO = custno;
var SALECORPID = T_ALL_DA.GetStrSQL("COMPANYID", "select top 1 COMPANYID from [VW_user] where SHOWNAME='" + op + "'");
headData.SALECORPID = SALECORPID;
}
var modb = new ModelObjectDB();
result = modb.Save(headData);
var BSNO = headData.BSNO;
@ -1220,7 +1229,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
{
result = modb.Save(OrderData);
result = MsSeaeOrderDAL.AddOrderDetail(OrderData.BSNO, OrderData.ORDNO, userid, COMPANYID);
T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
MsOpSeaeDAL.MsOpSeaeDAL.getCNTRTOTAL(OrderData.BSNO, "op_seae");
var USERID = T_ALL_DA.GetStrSQL("GID", "select top 1 GID from [user] where SHOWNAME='" + op + "'");
var Msgdata = new SYSMessagemb();
@ -1317,7 +1326,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
//20220719
OrderToOp_MakeFen(headData, userid,COMPANYID);
OrderToOp_MakeFen(headData, OrderData, userid,COMPANYID);
}
@ -1328,7 +1337,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
/// 根据crm_seaeorder_fen的信息 产生
/// </summary>
/// <param name="OrderData"></param>
public static void OrderToOp_MakeFen(MsOpSeae headdata,string userid,string companyid) {
public static void OrderToOp_MakeFen(MsOpSeae headdata, MsSeaeOrder orderhead,string userid,string companyid) {
//
@ -1336,7 +1345,6 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
var cdc = new CommonDataContext();
var fenlist = cdc.crm_seaeorder_fen.Where(x => x.MASTERNO == headdata.BSNO).ToList();
if (fenlist != null && fenlist.Count > 0) {
var _count = 0;
@ -1353,12 +1361,12 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
newrec = AutoMapperHelper.MapTo<MsOpSeae, OP_SEAE_BILLMANAGE_md>(headdata);
newrec.GetFenValue(fen);
GetFenValue(ref newrec,fen);
newrec.AGENT = headdata.CONSIGNEE;
newrec.AGENTID = headdata.CONSIGNEEID;
newrec.ORDERNO = orderhead.BCNO;
if (fenlist.Count == 1)
newrec.HBLNO = headdata.CUSTNO;
@ -1373,11 +1381,10 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
_tail += BasicDataRefDAL.chrtostr(65 + _count % 25);
newrec.HBLNO = headdata.CUSTNO + _tail;
_count++;
}
cdc.OP_SEAE_BILLMANAGE.Add(newrec);
@ -1478,6 +1485,52 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
}
}
public static void GetFenValue( ref OP_SEAE_BILLMANAGE_md newrec,crm_seaeorder_fen_md fenitem)
{
newrec.AS_ID = Guid.NewGuid().ToString();
newrec.SHIPPERID = "";
newrec.SHIPPER = "";
newrec.CONSIGNEEID = "";
newrec.CONSIGNEE = "";
newrec.NOTIFYPARTYID = "";
newrec.NOTIFYPARTY = "";
newrec.OPERATOR = "";
newrec.OPERATORTEL = "";
newrec.OPERATOREMAIL = "";
newrec.SHIPPERID = fenitem.SHIPPERID;
var _shipper = v_info_shipper_md.GetShipper(newrec.SHIPPERID);
if (_shipper != null)
{
newrec.SHIPPER = _shipper.shipperdetail;
}
newrec.CONSIGNEEID = fenitem.CONSIGNEEID;
var _CONSIGNEE = v_info_shipper_md.GetShipper(newrec.CONSIGNEEID);
if (_CONSIGNEE != null)
{
newrec.CONSIGNEE = _CONSIGNEE.shipperdetail;
}
newrec.NOTIFYPARTYID = fenitem.NOTIFYPARTYID;
var _NOTIFYPARTY = v_info_shipper_md.GetShipper(newrec.NOTIFYPARTYID);
if (_NOTIFYPARTY != null)
{
newrec.NOTIFYPARTY = _NOTIFYPARTY.shipperdetail;
}
newrec.CUSTOMERNAME = fenitem.CUSTOMERNAME;
newrec.OPERATOR = fenitem.OPERATOR;
newrec.OPERATORTEL = fenitem.OPERATORTEL;
newrec.OPERATOREMAIL = fenitem.OPERATOREMAIL;
newrec.PKGS = fenitem.PKGS.ToString() ;
newrec.KGS = fenitem.KGS;
newrec.CBM = fenitem.CBM;
}
#endregion
public static DBResult SendMailWithFile(string title, string context, string filePath, string MailToAddress,string username)

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>D:\DS7\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl>
<History>True|2022-08-14T02:57:19.4758701Z;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
<History>True|2022-08-14T08:09:42.2679613Z;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="About.aspx">
@ -12815,10 +12815,10 @@
<publishTime>07/07/2022 21:30:18</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>08/14/2022 12:47:05</publishTime>
<publishTime>08/14/2022 16:19:01</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>08/14/2022 12:47:05</publishTime>
<publishTime>08/14/2022 16:19:01</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>07/30/2022 22:51:42</publishTime>
@ -12869,28 +12869,28 @@
<publishTime>07/30/2022 22:51:42</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll">
<publishTime>08/14/2022 10:56:02</publishTime>
<publishTime>08/14/2022 15:50:03</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll.config">
<publishTime>07/07/2022 21:30:20</publishTime>
</File>
<File Include="bin/DSWeb.Common.pdb">
<publishTime>08/14/2022 10:56:02</publishTime>
<publishTime>08/14/2022 15:50:03</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>08/14/2022 12:46:49</publishTime>
<publishTime>08/14/2022 16:18:47</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>08/14/2022 10:56:03</publishTime>
<publishTime>08/14/2022 15:50:03</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>08/14/2022 10:56:03</publishTime>
<publishTime>08/14/2022 15:50:03</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>08/14/2022 12:46:49</publishTime>
<publishTime>08/14/2022 16:18:47</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>08/14/2022 12:46:50</publishTime>
<publishTime>08/14/2022 16:18:47</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>08/13/2022 23:01:21</publishTime>
@ -17522,7 +17522,7 @@
<publishTime>07/07/2022 21:30:29</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>08/14/2022 12:47:01</publishTime>
<publishTime>08/14/2022 16:18:56</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>07/07/2022 21:30:29</publishTime>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

@ -33,3 +33,9 @@ H:\DS7发布版2019\OfficeHelper\obj\Debug\OfficeHelper.csproj.CoreCompileInputs
H:\DS7发布版2019\OfficeHelper\obj\Debug\OfficeHelper.dll
H:\DS7发布版2019\OfficeHelper\obj\Debug\OfficeHelper.pdb
H:\DS7发布版2019\OfficeHelper\obj\Debug\OfficeHelper.csproj.AssemblyReference.cache
D:\DS7\OfficeHelper\bin\Debug\OfficeHelper.dll
D:\DS7\OfficeHelper\bin\Debug\OfficeHelper.pdb
D:\DS7\OfficeHelper\obj\Debug\OfficeHelper.csproj.AssemblyReference.cache
D:\DS7\OfficeHelper\obj\Debug\OfficeHelper.csproj.CoreCompileInputs.cache
D:\DS7\OfficeHelper\obj\Debug\OfficeHelper.dll
D:\DS7\OfficeHelper\obj\Debug\OfficeHelper.pdb

@ -1 +1 @@
827d301a7d04857534eb624012ca3fc12d538c1a
bb44b602f205e38379c24ae3e2a856bfc209ea74

Loading…
Cancel
Save