dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

Browse Source
dev
dengyu 3 weeks ago
parent 55b6164b63 3b2413e712
commit 449678ca40
23 changed files with 793 additions and 117 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
Unescape Escape View File

@ -32,7 +32,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
this.ISRATESET = 0;
this.sqlcontext = '';
this.formname = "MsChPayAppSettlementEdit"; //页面名称
Ext.Ajax.timeout = 1200000;
parentWin = window.parent.opener;
mainWin = getMainForm(parentWin);

2
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayInvsettlementEdit.js
Unescape Escape View File

@ -29,7 +29,7 @@ Ext.extend(Shipping.MsChPayInvSettlementEdit, Ext.Panel, {
this.ISRATESET = 0;
this.sqlcontext = '';
this.STLSHOWVOU = 0;
Ext.Ajax.timeout = 1200000;
this.storeMustBe = Ext.create('Ext.data.Store', {
model: 'DsShipping.ux.OpDefValue',
remoteSort: true,

2
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js
Unescape Escape View File

@ -35,7 +35,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
this.FREESTLBYINPUTEXCHANGE = 0;
this.formname = "formMsChPaySettlementBLEdit"; //页面名称
Ext.Ajax.timeout = 1200000;
this.storeMustBe = Ext.create('Ext.data.Store', {
model: 'DsShipping.ux.OpDefValue',
remoteSort: true,

2
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js
Unescape Escape View File

@ -30,7 +30,7 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
this.MsPeriod = null;
this.STLSHOWVOU = 0;
this.ISRATESET = 0;
Ext.Ajax.timeout = 1200000;
_this = this;
this.StoreLockOp = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsFeeOP',

11
DSWeb/Areas/MvcShipping/Controllers/MsRptInvTotalController.cs
Unescape Escape View File

@ -55,6 +55,8 @@ namespace DSWeb.MvcShipping.Controllers
}
var strSql = new StringBuilder();
strSql.Append("SELECT * FROM (");
strSql.Append("SELECT B.BSNO, B.OPLBNAME, B.BSTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,");
strSql.Append("case B.ETD when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.ETD,23) end as ETD");
strSql.Append(",case B.OPDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.OPDATE,23) end as OPDATE,B.ENTERP");
@ -134,6 +136,13 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" ,B.CUSTOMDATE");
strSql.Append(" ,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
strSql.Append(" ,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.REMARK,F.CUSTOMERNAME");
strSql.Append(" ) AS T");
if(feerang == "7")
{
strSql.Append(" WHERE TTL<>0");
}
var sortstring = DatasetSort.Getsortstring(sort);
@ -143,7 +152,7 @@ namespace DSWeb.MvcShipping.Controllers
}
else {
strSql.Append(" order by F.CUSTOMERNAME,B.OPDATE ");
strSql.Append(" order by CUSTNAME,OPDATE ");
}

2
DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
Unescape Escape View File

@ -1000,7 +1000,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
//2017年5月2日14:31:54 需求编号SR2017041800010 -2
//start
string rangstr = "";
if (string.IsNullOrWhiteSpace( optype))
if (!string.IsNullOrWhiteSpace( optype))
{
rangstr=GetRangDAStr(type, optype, userid, username, companyid);
}

13
DSWeb/Areas/MvcShipping/DAL/MsOpRailway/MsOpRailwayDAL.cs
Unescape Escape View File

@ -1054,18 +1054,19 @@ namespace DSWeb.MvcShipping.DAL.MsOpRailwayDAL
}
if (visiblerange == "4")
{
str = " (OP='" + username + "' OR SALE='" + username + "' OR CUSTSERVICE='" + username + "' OR DOC='" + username + "')";
str = " (OP='" + username + "' OR SALE='" + username + "' OR CUSTSERVICE='" + username + "' OR DOC='" + username + "' OR INPUTBY='" + username + "')";
}
else if (visiblerange == "3")
{
str = " (OP='" + username + "' OR SALE='" + username + "' OR CUSTSERVICE='" + username + "' OR DOC='" + username + "')";
str = " (OP='" + username + "' OR SALE='" + username + "' OR CUSTSERVICE='" + username + "' OR DOC='" + username + "' OR INPUTBY='" + username + "')";
}
else if (visiblerange == "2")
{
var rangeDa = new RangeDA();
var deptname = rangeDa.GetDEPTNAME(userid);
str = " (OP in (select showname from [user] where GID in (select USERID from user_company where COMPANYID='" + companyid + "') and GID in (select userid from user_baseinfo where DEPTNAME='" + deptname + "'))"
+ " )";
var deptid = rangeDa.GetDEPTGID(userid);
str = " (OP in (select showname from vw_user where deptgid='" + deptid + "') OR SALE in (select showname from vw_user where deptgid='" + deptid + "') OR CUSTSERVICE in (select showname from vw_user where deptgid='" + deptid + "') "
+ " OR DOC in (select showname from vw_user where deptgid='" + deptid + "') OR INPUTBY in (select showname from vw_user where deptgid='" + deptid + "'))";
}
else if (visiblerange == "1")
{
@ -1132,7 +1133,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpRailwayDAL
reader.Close();
}
if (opstr == "") opstr = "('" + username + "')";
str = " (B.OP in " + opstr + " or B.SALE in " + opstr + " or B.CUSTSERVICE IN " + opstr + " or B.DOC IN " + opstr + ")";
str = " (B.OP in " + opstr + " or B.SALE in " + opstr + " or B.CUSTSERVICE IN " + opstr + " or B.DOC IN " + opstr + " or B.INPUTBY IN " + opstr + ")";
}
else

309
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -20466,9 +20466,9 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else
{
error += formatlengthError("txt", bill.SHIPPER, 75, bill.MBLNO, "发货人", 6, "*", false);
error += formatlengthError("txt", bill.SHIPPER, 75, bill.MBLNO, "发货人", 6, "*", false);
}
}
}
@ -20490,16 +20490,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
else
{
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "**", false);
}
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "**", false);
}
}
}
#endregion
@ -20519,16 +20519,16 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
else
{
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "***", false);
}
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "***", false);
}
}
}
#endregion
@ -20889,6 +20889,43 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
//注：QUOTATION NO.项填本票订舱货的运价是通过向中集询价后定下的特殊运价编号。
+ "'");
}
else if (carrier == "VOL")
{
var sendno = ftpset.SENDEMAIL;
if (sendno == "")
{
T_ALL_DA T_ALL_DA = new T_ALL_DA();
DataSet dsUserOp = T_ALL_DA.GetAllSQL("select top 1 * from [user] as u INNER JOIN user_baseinfo as b on u.GID=b.USERID where u.GID='" + usercode + "'");
sendno = dsUserOp.Tables[0].Rows[0]["EMAIL1"].ToString().Trim();
}
if (filetype == "E") sendno = OpAms.AMSCODE;
var bpcode = formatEdiStr("txt", OpAms.ORDERREMARK.Replace("\n", " ").Replace("\r", " "));
if (string.IsNullOrEmpty(bpcode)) bpcode = ftpset.SENDCODE;
r.WriteLine("02"
+ ":" + bill.CUSTNO//2 REFERENCE NO. 运编号 X(35) 一般为流水号 M
+ ":" + bill.MBLNO//3 B\L NO. 提单号 X(20) 船公司的提单号 C
+ ":" + GetSERVICEEDICode(bill.SERVICE, "YTEDI")//4 DELIVERY TERM 交货条款 X(9) CY-CY(pier-pier/port):30CY-CFS(pier/port-door):29CFS-CY(door-pier/port):28CFS-CFS(door-door):27 M
+ ":" + bpcode//5 BOOKING PARTY 订舱人说明 X(70) 货代方企业名称或代码 C
+ ":" + carrier//6 ISSUE PARTY CODE 签单人代码 X(13) 即接受订舱的人的代码 M
+ ":"//7 ISSUE PARTY 签单人说明 X(35) 　 C
+ ":"//8 APPLICANT 询价单位 X(13) 向船公司询价的单位代码 C
+ ":"//9 FOB BK PARTY 国外订舱单位 X(13) 国外FOB货订舱单位的代码 C
+ ":"//10 B/L TRANSHIP ID 转船标识 X(1) Y/N C
+ ":"//11 BATCH ID 分批 X(1) Y/N C
+ ":"//12 SHIPMENT DATE 装期 9(8) CCYYMMDD C
+ ":"//13 EXPIRY DATE 效期 9(8) CCYYMMDD C
+ ":" + bpcode // 14 QUOTATION NO. 运费协议号 X(30) MAERSK为必选 C
+ ":"//15 CHARGE TYPE 费率本代码 X(1) 　 C
+ ":" + bill.CONTRACTNO//16 S/C NO. 合约号 X(30) 　 C
+ ":"//17 BOOKING NO. 船公司订舱编号 X(20) 船公司系统内部订舱编号 C
+ ":"//18 SLOT CHARTER ID 舱位互用标识 X(1) 　 C
+ ":" + sendno//19 AMS CODE AMS代码 X(15) 　 C
//注：QUOTATION NO.项填本票订舱货的运价是通过向中集询价后定下的特殊运价编号。
+ "'");
}
else
{
@ -21102,9 +21139,52 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
if (type == "VOLTAEDI")
r.WriteLine("20:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
else
r.WriteLine("20:"+ shippingcode + ":" + formatListStr(ShippingList, 9,true) + "'");
{
var strtemp2 = "";
//if (ShippingList.Count <= 6)
r.WriteLine("20:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
icount = icount + 1;
//else {
// int line= 1;
// for (var i = 0; i < ShippingList.Count; i++)
// {
// if (ShippingList[i] != "")
// {
// if (line <= 6)
// {
// if (line == 1)
// {
// strtemp2 = "20:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// else if (line == 6)
// {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]);
// }
// else {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// else {
// r.WriteLine(strtemp2 + "'");
// icount = icount + 1;
// line = 1;
// strtemp2 = "20:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// line = line+1;
// }
// r.WriteLine(strtemp2 + "'");
// icount = icount + 1;
//}
}
else
r.WriteLine("20:" + shippingcode + ":" + formatListStr(ShippingList, 9, true) + "'");
icount = icount + 1;
}
@ -21122,7 +21202,53 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
if (type == "VOLTAEDI")
r.WriteLine("21:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
{
var strtemp2 = "";
//if (ShippingList.Count <= 6)
r.WriteLine("21:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
icount = icount + 1;
//else
//{
// int line = 1;
// for (var i = 0; i < ShippingList.Count; i++)
// {
// if (ShippingList[i] != "")
// {
// if (line <= 6)
// {
// if (line == 1)
// {
// strtemp2 = "21:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// else if (line == 6)
// {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]);
// }
// else
// {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// else
// {
// r.WriteLine(strtemp2 + "'");
// icount = icount + 1;
// line = 1;
// strtemp2 = "21:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// line = line + 1;
// }
//}
//r.WriteLine(strtemp2 + "'");
//icount = icount + 1;
}
else
r.WriteLine("21:" + shippingcode + ":" + formatListStr(ShippingList, 9, true) + "'");
icount = icount + 1;
@ -21143,7 +21269,51 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
if (type == "VOLTAEDI")
r.WriteLine("22:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
{
//var strtemp2 = "";
//if (ShippingList.Count <= 6)
r.WriteLine("22:" + shippingcode + ":" + formatListStr(ShippingList, 6, true) + "'");
//else
//{
// int line = 1;
// for (var i = 0; i < ShippingList.Count; i++)
// {
// if (ShippingList[i] != "")
// {
// if (line <= 6)
// {
// if (line == 1)
// {
// strtemp2 = "22:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// else if (line == 6)
// {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]);
// }
// else
// {
// strtemp2 = strtemp2 + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// else
// {
// r.WriteLine(strtemp2 + "'");
// icount = icount + 1;
// line = 1;
// strtemp2 = "22:" + shippingcode + ":" + formatEdiStr("txt", ShippingList[i]) + ":";
// }
// }
// line = line + 1;
// }
//}
//r.WriteLine(strtemp2 + "'");
//icount = icount + 1;
}
else
r.WriteLine("22:"+ shippingcode + ":" + formatListStr(ShippingList, 9,true) + "'");
icount = icount + 1;
@ -21260,20 +21430,41 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else
Shipping =bill.MARKS;
ShippingList = formatlengthStr(Shipping, 35);
for (var i = 0; i < Math.Ceiling(Convert.ToDecimal(Convert.ToDecimal(ShippingList.Count) / Convert.ToDecimal(10))); i++)
if (type == "VOLTAEDI")
{
var tempstr = "44:";
for (var z = 0; z < 10; z++)
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
if ((i * 10 + z) < ShippingList.Count)
tempstr = tempstr + formatEdiStr("txt", ShippingList[i * 10 + z]);
if (z < 9) tempstr = tempstr + ":";
for (var i = 0; i < ShippingList.Count; i++)
{
if (ShippingList[i] != "")
{
var strtemp2 = "44:" + formatEdiStr("txt", ShippingList[i]);
r.WriteLine(strtemp2 + "'");
icount = icount + 1;
}
}
}
if (tempstr != "44:")
}
else
{
for (var i = 0; i < Math.Ceiling(Convert.ToDecimal(Convert.ToDecimal(ShippingList.Count) / Convert.ToDecimal(10))); i++)
{
r.WriteLine(tempstr + "'");
icount++;
var tempstr = "44:";
for (var z = 0; z < 10; z++)
{
if ((i * 10 + z) < ShippingList.Count)
tempstr = tempstr + formatEdiStr("txt", ShippingList[i * 10 + z]);
if (z < 9) tempstr = tempstr + ":";
}
if (tempstr != "44:")
{
r.WriteLine(tempstr + "'");
icount++;
}
}
}
@ -21288,29 +21479,51 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
for (var i = 0; i < ShippingList.Count; i++)
if (type == "VOLTAEDI")
{
if (ShippingList[i] != "")
if (ShippingList.Count != 0 && Shipping.Length > 0)
{
if (m <= 5)
for (var i = 0; i < ShippingList.Count; i++)
{
if (m == 1) strtemp = "47:" + formatEdiStr("txt", ShippingList[i]) + ":";
else
if (ShippingList[i] != "")
{
if (m == 5)
strtemp = strtemp + formatEdiStr("txt", ShippingList[i]);
else
strtemp = strtemp + formatEdiStr("txt", ShippingList[i]) + ":";
var strtemp2 = "47:" + formatEdiStr("txt", ShippingList[i]);
r.WriteLine(strtemp2 + "'");
icount = icount + 1;
}
}
else
}
}
else
{
for (var i = 0; i < ShippingList.Count; i++)
{
if (ShippingList[i] != "")
{
m = 1;
r.WriteLine(strtemp + "'");
strtemp = "47:" + formatEdiStr("txt", ShippingList[i]) + ":";
icount = icount + 1;
if (m <= 5)
{
if (m == 1) strtemp = "47:" + formatEdiStr("txt", ShippingList[i]) + ":";
else
{
if (m == 5)
strtemp = strtemp + formatEdiStr("txt", ShippingList[i]);
else
strtemp = strtemp + formatEdiStr("txt", ShippingList[i]) + ":";
}
}
else
{
m = 1;
r.WriteLine(strtemp + "'");
strtemp = "47:" + formatEdiStr("txt", ShippingList[i]) + ":";
icount = icount + 1;
}
m = m + 1;
}
m = m + 1;
}
}
}

37
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireEdit.js
Unescape Escape View File

@ -3042,9 +3042,9 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
selModel: this.GridCheckBoxModelCtn,
plugins: [this.gridListCellEditing],
selType: 'cellmodel',
features: [{
ftype: 'summary'//Ext.grid.feature.Summary表格汇总特性
}],
//features: [{
// ftype: 'summary'//Ext.grid.feature.Summary表格汇总特性
//}],
tbar: [{
text: Zi.LAN.btnadddetails, //'增加明细',
tooltip: Zi.LAN.btnadddetails, //'增加明细',
@ -3109,7 +3109,7 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
var CBM = 0;
for (var i = 0; i < _this.storeBodyList.getCount(); i += 1) {
var member = _this.storeBodyList.getAt(i);
CBM = Add(CBM, member.data.CBM);
CBM = Add(CBM, member.data.CBM,5);
}
_this.formEdit.getForm().findField('CBM').setValue(CBM);
_this.SetFEEKGSChangeNew();
@ -3123,6 +3123,8 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
}
}]
});
var btnaddbs = Ext.getCmp('btnaddbs');
var btnESaveAndNew = Ext.getCmp('btnESaveAndNew');
var btnECopyNew = Ext.getCmp('btnECopyNew');
@ -4078,11 +4080,11 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
SetFEEKGSChangeNew: function () {
var KGS = this.formEdit.getForm().findField('KGS').getValue();
var CBM = this.formEdit.getForm().findField('CBM').getValue();
var ACBM = Div(CBM, 0.006);
var ACBM = Div(CBM, 0.006,5);
var ACBMSTR = ACBM.toString();
if (ACBMSTR.indexOf('.') > 0) {
var arr1 = ACBMSTR.split(".");
var postr = arr1[1].substr(1, 1);
var postr = arr1[1].substr(0, 1);
var acbm = Number(arr1[0]);
if (postr == '0') ACBMSTR = arr1[0];
else if (postr == '1' || postr == '2' || postr == '3' || postr == '4' || postr == '5') ACBMSTR = arr1[0] + '.5';
@ -4234,9 +4236,22 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
var HEIGHT = e.record.data['HEIGHT'];
var CTNFEE = Mul3(LENGTH, WIDTH, HEIGHT, 2);
var CBM = Mul(PKGS, CTNFEE, 2);
CBM=Div(CBM, 1000);
CBM = Div(CBM, 1000).toFixed(3);
var CBM = Mul(PKGS, CTNFEE, 5);
// CBM=Div(CBM, 1000);
CBM = Div(CBM,1000000,6).toString();
if (CBM.indexOf('.') > 0) {
var arr1 = CBM.split(".");
if (arr1[1].length >= 5) {
var postr = arr1[1].substr(4, 1);
var postr2 = arr1[1].substr(5, 1);
var acbm = Number(arr1[0] + '.' + arr1[1].substr(0, 4));
if (postr == '0' && (postr2 == '' || postr2=='0')) CBM = acbm;
else CBM = Add(acbm, 0.0001, 5);
}
}
e.record.set('CBM', CBM);
}
@ -4280,11 +4295,11 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
bodydatas.push(member);
/* ttlcbm=*/
ttlcbm = Add(ttlcbm, CBM, 2);
ttlcbm = Add(ttlcbm, CBM, 5);
}
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
_this.SetFEEKGSChangeNew();
this.formEdit.getForm().findField('CBM').setValue(ttlcbm);
_this.SetFEEKGSChangeNew();
me = this;
Ext.Msg.wait(Zi.LAN.ZhengZaiCaoZuoShuJu);

104
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireFenEdit.js
Unescape Escape View File

@ -1129,15 +1129,25 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
listeners: {
scope: this,
change: function (field, newValue, oldValue, eOpts) {
if (newValue == oldValue) return;
var ttl = parseFloatDef(this.formEdit.getForm().findField('TTLFREIGHT').getValue(), 0);
var BLFRT = this.formEdit.getForm().findField('BLFRT').getValue();
var OTFRT = this.formEdit.getForm().findField('OTFRT').getValue();
if (BLFRT == 'PP') {
if (ttl != 0)
this.formEdit.getForm().findField('PFREIGHT').setValue(ttl);
} else if (OTFRT == 'CC') {
if (ttl != 0)
if (ttl != 0) {
this.formEdit.getForm().findField('PFREIGHT').setValue(ttl);
this.formEdit.getForm().findField('CFREIGHT').setValue('');
}
this.feechange();
} else if (BLFRT == 'CC') {
if (ttl != 0) {
this.formEdit.getForm().findField('CFREIGHT').setValue(ttl);
this.formEdit.getForm().findField('PFREIGHT').setValue('');
}
this.feechange();
}
}
}
@ -1537,13 +1547,20 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
if (newValue == oldValue) return;
var ttl = parseFloatDef(newValue, 0);
var BLFRT = this.formEdit.getForm().findField('BLFRT').getValue();
var OTFRT = this.formEdit.getForm().findField('OTFRT').getValue();
if (BLFRT == 'PP') {
if (ttl != 0)
this.formEdit.getForm().findField('PFREIGHT').setValue(ttl);
} else if (OTFRT == 'CC') {
if (ttl != 0)
if (ttl != 0) {
this.formEdit.getForm().findField('PFREIGHT').setValue(ttl);
this.formEdit.getForm().findField('CFREIGHT').setValue('');
}
this.feechange();
} else if (BLFRT == 'CC') {
if (ttl != 0) {
this.formEdit.getForm().findField('CFREIGHT').setValue(ttl);
this.formEdit.getForm().findField('PFREIGHT').setValue('');
}
this.feechange();
}
}
@ -3044,9 +3061,9 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
selModel: this.GridCheckBoxModelCtn,
plugins: [this.gridListCellEditing],
selType: 'cellmodel',
features: [{
ftype: 'summary'//Ext.grid.feature.Summary表格汇总特性
}],
//features: [{
// ftype: 'summary'//Ext.grid.feature.Summary表格汇总特性
//}],
tbar: [{
text: '增加明细', //'增加明细',
tooltip: '增加明细', //'增加明细',
@ -3111,9 +3128,10 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
var CBM = 0;
for (var i = 0; i < _this.storeBodyList.getCount(); i += 1) {
var member = _this.storeBodyList.getAt(i);
CBM = Add(CBM, member.data.CBM);
CBM = Add(CBM, member.data.CBM, 5);
}
_this.formEdit.getForm().findField('CBM').setValue(CBM);
_this.SetFEEKGSChangeNew();
me.winCtnListShow.close();
}
@ -3838,9 +3856,39 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
this.formEdit.getForm().findField('CCARRIEROT').setValue(ttl);
}
this.formEdit.getForm().findField('OTFEE').setValue(s);
var OTFRT = this.formEdit.getForm().findField('OTFRT').getValue();
if (OTFRT == 'PP') {
if (ttl != 0)
this.formEdit.getForm().findField('PCARRIEROT').setValue(ttl);
this.formEdit.getForm().findField('CCARRIEROT').setValue('');
} else if (OTFRT == 'CC') {
if (ttl != 0)
this.formEdit.getForm().findField('CCARRIEROT').setValue(ttl);
this.formEdit.getForm().findField('PCARRIEROT').setValue('');
}
this.feechange();
},
feechange: function () {
var pfreight = this.formEdit.getForm().findField('PFREIGHT').getValue();
var PCARRIEROT = this.formEdit.getForm().findField('PCARRIEROT').getValue();
var ttl = Add(pfreight, parseFloatDef(PCARRIEROT, 0));
var POTFREIGHT = this.formEdit.getForm().findField('POTFREIGHT').getValue();
ttl = Add(ttl, parseFloatDef(POTFREIGHT, 0));
this.formEdit.getForm().findField('PTOTAL').setValue(ttl);
var cfreight = this.formEdit.getForm().findField('CFREIGHT').getValue();
var CCARRIEROT = this.formEdit.getForm().findField('CCARRIEROT').getValue();
var cttl = Add(cfreight, parseFloatDef(CCARRIEROT, 0));
var COTFREIGHT = this.formEdit.getForm().findField('COTFREIGHT').getValue();
cttl = Add(cttl, parseFloatDef(COTFREIGHT, 0));
this.formEdit.getForm().findField('CTOTAL').setValue(cttl);
},
//#region
LoadDefValue: function () {
this.storeDefValue.load({ params: { condition: "BSTYPE='空运出口'" },
@ -4057,11 +4105,11 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
var ACBMSTR = ACBM.toString();
if (ACBMSTR.indexOf('.') > 0) {
var arr1 = ACBMSTR.split(".");
var postr = arr1[1].substr(1, 1);
var postr = arr1[1].substr(0, 1);
var acbm = Number(arr1[0]);
if (postr == '0') ACBMSTR = arr1[0];
else if (postr == '1' || postr == '2' || postr == '3' || postr == '4' || postr == '5') ACBMSTR = arr1[0] + '.5';
else if (postr == '6' || postr == '7' || postr == '8' || postr == '9') ACBMSTR = Add(acbm,1);
else if (postr == '6' || postr == '7' || postr == '8' || postr == '9') ACBMSTR = Add(acbm, 1);
}
ACBM = Number(ACBMSTR);
var feekgs = 0;
@ -4209,9 +4257,22 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
var HEIGHT = e.record.data['HEIGHT'];
var CTNFEE = Mul3(LENGTH, WIDTH, HEIGHT, 2);
var CBM = Mul(PKGS, CTNFEE, 2);
CBM = CBM / 1000;
CBM = (CBM / 1000).toFixed(2);
var CBM = Mul(PKGS, CTNFEE, 5);
// CBM=Div(CBM, 1000);
CBM = Div(CBM, 1000000, 6).toString();
if (CBM.indexOf('.') > 0) {
var arr1 = CBM.split(".");
if (arr1[1].length >= 5) {
var postr = arr1[1].substr(4, 1);
var postr2 = arr1[1].substr(5, 1);
var acbm = Number(arr1[0] + '.' + arr1[1].substr(0, 4));
if (postr == '0' && (postr2 == '' || postr2 == '0')) CBM = acbm;
else CBM = Add(acbm, 0.0001, 5);
}
}
e.record.set('CBM', CBM);
}
@ -4239,6 +4300,7 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
var bodydatas = [];
var ttlcbm = 0;
for (var i = 0; i < this.storeBodyList.getCount(); i += 1) {
var member = this.storeBodyList.getAt(i);
var LENGTH = member.data.LENGTH;
@ -4250,11 +4312,15 @@ Ext.extend(Shipping.MsOpAireFenEdit, Ext.Panel, {
if (WIDTH == '' || WIDTH == null) member.data.WIDTH = '0';
if (HEIGHT == '' || HEIGHT == null) member.data.HEIGHT = '0';
if (PKGS == '' || PKGS == null) member.data.PKGS = '0';
if (CBM == '' || CBM == null) member.data.CBM= '0';
if (CBM == '' || CBM == null) member.data.CBM = '0';
bodydatas.push(member);
/* ttlcbm=*/
ttlcbm = Add(ttlcbm, CBM, 5);
}
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
this.formEdit.getForm().findField('CBM').setValue(ttlcbm);
_this.SetFEEKGSChangeNew();
//
//

12
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js
Unescape Escape View File

@ -1072,7 +1072,17 @@ Ext.extend(Shipping.MsOpBillLSEdit, Ext.Panel, {
this.GetHBLNo();
},
scope: this
}]
}, {
xtype: 'button',
iconCls: "btnrefresh",
handler: function (button, event) {
if (this.formEdit.getForm().findField('MBLNO').getValue() == '')
this.formEdit.getForm().findField('MBLNO').setValue(this.MainEditRecord.data.MBLNO);
if (this.formEdit.getForm().findField('HBLNO').getValue() == '')
this.formEdit.getForm().findField('HBLNO').setValue(this.MainEditRecord.data.HBLNO);
},
scope: this
}]
}]
}, {

6
DSWeb/Areas/MvcShipping/Viewsjs/MsRptInvTotal/MsRptInvTotalIndex.js
Unescape Escape View File

@ -1669,13 +1669,15 @@ Ext.extend(Shipping.MsRptInvTotalIndex, Ext.Panel, {
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' }
});
this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} });
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel:Zi.LAN.PS_CUSTOMERNAME,
//fieldLabel: '委托单位',
queryMode: 'remote',
minChars: 0,
queryParam: 'CODENAME',
store: this.storeCustCode,
forceSelection: true,
name: 'PS_CUSTOMERNAME',

70
DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
Unescape Escape View File

@ -39,6 +39,7 @@ using DSWeb.MvcShipping.Models.MsChFee;
using DSWeb.Areas.MvcShipping.Models.Message.VGM;
using NPOI.SS.Formula.Functions;
using DSWeb.MvcShipping.DAL.MsOpSeaePreDAL;
using com.sun.tools.@internal.xjc.reader.gbind;
namespace DSWeb.Areas.TruckMng.Controllers
{
@ -588,9 +589,10 @@ namespace DSWeb.Areas.TruckMng.Controllers
// var currentTime = System.DateTime.Now;
// headData.LrDate = currentTime.ToString("d");
//}
headData.LoadFactory = headData.FactoryAddrSe;
headData.ChangedReson = headData.FactoryAddrSe;
headData.FactoryAddrSe = "";
headData.DetiNationSe = "";
var modb2 = new ModelObjectDB();
result = modb2.Save(headData);
if (result.Success)
@ -835,19 +837,24 @@ namespace DSWeb.Areas.TruckMng.Controllers
var headData = MsRptPcHeadEditDAL.GetHYRDData("GID='" + bsno + "'");
var bodyctnData = JsonConvert.Deserialize<List<MsOpSeaeDetail>>(ctnbody);
var Fenlist = MsRptPcHeadEditDAL.GetHYRDList("t.PGID='" + headData.gId + "' AND t.GID<>'" + headData.gId + "'", "","","","",null);
var Fenlist = MsRptPcHeadEditDAL.GetHYRDList("t.PGID='" + headData.gId + "' AND t.GID<>'" + headData.gId + "'", "","","","",null,"1");
if (bodyctnData != null && bodyctnData.Count == 1)
{
var jsonRespose2 = new JsonResponse { Success = true, Message = "不需要生成分票！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
//if (Fenlist!=null&& Fenlist.Count!=0)
//{
// var jsonRespose2 = new JsonResponse { Success = false, Message = "已生成分票,不允许引入生成！" };
// return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
if (headData.TruckSpec == "进口") {
if (bodyctnData != null && bodyctnData.Count<= 2)
{
var jsonRespose2 = new JsonResponse { Success = true, Message = "不需要生成分票！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
}
//}
if (bodyctnData == null|| bodyctnData.Count == 0)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "不存在要生成分票的数据！" };
@ -1158,7 +1165,56 @@ namespace DSWeb.Areas.TruckMng.Controllers
}
public ContentResult DeleteListHYRD(string data)
{
var headList = JsonConvert.Deserialize<List<MsWlPcHead>>(data);
if ((headList!=null)&&(headList.Count!=0)){
foreach (var head in headList)
{
var isfee = MsWlPcDAL.GetFeeCount(head.GId);
if (isfee)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "此票业务存在费用，请先删除费用才能删除此票业务！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
var isfen = MsWlPcDAL.GetFenCount(head.GId);
if (isfen)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "此票业务存在分票，请先删除分票才能删除此票业务！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
else
{
var modb = new ModelObjectDBBill();
DBResult result = modb.Delete(head,
"delete from tMsWlBsFixed where BillNo='" + head.BillNo + "'",
"delete from ch_fee where BsNo='" + head.GId + "'",
"delete from tcard_use where BillNo='" + head.BillNo + "'");
MsSysBillNoSetDAL.DeleteBsNo(head.BillNo);
//var jsonRespose2 = new JsonResponse { Success = result.Success, Message = result.Message };
//return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
}
var jsonRespose = new JsonResponse { Success =true, Message ="删除完成" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
} else
{
var jsonRespose = new JsonResponse { Success =false, Message ="没有需要删除的业务" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
}
public ContentResult HuiDan(string data,string jsonBody)

73
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
Unescape Escape View File

@ -199,7 +199,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.storeTruckNo = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsWlBsHeadRefMsWlTruck',
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoCanUse' },
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoListRm' },
//params: { condition: " A.truckno not in (select DISTINCT truckno from tMsWlPcHead where isnull(isend,0)=0 )"},
autoLoad: false
});
@ -208,6 +208,9 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.comboxTruckNo = Ext.create('DsExt.ux.RefTableCombox', {
//fieldLabel: '车牌号',
//multiSelect:true,
queryMode: 'remote',
minChars: 1,
queryParam: 'TruckNo',
store: this.storeTruckNo, //readOnly:true,
queryMode: 'remote',
name: 'TruckNo', id: "TruckNo",
@ -272,13 +275,16 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.storeWmsTruckNo = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsWlBsHeadRefMsWlTruck',
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoList' }
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoListRm' }
});
this.storeWmsTruckNo.load({ params: { condition: "" } });
this.comboxWmsTruckNo = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeWmsTruckNo,
name: 'WmsTruckNo',
queryMode: 'remote',
minChars: 1,
queryParam: 'TruckNo',
valueField: 'TruckNo',
displayField: 'TruckNo',
matchFieldWidth: true
@ -361,6 +367,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.storeRtnDocStatus2.add({ "FSTATUS": "无转港", "NAME": "无转港" });
this.storeRtnDocStatus2.add({ "FSTATUS": "已办", "NAME": "已办" });
this.comboxRtnDocStatus2 = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeRtnDocStatus2,
valueField: 'FSTATUS',
@ -1811,7 +1818,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
text: "删除", id: "btndelete", //hidden: true,
iconCls: "btndelete",
handler: function (button, event) {
this.onDeleteClick(button, event);
this.onDeleteListClick(button, event);
},
scope: this
}, {
@ -1990,7 +1997,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
tooltip: '删除分票',
iconCls: "btndelete",
handler: function (button, event) {
this.onDeleteClick(button, event, 1);
this.onDeleteListClick(button, event, 1);
},
scope: this
}, {
@ -2716,6 +2723,64 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}, this);
}, //onDeleteClick
onDeleteListClick: function (button, event, type) {
if (type == 1) {
var selections = this.gridListFen.getSelectionModel().getSelection();
} else
var selections = this.gridList.getSelectionModel().getSelection();
var bodyAddDatas = [];
var icount = 0;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
var isdelete = true;
if (rec.data.FEESTATUS == true) {
Ext.Msg.show({ title: '警告', msg: '已费用锁定不允许删除业务！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return;
}
if (isdelete) {
bodyAddDatas.push(rec);
icount = icount + 1;
}
}
Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) {
if (btn == 'yes') {
Ext.Msg.wait('正在删除数据...');
var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
Ext.Ajax.request({
waitMsg: '正在删除数据...',
url: '/TruckMng/PcHeadEdit_WFSD/DeleteListHYRD',
params: {
data: jsonbodyAddDatas
},
callback: function (options, success, response) {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
if (type == 1)
this.storeListfen.reload();
else
this.storeList.reload();
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
}
},
failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
},
success: function (response, options) {
},
scope: this
}); //end Ext.Ajax.request
}
}, this);
}, //onDeleteClick
onBsViewClick: function (button, event) {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {

68
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
Unescape Escape View File

@ -1616,6 +1616,12 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
panelTest.SetEnd("0");
};
this.CheckSaveQuery = new Ext.form.Checkbox({
fieldLabel: '显示分票', //记忆查询条件
checked: true,
width: 120
});
this.panelBtn = new Ext.Panel({
region: "north",
tbar: [
@ -1671,7 +1677,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
text: "删除", id: "btndelete", //hidden: true,
iconCls: "btndelete",
handler: function (button, event) {
this.onDeleteClick(button, event);
this.onDeleteListClick(button, event);
},
scope: this
}, {
@ -1765,7 +1771,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}]
}],
scope: this
}
}, this.CheckSaveQuery
@ -1850,7 +1856,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
tooltip: '删除分票',
iconCls: "btndelete",
handler: function (button, event) {
this.onDeleteClick(button, event, 1);
this.onDeleteListClick(button, event, 1);
},
scope: this
}, {
@ -2616,7 +2622,63 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}, this);
}, //onDeleteClick
onDeleteListClick: function (button, event, type) {
if (type == 1) {
var selections = this.gridListFen.getSelectionModel().getSelection();
} else
var selections = this.gridList.getSelectionModel().getSelection();
var bodyAddDatas = [];
var icount = 0;
for (var i = 0; i < selections.length; i++) {
var rec = selections[i];
var isdelete = true;
if (rec.data.FEESTATUS == true) {
Ext.Msg.show({ title: '警告', msg: '已费用锁定不允许删除业务！', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return;
}
if (isdelete) {
bodyAddDatas.push(rec);
icount = icount + 1;
}
}
Ext.MessageBox.confirm('提示', '确定删除该记录吗？', function (btn) {
if (btn == 'yes') {
Ext.Msg.wait('正在删除数据...');
var jsonbodyAddDatas = ConvertRecordsToJsonAll(bodyAddDatas);
Ext.Ajax.request({
waitMsg: '正在删除数据...',
url: '/TruckMng/PcHeadEdit_WFSD/DeleteListHYRD',
params: {
data: jsonbodyAddDatas
},
callback: function (options, success, response) {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
if (type == 1)
this.storeListfen.reload();
else
this.storeList.reload();
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}
else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
}
},
failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
},
success: function (response, options) {
},
scope: this
}); //end Ext.Ajax.request
}
}, this);
}, //onDeleteClick
onDeleteFn: function (type) {
if (type == 1) {
var selections = this.gridListFen.getSelectionModel().getSelection();

9
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js
Unescape Escape View File

@ -1855,7 +1855,10 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DrvCode').setValue(this.editRecord.get('DrvCode'));
this.formEdit.getForm().findField('PcBillType').setValue(this.editRecord.get('PcBillType'));
this.formEdit.getForm().findField('VoyVeg').setValue(this.editRecord.get('VoyVeg'));
this.formEdit.getForm().findField('ExpDate').setValue(this.editRecord.get('ExpDate'));
var myDate = new Date();
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
this.formEdit.getForm().findField('ExpDate').setValue(mydatestr);
this.formEdit.getForm().findField('VoyVegSe').setValue(this.editRecord.get('VoyVegSe'));
this.formEdit.getForm().findField('EtDateSe').setValue(this.editRecord.get('EtDateSe'));
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));
@ -2057,7 +2060,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DrvCode').setValue(this.editRecord.get('DrvCode'));
this.formEdit.getForm().findField('PcBillType').setValue(this.editRecord.get('PcBillType'));
this.formEdit.getForm().findField('VoyVeg').setValue(this.editRecord.get('VoyVeg'));
this.formEdit.getForm().findField('ExpDate').setValue(this.editRecord.get('ExpDate'));
var myDate = new Date();
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
this.formEdit.getForm().findField('ExpDate').setValue(mydatestr);
this.formEdit.getForm().findField('VoyVegSe').setValue(this.editRecord.get('VoyVegSe'));
this.formEdit.getForm().findField('EtDateSe').setValue(this.editRecord.get('EtDateSe'));
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));

18
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js
Unescape Escape View File

@ -371,13 +371,16 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.storeTruckNo = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsWlBsHeadRefMsWlTruck',
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoList' }
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoListRm' }
});
this.storeTruckNo.load({ params: { condition: ""} });
this.comboxTruckNo = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '空箱车号',
store: this.storeTruckNo,
queryMode: 'remote',
minChars: 1,
queryParam: 'TruckNo',
name: 'TruckNo',
valueField: 'TruckNo',
displayField: 'TruckNo',
@ -396,7 +399,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.storeWmsTruckNo = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsWlBsHeadRefMsWlTruck',
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoList' }
proxy: { url: '/TruckMng/MsWlPc/GetTruckNoListRm' }
});
this.storeWmsTruckNo.load({ params: { condition: "" } });
@ -404,6 +407,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
fieldLabel: '入库车号',
store: this.storeWmsTruckNo,
name: 'WmsTruckNo',
queryMode: 'remote',
minChars: 1,
queryParam: 'TruckNo',
valueField: 'TruckNo',
displayField: 'TruckNo',
matchFieldWidth: true,
@ -2433,7 +2439,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DrvCode').setValue(this.editRecord.get('DrvCode'));
this.formEdit.getForm().findField('PcBillType').setValue(this.editRecord.get('PcBillType'));
this.formEdit.getForm().findField('VoyVeg').setValue(this.editRecord.get('VoyVeg'));
this.formEdit.getForm().findField('ExpDate').setValue(this.editRecord.get('ExpDate'));
var myDate = new Date();
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
this.formEdit.getForm().findField('ExpDate').setValue(mydatestr);
this.formEdit.getForm().findField('VoyVegSe').setValue(this.editRecord.get('VoyVegSe'));
this.formEdit.getForm().findField('EtDateSe').setValue(this.editRecord.get('EtDateSe'));
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));
@ -2629,7 +2637,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DrvCode').setValue(this.editRecord.get('DrvCode'));
this.formEdit.getForm().findField('PcBillType').setValue(this.editRecord.get('PcBillType'));
this.formEdit.getForm().findField('VoyVeg').setValue(this.editRecord.get('VoyVeg'));
this.formEdit.getForm().findField('ExpDate').setValue(this.editRecord.get('ExpDate'));
var myDate = new Date();
var mydatestr = Ext.util.Format.date(myDate, 'Y-m-d');
this.formEdit.getForm().findField('ExpDate').setValue(mydatestr);
this.formEdit.getForm().findField('VoyVegSe').setValue(this.editRecord.get('VoyVegSe'));
this.formEdit.getForm().findField('EtDateSe').setValue(this.editRecord.get('EtDateSe'));
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));

25
DSWeb/EDIFiles/SeaeEdi/177YSRSRQD20241029142644949.txt
Unescape Escape View File

@ -0,0 +1,25 @@
00:IFTMBF:BOOKING:9:::202410291426'
02:[SALE]QDDS2401002:177YSRSRQD:CY-CY::VOL:::::::::::::dongshengsoftware@sdsmartlogistics.com'
03:ORI:DKAAR:AARHUS, DENMARK::03::'
11::MSC BRIDGEPORT:UK403A::::::::::'
12:CNTAO:QINGDAO,CHINA:CNTAO:QINGDAO,CHINA:ARBUE:BUENOS AIRES:::JPUKB:KOBE, JAPAN:ARBUE:BUENOS AIRES'
14:P:FREIGHT PREPAID'
15:::P::::::'
20::SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER:ROAD, WANCHAI, HONG KONG.232:TEL?: ?+86-531-88875230, 88875231::'
21::AGROFINA SA:CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
22::AGROFINA SA:CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
24::AGROFINA SA:::::'
41:1:291899:S:40:CT:CARTON:41012.0000:50.0000::::::41012.0000:::'
44:2,4-D ACID 98% TECH'
44:BATCH NUMBER?: 24GRA0007'
44:PO 46765 FILE 76510'
44:NET WEIGHT?: 1000KG'
44:MANUFACTURING DATE?: JAN.15,2024'
44:EXPIRY DATE?: JAN.15,2026'
44:MADE IN CHINA'
47:20,000.00 KGS 2,4-D ACID 98% TECH PACKED IN 1000KGS BAG, TOTAL 20 '
47:BAGS WITH 20 PALLETS. '
47:NCM NO.?: 2918.99'
47:CLASS?:9 UN NO.?:3077 PG?: III'
48:22GP:2:F:::::N::::N'
99:24'

53
DSWeb/EDIFiles/SeaeEdi/177YSRSRQD20241029142740595.txt
Unescape Escape View File

@ -0,0 +1,53 @@
00:IFTMBF:BOOKING:9:::202410291427'
02:[SALE]QDDS2401002:177YSRSRQD:CY-CY::VOL:::::::::::::dongshengsoftware@sdsmartlogistics.com'
03:ORI:DKAAR:AARHUS, DENMARK::03::'
11::MSC BRIDGEPORT:UK403A::::::::::'
12:CNTAO:QINGDAO,CHINA:CNTAO:QINGDAO,CHINA:ARBUE:BUENOS AIRES:::JPUKB:KOBE, JAPAN:ARBUE:BUENOS AIRES'
14:P:FREIGHT PREPAID'
15:::P::::::'
20::SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:'
11/F., CAPITAL CENTRE, 151 GLOUCESTER:'
ROAD, WANCHAI, HONG KONG.232:'
TEL: +86-531-88875230, 88875231:'
SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:'
11/F., CAPITAL CENTRE, 151 GLOUCESTER'
'
20::ROAD, WANCHAI, HONG KONG.232:'
TEL: +86-531-88875230, 88875231:'
21::AGROFINA SA:'
CUIT: 30-59272454-1:'
THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:'
BUENOS AIRES- ARGENTINA:'
TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
AGROFINA SA'
'
21::CUIT: 30-59272454-1:'
THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:'
BUENOS AIRES- ARGENTINA:'
TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
22::AGROFINA SA:'
CUIT: 30-59272454-1:'
THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:'
BUENOS AIRES- ARGENTINA:'
TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
AGROFINA SA'
'
22::CUIT: 30-59272454-1:'
THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:'
BUENOS AIRES- ARGENTINA:'
TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
24::AGROFINA SA:::::'
41:1:291899:S:40:CT:CARTON:41012.0000:50.0000::::::41012.0000:::'
44:2,4-D ACID 98% TECH'
44:BATCH NUMBER?: 24GRA0007'
44:PO 46765 FILE 76510'
44:NET WEIGHT?: 1000KG'
44:MANUFACTURING DATE?: JAN.15,2024'
44:EXPIRY DATE?: JAN.15,2026'
44:MADE IN CHINA'
47:20,000.00 KGS 2,4-D ACID 98% TECH PACKED IN 1000KGS BAG, TOTAL 20 '
47:BAGS WITH 20 PALLETS. '
47:NCM NO.?: 2918.99'
47:CLASS?:9 UN NO.?:3077 PG?: III'
48:22GP:2:F:::::N::::N'
99:55'

28
DSWeb/EDIFiles/SeaeEdi/177YSRSRQD20241029144713923.txt
Unescape Escape View File

@ -0,0 +1,28 @@
00:IFTMBF:BOOKING:9:::202410291447'
02:[SALE]QDDS2401002:177YSRSRQD:CY-CY::VOL:::::::::::::dongshengsoftware@sdsmartlogistics.com'
03:ORI:DKAAR:AARHUS, DENMARK::03::'
11::MSC BRIDGEPORT:UK403A::::::::::'
12:CNTAO:QINGDAO,CHINA:CNTAO:QINGDAO,CHINA:ARBUE:BUENOS AIRES:::JPUKB:KOBE, JAPAN:ARBUE:BUENOS AIRES'
14:P:FREIGHT PREPAID'
15:::P::::::'
20::SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER:ROAD, WANCHAI, HONG KONG.232:TEL: +86-531-88875230, 88875231:SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER'
20::ROAD, WANCHAI, HONG KONG.232:TEL: +86-531-88875230, 88875231:'
21::AGROFINA SA:CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
21::CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
22::AGROFINA SA:CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
22::CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
24::AGROFINA SA:::::'
41:1:291899:S:40:CT:CARTON:41012.0000:50.0000::::::41012.0000:::'
44:2,4-D ACID 98% TECH'
44:BATCH NUMBER?: 24GRA0007'
44:PO 46765 FILE 76510'
44:NET WEIGHT?: 1000KG'
44:MANUFACTURING DATE?: JAN.15,2024'
44:EXPIRY DATE?: JAN.15,2026'
44:MADE IN CHINA'
47:20,000.00 KGS 2,4-D ACID 98% TECH PACKED IN 1000KGS BAG, TOTAL 20 '
47:BAGS WITH 20 PALLETS. '
47:NCM NO.?: 2918.99'
47:CLASS?:9 UN NO.?:3077 PG?: III'
48:22GP:2:F:::::N::::N'
99:30'

28
DSWeb/EDIFiles/SeaeEdi/177YSRSRQD20241029145229259.txt
Unescape Escape View File

@ -0,0 +1,28 @@
00:IFTMBF:BOOKING:9:::202410291452'
02:[SALE]QDDS2401002:177YSRSRQD:CY-CY::VOL:::::::::::::dongshengsoftware@sdsmartlogistics.com'
03:ORI:DKAAR:AARHUS, DENMARK::03::'
11::MSC BRIDGEPORT:UK403A::::::::::'
12:CNTAO:QINGDAO,CHINA:CNTAO:QINGDAO,CHINA:ARBUE:BUENOS AIRES:::JPUKB:KOBE, JAPAN:ARBUE:BUENOS AIRES'
14:P:FREIGHT PREPAID'
15:::P::::::'
20::SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER:ROAD, WANCHAI, HONG KONG.232:TEL: +86-531-88875230, 88875231:SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER'
20::ROAD, WANCHAI, HONG KONG.232:TEL: +86-531-88875230, 88875231:'
21::AGROFINA SA:CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
21::CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
22::AGROFINA SA:CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
22::CUIT: 30-59272454-1:THAMES ST. 122 - 1'B (POSTAL CODE: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
24::AGROFINA SA:::::'
41:1:291899:S:40:CT:CARTON:41012.0000:50.0000::::::41012.0000:::'
44:2,4-D ACID 98% TECH'
44:BATCH NUMBER?: 24GRA0007'
44:PO 46765 FILE 76510'
44:NET WEIGHT?: 1000KG'
44:MANUFACTURING DATE?: JAN.15,2024'
44:EXPIRY DATE?: JAN.15,2026'
44:MADE IN CHINA'
47:20,000.00 KGS 2,4-D ACID 98% TECH PACKED IN 1000KGS BAG, TOTAL 20 '
47:BAGS WITH 20 PALLETS. '
47:NCM NO.?: 2918.99'
47:CLASS?:9 UN NO.?:3077 PG?: III'
48:22GP:2:F:::::N::::N'
99:30'

28
DSWeb/EDIFiles/SeaeEdi/177YSRSRQD20241029145541436.txt
Unescape Escape View File

@ -0,0 +1,28 @@
00:IFTMBF:BOOKING:9:::202410291455'
02:[SALE]QDDS2401002:177YSRSRQD:CY-CY::VOL:::::::::::::dongshengsoftware@sdsmartlogistics.com'
03:ORI:DKAAR:AARHUS, DENMARK::03::'
11::MSC BRIDGEPORT:UK403A::::::::::'
12:CNTAO:QINGDAO,CHINA:CNTAO:QINGDAO,CHINA:ARBUE:BUENOS AIRES:::JPUKB:KOBE, JAPAN:ARBUE:BUENOS AIRES'
14:P:FREIGHT PREPAID'
15:::P::::::'
20::SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER:ROAD, WANCHAI, HONG KONG.232:TEL?: ?+86-531-88875230, 88875231:SHANDONG RAINBOW AGROSCIENCES CO.,LTD.:11/F., CAPITAL CENTRE, 151 GLOUCESTER'
20::ROAD, WANCHAI, HONG KONG.232:TEL?: ?+86-531-88875230, 88875231:'
21::AGROFINA SA:CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
21::CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
22::AGROFINA SA:CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:AGROFINA SA'
22::CUIT?: 30-59272454-1:THAMES ST. 122 - 1?'B (POSTAL CODE?: 1607) SAN ISIDRO,:BUENOS AIRES- ARGENTINA:TEL 54-011-4735-6800/FAX 54-011-4708-0404:'
24::AGROFINA SA:::::'
41:1:291899:S:40:CT:CARTON:41012.0000:50.0000::::::41012.0000:::'
44:2,4-D ACID 98% TECH'
44:BATCH NUMBER?: 24GRA0007'
44:PO 46765 FILE 76510'
44:NET WEIGHT?: 1000KG'
44:MANUFACTURING DATE?: JAN.15,2024'
44:EXPIRY DATE?: JAN.15,2026'
44:MADE IN CHINA'
47:20,000.00 KGS 2,4-D ACID 98% TECH PACKED IN 1000KGS BAG, TOTAL 20 '
47:BAGS WITH 20 PALLETS. '
47:NCM NO.?: 2918.99'
47:CLASS?:9 UN NO.?:3077 PG?: III'
48:22GP:2:F:::::N::::N'
99:30'

8
JobAutoCreateFee/JobDjyD6Xf.cs
Unescape Escape View File

@ -25,10 +25,10 @@ namespace JobCreateFee
{
string connStr = context.JobDetail.JobDataMap.GetString("ConnectString");
string reqUrl = context.JobDetail.JobDataMap.GetString("DjyReqUrl");
// string companyCode = context.JobDetail.JobDataMap.GetString("DjyCompanyCode");
// string companyName = context.JobDetail.JobDataMap.GetString("DjyCompanyName");
string companyCode = "4fb53bc0-8901-4f0d-a34f-c8a7aeb6692e";
string companyName = "青岛众合恒信国际货运代理有限公司";
string companyCode = context.JobDetail.JobDataMap.GetString("DjyCompanyCode");
string companyName = context.JobDetail.JobDataMap.GetString("DjyCompanyName");
// string companyCode = "4fb53bc0-8901-4f0d-a34f-c8a7aeb6692e";
// string companyName = "青岛众合恒信国际货运代理有限公司";
string FeeName = context.JobDetail.JobDataMap.GetString("FeeName");
string CustName = context.JobDetail.JobDataMap.GetString("CustName");
string companySecret = context.JobDetail.JobDataMap.GetString("DjyCompanySecret");

Write Preview
Loading…
Cancel
Save