DS7_JingHan
hanxuntao 2 years ago
parent 6d247c6559
commit d19d5cbc42

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

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

@ -4708,7 +4708,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
var cmdUpdateAudit = db.GetSqlStringCommand( var cmdUpdateAudit = db.GetSqlStringCommand(
@"delete from op_audit set SORT=0 where bsno='" + bill.BSNO + "'"); @"update op_audit set SORT=0 where bsno='" + bill.BSNO + "'");
db.ExecuteNonQuery(cmdUpdateAudit, tran); db.ExecuteNonQuery(cmdUpdateAudit, tran);
@ -4953,7 +4953,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
var cmdUpdateAudit = db.GetSqlStringCommand( var cmdUpdateAudit = db.GetSqlStringCommand(
@"delete from op_audit set SORT=0 where bsno='" + bill.BSNO + "'"); @"update op_audit set SORT=0 where bsno='" + bill.BSNO + "'");
db.ExecuteNonQuery(cmdUpdateAudit, tran); db.ExecuteNonQuery(cmdUpdateAudit, tran);
var AUDITBACKBLSENDEMAIL = MsSysParamSetDAL.GetData("PARAMNAME='AUDITBACKBLSENDEMAIL'"); var AUDITBACKBLSENDEMAIL = MsSysParamSetDAL.GetData("PARAMNAME='AUDITBACKBLSENDEMAIL'");

@ -2054,7 +2054,7 @@ namespace DSWeb.MvcShipping.Controllers
// errstr = enumValue.CUSTNO; // errstr = enumValue.CUSTNO;
//else //else
// errstr = errstr + "," + enumValue.CUSTNO; // errstr = errstr + "," + enumValue.CUSTNO;
errstr = errstr +"< br />"+ enumValue.CUSTNO+"存在费用,请先删除费用才能删除此票业务!"; errstr = errstr +" "+ enumValue.CUSTNO+"存在费用,请先删除费用才能删除此票业务!";
} }
else else
@ -2083,31 +2083,36 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
{ {
errstr = errstr + "< br />" + enumValue.CUSTNO + "此票拼箱主票存在分票业务,请先删除分票信息!"; errstr = errstr + " " + enumValue.CUSTNO + "此票拼箱主票存在分票业务,请先删除分票信息!";
//var jsonRespose2 = new JsonResponse { Success = false, Message = "此票拼箱主票存在分票业务,请先删除分票信息!" }; //var jsonRespose2 = new JsonResponse { Success = false, Message = "此票拼箱主票存在分票业务,请先删除分票信息!" };
//return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; //return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
} }
if (enumValue.INPUTBY != Convert.ToString(Session["SHOWNAME"])) { if (enumValue.INPUTBY != Convert.ToString(Session["SHOWNAME"])) {
errstr = errstr + "< br />" + enumValue.CUSTNO + "只有录入人本人才能删除此票业务!"; errstr = errstr + " " + enumValue.CUSTNO + "只有录入人本人才能删除此票业务!";
} }
BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from Op_SeaCover WHERE bsno='" + enumValue.BSNO + "' AND (COVERTITLE='发送SO' or COVERTITLE='发送SI' ) "); BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from Op_SeaCover WHERE bsno='" + enumValue.BSNO + "' AND (COVERTITLE='发送SO' or COVERTITLE='发送SI' ) ");
if (BLCOUNT != "0") if (BLCOUNT != "0")
{ {
warningstr = warningstr + "< br />" + enumValue.CUSTNO + "此票已发送EDI"; warningstr = warningstr + " " + enumValue.CUSTNO + "此票已发送EDI";
} }
BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from op_ctn_detail WHERE CTN_ID in (select CTN_ID from op_ctn where bsno='" + enumValue.BSNO + "') "); BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from op_ctn_detail WHERE CTN_ID in (select CTN_ID from op_ctn where bsno='" + enumValue.BSNO + "') ");
if (BLCOUNT != "0") if (BLCOUNT != "0")
{ {
warningstr = warningstr + "< br />" + enumValue.CUSTNO + "此票录入分箱明细"; warningstr = warningstr + " " + enumValue.CUSTNO + "此票录入分箱明细";
}
BLCOUNT = T_ALL_DA.GetStrSQL("BLCOUNT", "select count(*) BLCOUNT from op_ctn where bsno='" + enumValue.BSNO + "' and ISNULL(CNTRNO,'')<>'' ");
if (BLCOUNT != "0")
{
warningstr = warningstr + " " + enumValue.CUSTNO + "此票已录入箱号";
} }
} }
else else
{ {
errstr = errstr + "< br />" + enumValue.CUSTNO + "网上订舱不能删除!"; errstr = errstr + " " + enumValue.CUSTNO + "网上订舱不能删除!";
} }
} }
@ -4806,12 +4811,15 @@ namespace DSWeb.MvcShipping.Controllers
else else
{ {
#region 订舱、确认 #region 订舱、确认
var type = "YTEDI";
if (carrier == "ZIM") type = "ZIMEDI";
var error = MsOpSeaeEdiPortDAL.IsCreateEdi(headList, "YTEDI", filetype, filerole, isbill,carrier); var error = MsOpSeaeEdiPortDAL.IsCreateEdi(headList, "YTEDI", filetype, filerole, isbill,carrier);
if (error == "") if (error == "")
{ {
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='YTEDI' AND CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"])); var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='"+ type + "' AND CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));
var filename = ""; var filename = "";
filename = MsOpSeaeEdiPortDAL.CreateEdi(headList, Convert.ToString(Session["USERID"]), path, mblno, filerole, ftpset, "YTEDI", isbill, 0, carrier, "", "", filetype); filename = MsOpSeaeEdiPortDAL.CreateEdi(headList, Convert.ToString(Session["USERID"]), path, mblno, filerole, ftpset, type, isbill, 0, carrier, "", "", filetype);
if (ftpset.SERVERIP != "" && ftpset.SERVERIP != null) if (ftpset.SERVERIP != "" && ftpset.SERVERIP != null)
{ {
@ -4897,10 +4905,14 @@ namespace DSWeb.MvcShipping.Controllers
else else
{ {
#region 订舱、确认 #region 订舱、确认
var type = "YTEDI";
if (carrier == "ZIM") type = "ZIMEDI";
var error = MsOpSeaeEdiPortDAL.IsCreateEdi(headList, "YTEDI", filetype, filerole,0, carrier); var error = MsOpSeaeEdiPortDAL.IsCreateEdi(headList, "YTEDI", filetype, filerole,0, carrier);
if (error == "") if (error == "")
{ {
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='YTEDI' AND CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"])); var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='"+ type + "' AND CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));
if (ftpset.SENDCODE == "" || ftpset.RECEIVECODE == "") if (ftpset.SENDCODE == "" || ftpset.RECEIVECODE == "")
{ {
result.Success = false; result.Success = false;
@ -4909,7 +4921,7 @@ namespace DSWeb.MvcShipping.Controllers
else else
{ {
var filename = ""; var filename = "";
filename = MsOpSeaeEdiPortDAL.CreateEdi(headList, Convert.ToString(Session["USERID"]), path, mblno, filerole, ftpset, "YTEDI", isbill, 0, carrier, "", "", filetype); filename = MsOpSeaeEdiPortDAL.CreateEdi(headList, Convert.ToString(Session["USERID"]), path, mblno, filerole, ftpset, type, isbill, 0, carrier, "", "", filetype);
filename = Path.GetFileName(filename); filename = Path.GetFileName(filename);
result.Data = "../../EDIFiles/SeaeEdi/" + filename; result.Data = "../../EDIFiles/SeaeEdi/" + filename;
result.Success = true; result.Success = true;

@ -19032,6 +19032,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (string.IsNullOrEmpty(bill.HSCODE)) if (string.IsNullOrEmpty(bill.HSCODE))
{ error = error + "<br />提单号:" + bill.MBLNO + "HS编码不能为空"; } { error = error + "<br />提单号:" + bill.MBLNO + "HS编码不能为空"; }
if (carrier == "APL")
{
if (bill.VESSELID == null || bill.VESSELID == "")
{ error = error + "<br />提单号:" + bill.MBLNO + "船舶呼号不能为空"; }
}
} }
if (filetype != "B" || type == "YML") if (filetype != "B" || type == "YML")

@ -9026,6 +9026,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'TaxUnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false;
@ -9042,6 +9043,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'TaxUnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false;
@ -9092,6 +9094,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'TaxUnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false;
@ -9106,6 +9109,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'FeeName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'CustomerName') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'UnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'TaxUnitPrice') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Quantity') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Amount') agirdcolums[j].hidden = false;
if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false; if (agirdcolums[j].dataIndex == 'Currency') agirdcolums[j].hidden = false;
@ -9350,7 +9354,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
var FEENAME = e.value; var FEENAME = e.value;
} }
var feecustomername = e.record.data['CustomerName'];
if (records.getCount() > 0) { if (records.getCount() > 0) {
@ -9388,7 +9392,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
e.record.set('TaxRate', DefTaxRate); e.record.set('TaxRate', DefTaxRate);
if (_thisfee.ACCTAXRATESAMETAXRATE == 1) e.record.set('AccTaxRate', DefTaxRate); if (_thisfee.ACCTAXRATESAMETAXRATE == 1) e.record.set('AccTaxRate', DefTaxRate);
} }
if (CustomerName == '') { if (feecustomername == '') {
e.record.set('CustomerName', CustomerName); e.record.set('CustomerName', CustomerName);
} }
@ -9478,7 +9482,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
} }
if (FeeType == 2) { if (FeeType == 2) {
if (_thisfee.stroplb != 'op_SeaeOrder' || (_thisfee.stroplb == 'op_SeaeOrder' && CustomerName == '')) { if ((_thisfee.stroplb != 'op_SeaeOrder' && feecustomername == '') || (_thisfee.stroplb == 'op_SeaeOrder' && CustomerName == '')) {
var recordcust = DsStoreQueryBy(this.StoreCustType, 'CUSTTYPE', DefaultCreditRef); var recordcust = DsStoreQueryBy(this.StoreCustType, 'CUSTTYPE', DefaultCreditRef);
if (recordcust.getCount() > 0) { if (recordcust.getCount() > 0) {
var data = recordcust.getAt(0).data; var data = recordcust.getAt(0).data;
@ -9516,7 +9520,7 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
} }
if (FeeType == 1 && _thisfee.stroplb != 'op_SeaeOrder') { if (FeeType == 1 && _thisfee.stroplb != 'op_SeaeOrder') {
if (_thisfee.stroplb != 'op_SeaeOrder' || (_thisfee.stroplb == 'op_SeaeOrder' && CustomerName == '')) { if ((_thisfee.stroplb != 'op_SeaeOrder' && feecustomername == '') || (_thisfee.stroplb == 'op_SeaeOrder' && CustomerName == '')) {
var recordcust = DsStoreQueryBy(this.StoreCustType, 'CUSTTYPE', DefaultDebitRef); var recordcust = DsStoreQueryBy(this.StoreCustType, 'CUSTTYPE', DefaultDebitRef);
if (recordcust.getCount() > 0) { if (recordcust.getCount() > 0) {
var data = recordcust.getAt(0).data; var data = recordcust.getAt(0).data;

@ -214,14 +214,21 @@ Ext.extend(Shipping.MsOpCtnDetailEdit, Ext.Panel, {
} }
}); });
this.StoreDPKGTYPE2 = Ext.create('Ext.data.Store', {
fields: ['ID', 'NAME']
});
this.StoreDPKGTYPE2.add({ "ID": "", "NAME": "没有要求" });
this.StoreDPKGTYPE2.add({ "ID": "1", "NAME": "高度危险" });
this.StoreDPKGTYPE2.add({ "ID": "2", "NAME": "中度危险" });
this.StoreDPKGTYPE2.add({ "ID": "3", "NAME": "低度危险" });
this.storeDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumStore', {}); //this.storeDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumStore', {});
this.storeDPKGTYPE2.load({ params: { enumTypeId: 97305 } }); //this.storeDPKGTYPE2.load({ params: { enumTypeId: 97305 } });
this.comboxDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumCombox', { this.comboxDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumCombox', {
store: this.storeDPKGTYPE2, store: this.storeDPKGTYPE2,
name: 'PKGTYPE', name: 'PKGTYPE',
valueField: 'EnumValueName', valueField: 'ID',
displayField: 'EnumValueName' displayField: 'NAME'
}); });
this.StoreISMP2 = Ext.create('Ext.data.Store', { this.StoreISMP2 = Ext.create('Ext.data.Store', {

@ -204,6 +204,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
minChars: 0, minChars: 0,
queryParam: 'CODENAME', queryParam: 'CODENAME',
name: 'SALE', name: 'SALE',
readOnly:true,
valueField: 'UserName', valueField: 'UserName',
displayField: 'CodeAndName', displayField: 'CodeAndName',
value: SHOWNAME, value: SHOWNAME,
@ -226,6 +227,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
queryMode: 'remote', queryMode: 'remote',
minChars: 0, minChars: 0,
queryParam: 'CODENAME', queryParam: 'CODENAME',
readOnly:true,
name: 'OP', name: 'OP',
valueField: 'UserName', valueField: 'UserName',
displayField: 'CodeAndName', displayField: 'CodeAndName',
@ -302,9 +304,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
_this.storeOpCode2.add(recordCustCode); _this.storeOpCode2.add(recordCustCode);
this.formHead.getForm().findField('SALE').setValue(selectdata.SALE); this.formHead.getForm().findField('SALE').setValue(selectdata.SALE);
if (selectdata.OP != '') { //if (selectdata.OP != '') {
this.formHead.getForm().findField('OP').setValue(selectdata.OP); // this.formHead.getForm().findField('OP').setValue(selectdata.OP);
} //}
if (selectdata.BSSOURCE != '') { if (selectdata.BSSOURCE != '') {
this.formHead.getForm().findField('BSSOURCE').setValue(selectdata.BSSOURCE); this.formHead.getForm().findField('BSSOURCE').setValue(selectdata.BSSOURCE);
} }
@ -2546,14 +2548,22 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
items: [this.gridList] items: [this.gridList]
}); });
this.storeDPKGTYPE = Ext.create('DsExt.ux.RefEnumStore', {}); this.StoreDPKGTYPE = Ext.create('Ext.data.Store', {
this.storeDPKGTYPE.load({ params: { enumTypeId: 97305 } }); fields: ['ID', 'NAME']
});
this.StoreDPKGTYPE.add({ "ID": "", "NAME": "没有要求" });
this.StoreDPKGTYPE.add({ "ID": "1", "NAME": "高度危险" });
this.StoreDPKGTYPE.add({ "ID": "2", "NAME": "中度危险" });
this.StoreDPKGTYPE.add({ "ID": "3", "NAME": "低度危险" });
//this.storeDPKGTYPE = Ext.create('DsExt.ux.RefEnumStore', {});
//this.storeDPKGTYPE.load({ params: { enumTypeId: 97305 } });
this.comboxDPKGTYPE = Ext.create('DsExt.ux.RefEnumCombox', { this.comboxDPKGTYPE = Ext.create('DsExt.ux.RefEnumCombox', {
fieldLabel: '包装等级', //'温度单位', fieldLabel: '包装等级', //'温度单位',
store: this.storeDPKGTYPE, store: this.storeDPKGTYPE,
name: 'PKGTYPE', name: 'PKGTYPE',
valueField: 'EnumValueName', valueField: 'ID',
displayField: 'EnumValueName' displayField: 'NAME'
}); });
this.StoreISMP = Ext.create('Ext.data.Store', { this.StoreISMP = Ext.create('Ext.data.Store', {
@ -3695,14 +3705,21 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
displayField: 'NUM' displayField: 'NUM'
}); });
this.storeDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumStore', {}); this.StoreDPKGTYPE2 = Ext.create('Ext.data.Store', {
this.storeDPKGTYPE2.load({ params: { enumTypeId: 97305 } }); fields: ['ID', 'NAME']
});
this.StoreDPKGTYPE2.add({ "ID": "", "NAME": "没有要求" });
this.StoreDPKGTYPE2.add({ "ID": "1", "NAME": "高度危险" });
this.StoreDPKGTYPE2.add({ "ID": "2", "NAME": "中度危险" });
this.StoreDPKGTYPE2.add({ "ID": "3", "NAME": "低度危险" });
//this.storeDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumStore', {});
//this.storeDPKGTYPE2.load({ params: { enumTypeId: 97305 } });
this.comboxDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumCombox', { this.comboxDPKGTYPE2 = Ext.create('DsExt.ux.RefEnumCombox', {
fieldLabel: '包装等级', //'温度单位', fieldLabel: '包装等级', //'温度单位',
store: this.storeDPKGTYPE2, store: this.storeDPKGTYPE2,
name: 'PKGTYPE', name: 'PKGTYPE',
valueField: 'EnumValueName', valueField: 'ID',
displayField: 'EnumValueName' displayField: 'NAME'
}); });
this.StoreISMP2 = Ext.create('Ext.data.Store', { this.StoreISMP2 = Ext.create('Ext.data.Store', {

@ -7983,7 +7983,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
if (jsonresult.Success) { if (jsonresult.Success) {
this.onDsQuery(); this.onDsQuery();
if (jsonresult.Message != '') if (jsonresult.Message != '')
Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
else else
Ext.Msg.hide(); Ext.Msg.hide();
} }
@ -8020,7 +8020,7 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
if (jsonresult.Success) { if (jsonresult.Success) {
this.onDsQuery(); this.onDsQuery();
if (jsonresult.Message != '') if (jsonresult.Message != '')
Ext.Msg.show({ title: Zi.LAN.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
else else
Ext.Msg.hide(); Ext.Msg.hide();
} }

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView> <ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />

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

Loading…
Cancel
Save