DS7_HYRD
hanxuntao 8 months ago
parent 26fe326e7f
commit e7c061b195

@ -539,13 +539,16 @@ namespace DSWeb.Areas.Account.Controllers
} }
if (StrGid != "") if (StrGid != "")
{ {
StrGid = "(" + StrGid + ")"; var headdata = ChinvoiceDAL.GetData(" BILLNO='" + bill + "'", Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
StrGid = "(" + StrGid + ")";
var dataList = ChinvoiceapplicationDAL.GetDataInvList(" BILLSTATUS=0 and GID IN " + StrGid, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"])); var dataList = ChinvoiceapplicationDAL.GetDataInvList(" BILLSTATUS=0 and GID IN " + StrGid, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]));
if (dataList != null && dataList.Count != 0) if (dataList != null && dataList.Count != 0)
{ {
var modb = new ModelObjectDB(); var modb = new ModelObjectDB();
DBResult result = ChinvoiceDAL.AddAppDetail(bill, dataList, invoiceno, Convert.ToString(Session["COMPANYID"]), GID); // DBResult result = ChinvoiceDAL.AddAppDetail(bill, dataList, invoiceno, Convert.ToString(Session["COMPANYID"]), GID);
if (result.Success) { ChinvoiceDAL.p_update_Amount(bill, GID); } DBResult result = ChinvoiceDAL.AddAppDetail2(headdata, dataList, invoiceno, Convert.ToString(Session["COMPANYID"]), GID);
if (result.Success) { ChinvoiceDAL.p_update_Amount(bill, GID); }
var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message }; var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
} }

@ -169,7 +169,12 @@ namespace DSWeb.Areas.Account.Controllers
head.APPLICANTNAME = Convert.ToString(Session["SHOWNAME"]); head.APPLICANTNAME = Convert.ToString(Session["SHOWNAME"]);
// head.CURR = Convert.ToString(Session["LOCALCURR"]); // head.CURR = Convert.ToString(Session["LOCALCURR"]);
head.SETTLETYPE = 7; head.SETTLETYPE = 7;
} if (LAN == "en-us")
{
head.BILLSTATUSREF = "New";
}
}

@ -52,7 +52,8 @@ namespace DSWeb.Areas.Account.Controllers
public ContentResult GetDataList(int start, int limit, string sort, string condition) public ContentResult GetDataList(int start, int limit, string sort, string condition)
{ {
var dataList = ChrecvapplicationDAL.GetDataList(condition, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]), sort); string LAN = Convert.ToString(Session["LANGUAGES"]);
var dataList = ChrecvapplicationDAL.GetDataList(condition, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request), Convert.ToString(Session["COMPANYID"]), sort, LAN);
var list = dataList.Skip(start).Take(limit); var list = dataList.Skip(start).Take(limit);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() }); var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
@ -62,10 +63,11 @@ namespace DSWeb.Areas.Account.Controllers
public ContentResult GetData(string handle, string condition) public ContentResult GetData(string handle, string condition)
{ {
ChRecvapplication head = null; ChRecvapplication head = null;
string LAN = Convert.ToString(Session["LANGUAGES"]);
if (handle == "edit") if (handle == "edit")
{ {
var list = ChrecvapplicationDAL.GetDataList(condition, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request),Convert.ToString(Session["COMPANYID"])); var list = ChrecvapplicationDAL.GetDataList(condition, Convert.ToString(Session["USERID"]), CookieConfig.GetCookie_UserCode(Request),Convert.ToString(Session["COMPANYID"]),null, LAN);
if (list.Count > 0) if (list.Count > 0)
head = list[0]; head = list[0];
} }
@ -82,6 +84,12 @@ namespace DSWeb.Areas.Account.Controllers
head.RECVTIME = DateTime.Now.ToString("yyyy-MM-dd"); head.RECVTIME = DateTime.Now.ToString("yyyy-MM-dd");
// head.CURR = Convert.ToString(Session["LOCALCURR"]); // head.CURR = Convert.ToString(Session["LOCALCURR"]);
head.SETTLETYPE = 7; head.SETTLETYPE = 7;
if (LAN == "en-us")
{
head.BILLSTATUSREF = "New";
}
} }

@ -2552,6 +2552,21 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
return exrate; return exrate;
} }
public static Decimal GetExrate2(string curr, List<DSWeb.MvcShipping.Models.MsChFee.MsFeeCurr> exratelist)
{
decimal exrate = 0;
if (exratelist != null)
{
foreach (var enumValue in exratelist)
{
if (enumValue.CURR == curr)
{
exrate = enumValue.DEFRATE;
}
}
}
return exrate;
}
public static DBResult DelFeeDo(List<Chfee_do_detail> boday, string GID) public static DBResult DelFeeDo(List<Chfee_do_detail> boday, string GID)
{ {
var result = new DBResult(); var result = new DBResult();
@ -2661,6 +2676,378 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
#region 发票申请开票和取消 #region 发票申请开票和取消
public static DBResult AddAppDetail2(ChInvoice headData, List<ChInvoiceapplication> bodyList, string invoiceno, string companyid, string GID)
{
var result = new DBResult();
decimal amtttl = 0;
decimal acctaxrate = 0;
var invfeesumlist = new List<InvoiceFeeSum>();
var defGOOD = MsCodeGoodInvDAL.GetData(" ISDEF='1' and (DEFCURR='' or DEFCURR='" + headData.RECVCURR + "') ");
var exratelist = MsChFeeDAL.GetFeeNowInvCurrList(DateTime.Now.ToString("yyyy-MM-dd"),companyid);
var invdetailDataList = GetDetailList("PID='" + GID + "'");
var invbodylist = GetBodyList("BILLNO='" + headData.BILLNO + "'");
foreach (var invbody in invbodylist)
{
var invfeesum = invfeesumlist.Find(x => x.CURR == invbody.ORIGCURRENCY && x.exchange == invbody.EXCHANGERATE);
if (invfeesum == null)
{
var newinvfeesum = new InvoiceFeeSum();
newinvfeesum.CURR = invbody.ORIGCURRENCY;
newinvfeesum.exchange = invbody.EXCHANGERATE;
if (invbody.FEETYPE == 1)
newinvfeesum.amount = invbody.ORIGAMOUNT;
else
newinvfeesum.amount = -invbody.ORIGAMOUNT;
invfeesumlist.Add(newinvfeesum);
}
else
{
if (invbody.FEETYPE == 1)
invfeesum.amount = invfeesum.amount + invbody.ORIGAMOUNT;
else invfeesum.amount = invfeesum.amount - invbody.ORIGAMOUNT;
}
}
Database db = DatabaseFactory.CreateDatabase();
using (var conn = db.CreateConnection())
{
conn.Open();
var tran = conn.BeginTransaction();
try
{
var cmdUpdateInv =
db.GetSqlStringCommand(
@"update ch_fee_invoice set REMARK=REMARK+' '+@REMARK
WHERE BILLNO=@BILLNO");
//var cmdInsert =
// db.GetSqlStringCommand(
// @"insert ch_fee_do (GID,BILLNO,BSNO,MBLNO,HBLNO,CUSTOMERNAME,BSTYPE,FEEID,FEENAME,CURRENCY
// ,AMOUNT,DOAMOUNT,FEETYPE,CATEGORY,BILLSTATUS,ISDELETED,CREATETIME
// ,EXCHANGERATE,ORIGCURRENCY,ORIGAMOUNT,INVOICESETTLENO,COMPANYID)
// SELECT NEWID(),@BILLNO,BSNO,MBLNO,HBLNO,CUSTOMERNAME,BSTYPE,FEEID,FEENAME,CURRENCY
// ,AMOUNT,DOAMOUNT,FEETYPE,7,BILLSTATUS,ISDELETED,GETDATE(),EXCHANGERATE,ORIGCURRENCY
// ,ORIGAMOUNT,INVOICESETTLENO,COMPANYID from ch_fee_do WHERE BILLNO=@AppBILLNO ");
var cmdInsert =
db.GetSqlStringCommand(
@"insert into ch_fee_do (GID,BILLNO,BSNO,MBLNO,HBLNO,CUSTOMERNAME,BSTYPE,FEEID,FEENAME,CURRENCY
,AMOUNT,DOAMOUNT,FEETYPE,CATEGORY,BILLSTATUS,ISDELETED,CREATETIME
,EXCHANGERATE,ORIGCURRENCY,ORIGAMOUNT,INVOICESETTLENO,COMPANYID)
values (@GID,@BILLNO,@BSNO,@MBLNO,@HBLNO,@CUSTOMERNAME,@BSTYPE,@FEEID,@FEENAME,@CURRENCY
,@AMOUNT,@DOAMOUNT,@FEETYPE,@CATEGORY,@BILLSTATUS,@ISDELETED,@CREATETIME
,@EXCHANGERATE,@ORIGCURRENCY,@ORIGAMOUNT,@INVOICESETTLENO,@COMPANYID) ");
var cmdUpdate =
db.GetSqlStringCommand(
@"declare @FEEID varchar(100)
declare @ORDERINVOICE numeric(19,4)
declare CurBill cursor for
select FEEID,ORIGAMOUNT ORDERINVOICE
from ch_fee_do where BILLNO=@AppBILLNO
open CurBill
fetch next from CurBill into @FEEID, @ORDERINVOICE
while @@Fetch_Status=0
begin
UPDATE CH_FEE SET INVOICE=ISNULL(INVOICE,0)+@ORDERINVOICE,ORDERINVSETTLEMENT=ISNULL(ORDERINVSETTLEMENT,0)+@ORDERINVOICE,INVOICENUM=@INVOICENUM WHERE GID=@FEEID
fetch next from CurBill into @FEEID, @ORDERINVOICE
end;
close CurBill
dealLocate CurBill
");
var cmdUpdateApp =
db.GetSqlStringCommand(
@"UPDATE ch_fee_invoiceapplication set BILLSTATUS=3,INVBILLNO=@INVBILLNO,INVOICENO=@INVOICENO where BILLNO=@BILLNO");
var cmdInsertInvDetail =
db.GetSqlStringCommand(
@"insert into ch_fee_invoicedetail (GID,PID,SerialNo,GOODSNAME,SPEC,UNIT,PKGS,TAXPRICE,PRICE,AMOUNT,TAXRATE,TAX,Remark,GOODCODE)
values (@GID,@PID,@SerialNo,@GOODSNAME,@SPEC,@UNIT,@PKGS,@TAXPRICE,@PRICE,@AMOUNT,@TAXRATE,@TAX,@Remark,@GOODCODE) ");
var cmdUpdateInvDetail =
db.GetSqlStringCommand(
@"update ch_fee_invoicedetail set TAXPRICE=@TAXPRICE
,PRICE=@PRICE,AMOUNT=@AMOUNT,TAX=@TAX where GID=@GID ");
var currency = "";
decimal rate = 0;
var custrateno = "";
var custaddrtel = "";
var custbank = "";
var INVOICECATEGORY = "";
var ACTUALCUSTOMERNAME = "";
var INVOICECUSTNAME = "";
var REMARK = "";
var invdetailid = "";
if (bodyList != null)
{
cmdUpdateInv.Parameters.Clear();
db.AddInParameter(cmdUpdateInv, "@BILLNO", DbType.String, headData.BILLNO);
foreach (var enumValue in bodyList)
{
// var Addexratelist = MsChFeeDAL.GetFeeNowInvCurrList(Convert.ToDateTime(enumValue.ENTERTIME).ToString("yyyy-MM-dd"));
currency = enumValue.CURRENCY;
rate = enumValue.RATE;
custrateno = enumValue.CUSTRATENO;
custaddrtel = enumValue.CUSTADDRTEL;
custbank = enumValue.CUSTBANK;
INVOICECATEGORY = enumValue.INVOICECATEGORY;
ACTUALCUSTOMERNAME = enumValue.ACTUALCUSTOMERNAME;
INVOICECUSTNAME = enumValue.INVOICECUSTNAME;
REMARK = REMARK + ' ' + enumValue.REMARK;
var feedolist= ChinvoiceapplicationDAL.GetBodyList("c.BILLNO='"+ enumValue.BILLNO + "'", db,tran);
if (feedolist != null && feedolist.Count != 0) {
foreach (var feedo in feedolist) {
cmdInsert.Parameters.Clear();
db.AddInParameter(cmdInsert, "@GID", DbType.String, Guid.NewGuid().ToString());
db.AddInParameter(cmdInsert, "@BILLNO", DbType.String, headData.BILLNO);
db.AddInParameter(cmdInsert, "@BSNO", DbType.String, feedo.BSNO);
db.AddInParameter(cmdInsert, "@MBLNO", DbType.String, "");
db.AddInParameter(cmdInsert, "@HBLNO", DbType.String, "");
db.AddInParameter(cmdInsert, "@CUSTOMERNAME", DbType.String, feedo.CUSTOMERNAME);
db.AddInParameter(cmdInsert, "@BSTYPE", DbType.Boolean, false);
db.AddInParameter(cmdInsert, "@FEEID", DbType.String, feedo.FEEID);
db.AddInParameter(cmdInsert, "@FEENAME", DbType.String, feedo.FEENAME);
db.AddInParameter(cmdInsert, "@CURRENCY", DbType.String, feedo.CURRENCY);
decimal exchangerate = 0;
if (feedo.CURRENCY == enumValue.CURRENCY)
{
db.AddInParameter(cmdInsert, "@AMOUNT", DbType.Decimal, feedo.AMOUNT);
db.AddInParameter(cmdInsert, "@DOAMOUNT", DbType.Decimal, 0);
db.AddInParameter(cmdInsert, "@EXCHANGERATE", DbType.Decimal, 1);
exchangerate = 1;
}
else
{
var UExrate = GetExrate2(feedo.CURRENCY, exratelist);
if (UExrate != feedo.EXCHANGERATE)
{
db.AddInParameter(cmdInsert, "@AMOUNT", DbType.Decimal, Math.Round(feedo.ORIGAMOUNT * UExrate, 2, MidpointRounding.AwayFromZero));
db.AddInParameter(cmdInsert, "@DOAMOUNT", DbType.Decimal, 0);
db.AddInParameter(cmdInsert, "@EXCHANGERATE", DbType.Decimal, UExrate);
exchangerate = UExrate;
}
else {
db.AddInParameter(cmdInsert, "@AMOUNT", DbType.Decimal, feedo.AMOUNT);
db.AddInParameter(cmdInsert, "@DOAMOUNT", DbType.Decimal, 0);
db.AddInParameter(cmdInsert, "@EXCHANGERATE", DbType.Decimal, feedo.EXCHANGERATE);
exchangerate = feedo.EXCHANGERATE;
}
}
db.AddInParameter(cmdInsert, "@FEETYPE", DbType.Int16, feedo.FEETYPE);
db.AddInParameter(cmdInsert, "@ORIGCURRENCY", DbType.String, feedo.ORIGCURRENCY);
db.AddInParameter(cmdInsert, "@ORIGAMOUNT", DbType.Decimal,feedo.ORIGAMOUNT);
db.AddInParameter(cmdInsert, "@CATEGORY", DbType.Int16, 7);
db.AddInParameter(cmdInsert, "@BILLSTATUS", DbType.Int16, 1);
db.AddInParameter(cmdInsert, "@ISDELETED", DbType.Boolean, false);
db.AddInParameter(cmdInsert, "@CREATETIME", DbType.DateTime, DateTime.Now);
db.AddInParameter(cmdInsert, "@INVOICESETTLENO", DbType.String, "");
db.AddInParameter(cmdInsert, "@COMPANYID", DbType.String, companyid);
db.ExecuteNonQuery(cmdInsert, tran);
var invfeesum = invfeesumlist.Find(x => x.CURR == feedo.ORIGCURRENCY && x.exchange == exchangerate);
if (invfeesum == null)
{
var newinvfeesum = new InvoiceFeeSum();
newinvfeesum.CURR = feedo.ORIGCURRENCY;
newinvfeesum.exchange = exchangerate;
if (feedo.FEETYPE == 1)
newinvfeesum.amount = feedo.ORIGAMOUNT;
else
newinvfeesum.amount = -feedo.ORIGAMOUNT;
invfeesumlist.Add(newinvfeesum);
}
else
{
if (feedo.FEETYPE == 1)
invfeesum.amount = invfeesum.amount + feedo.ORIGAMOUNT;
else invfeesum.amount = invfeesum.amount - feedo.ORIGAMOUNT;
}
}
}
//cmdInsert.Parameters.Clear();
//db.AddInParameter(cmdInsert, "@BILLNO", DbType.String, billno);
//db.AddInParameter(cmdInsert, "@AppBILLNO", DbType.String, enumValue.BILLNO);
//db.ExecuteNonQuery(cmdInsert, tran);
cmdUpdate.Parameters.Clear();
db.AddInParameter(cmdUpdate, "@AppBILLNO", DbType.String, enumValue.BILLNO);
db.AddInParameter(cmdUpdate, "@INVOICENUM", DbType.String, invoiceno);
db.ExecuteNonQuery(cmdUpdate, tran);
//var invdetaillist = GetDetailList("PID='" + enumValue.GID + "'", db, tran);
//if (invdetaillist != null)
//{
// foreach (var enumInvDetail in invdetaillist)
// {
// bool ishave = false;
// if (invdetailDataList != null && bodyList.Count != 1)
// {
// foreach (var invdetailData in invdetailDataList)
// {
// if (invdetailData.GOODSNAME == enumInvDetail.GOODSNAME)
// {
// invdetailData.TAXPRICE = invdetailData.TAXPRICE + enumInvDetail.TAXPRICE;
// invdetailData.PRICE = invdetailData.PRICE + enumInvDetail.PRICE;
// invdetailData.AMOUNT = invdetailData.AMOUNT + enumInvDetail.AMOUNT;
// invdetailData.TAX = invdetailData.TAX + enumInvDetail.TAX;
// ishave = true;
// }
// }
// }
// if (!ishave)
// {
// var invdetailtmp = enumInvDetail;
// invdetailtmp.GID = "*";
// invdetailtmp.PID = GID;
// invdetailDataList.Add(invdetailtmp);
// }
// }
//}
cmdUpdateApp.Parameters.Clear();
db.AddInParameter(cmdUpdateApp, "@INVBILLNO", DbType.String, headData.BILLNO);
db.AddInParameter(cmdUpdateApp, "@INVOICENO", DbType.String, invoiceno);
db.AddInParameter(cmdUpdateApp, "@BILLNO", DbType.String, enumValue.BILLNO);
db.ExecuteNonQuery(cmdUpdateApp, tran);
}
acctaxrate = headData.EXCHANGERATE;
amtttl = 0;
foreach (var invfeesum in invfeesumlist)
{
amtttl = amtttl + Math.Round(invfeesum.amount * invfeesum.exchange, 2, MidpointRounding.AwayFromZero);
}
var dataList = GetDetailList(" PID='" + GID + "'");
if (dataList.Count != 0)
{
var invlist = dataList[0];
cmdUpdateInvDetail.Parameters.Clear();
db.AddInParameter(cmdUpdateInvDetail, "@GID", DbType.String, invlist.GID);
var tax = Math.Round(amtttl / (1 + acctaxrate / 100) * (acctaxrate / 100), 2, MidpointRounding.AwayFromZero);
var amount = amtttl - tax;
db.AddInParameter(cmdUpdateInvDetail, "@TAXPRICE", DbType.Decimal, Math.Round(amtttl, 2, MidpointRounding.AwayFromZero));
db.AddInParameter(cmdUpdateInvDetail, "@PRICE", DbType.Decimal, amount);
db.AddInParameter(cmdUpdateInvDetail, "@AMOUNT", DbType.Decimal, amount);
db.AddInParameter(cmdUpdateInvDetail, "@TAX", DbType.Decimal, tax);
db.ExecuteNonQuery(cmdUpdateInvDetail, tran);
}
else
{
cmdInsertInvDetail.Parameters.Clear();
db.AddInParameter(cmdInsertInvDetail, "@GID", DbType.String, Guid.NewGuid().ToString());
db.AddInParameter(cmdInsertInvDetail, "@PID", DbType.String, GID);
db.AddInParameter(cmdInsertInvDetail, "@SerialNo", DbType.Int32, 1);
if (defGOOD.GOODNAME == "")
{
db.AddInParameter(cmdInsertInvDetail, "@GOODSNAME", DbType.String, "代理运杂费");
db.AddInParameter(cmdInsertInvDetail, "@UNIT", DbType.String, "票");
}
else
{
db.AddInParameter(cmdInsertInvDetail, "@GOODSNAME", DbType.String, defGOOD.GID);
db.AddInParameter(cmdInsertInvDetail, "@UNIT", DbType.String, defGOOD.UNIT);
}
db.AddInParameter(cmdInsertInvDetail, "@SPEC", DbType.String, defGOOD.SPEC);
db.AddInParameter(cmdInsertInvDetail, "@PKGS", DbType.Decimal, 1);
db.AddInParameter(cmdInsertInvDetail, "@TAXPRICE", DbType.Decimal, amtttl);
db.AddInParameter(cmdInsertInvDetail, "@TAXRATE", DbType.Decimal, acctaxrate);
if (acctaxrate == 0)
{
db.AddInParameter(cmdInsertInvDetail, "@PRICE", DbType.Decimal, amtttl);
db.AddInParameter(cmdInsertInvDetail, "@AMOUNT", DbType.Decimal, amtttl);
db.AddInParameter(cmdInsertInvDetail, "@TAX", DbType.Decimal, 0);
}
else
{
var tax = Math.Round(amtttl / (1 + acctaxrate / 100) * (acctaxrate / 100), 2, MidpointRounding.AwayFromZero);
var amount = amtttl - tax;
// var amount = Math.Round(amtttl / (1 + acctaxrate / 100),2);
db.AddInParameter(cmdInsertInvDetail, "@PRICE", DbType.Decimal, amount);
db.AddInParameter(cmdInsertInvDetail, "@AMOUNT", DbType.Decimal, amount);
db.AddInParameter(cmdInsertInvDetail, "@TAX", DbType.Decimal, tax);
}
db.AddInParameter(cmdInsertInvDetail, "@Remark", DbType.String, "");
db.AddInParameter(cmdInsertInvDetail, "@GOODCODE", DbType.String, defGOOD.GOODCODE);
db.ExecuteNonQuery(cmdInsertInvDetail, tran);
}
db.AddInParameter(cmdUpdateInv, "@REMARK", DbType.String, REMARK);
db.ExecuteNonQuery(cmdUpdateInv, tran);
}
tran.Commit();
}
catch (Exception)
{
tran.Rollback();
result.Success = false;
result.Message = "保存出现错误,请重试或联系系统管理员";
return result;
}
}
result.Success = true;
result.Message = "保存成功" + result.Message;
return result;
}
public static DBResult AddAppDetail(string billno, List<ChInvoiceapplication> bodyList, string invoiceno, string companyid, string GID) public static DBResult AddAppDetail(string billno, List<ChInvoiceapplication> bodyList, string invoiceno, string companyid, string GID)
{ {
var result = new DBResult(); var result = new DBResult();

@ -21,6 +21,7 @@ using DSWeb.MvcShipping.DAL.MsBaseInfoDAL;
using DSWeb.Areas.Account.Models.TruckChfee_do_detail; using DSWeb.Areas.Account.Models.TruckChfee_do_detail;
using System.Data.SqlClient; using System.Data.SqlClient;
using DSWeb.Areas.Account.Models.Chfee_Invoice; using DSWeb.Areas.Account.Models.Chfee_Invoice;
using System.Data.Common;
namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
{ {
@ -508,6 +509,112 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoiceapplication
return headList; return headList;
} }
static public List<Chfee_do_detail> GetBodyList(string strCondition, Database db, DbTransaction tran)
{
var strSql = new StringBuilder();
strSql.Append(" SELECT c.GID,c.BSNO,c.FEEID,c.FEENAME,c.CURRENCY,c.AMOUNT,c.DOAMOUNT,c.ORIGCURRENCY,c.ORIGAMOUNT,ISNULL(c.ORIGSTLAMOUNT,0) AS ORIGSTLAMOUNT,c.EXCHANGERATE,f.ACCTAXRATE ");
strSql.Append(",c.FEETYPE,c.CUSTOMERNAME as FEEOBJNAME,(CASE C.FEETYPE WHEN 1 THEN '收' ELSE '付' END) AS FEETYPEREF,f.EXCHANGERATE ORIGEXCHANGERATE");
strSql.Append(" ,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO");
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE");
strSql.Append(",b.DOC,b.SALE,b.ENTERP,(select [NAME] FROM company where GID=B.SALECORPID) BSSALECORP");
strSql.Append(",f.Remark Remark,f.INPUTMODE,f.AUDITDATE,f.SALECORP,f.TaxUnitPrice,f.Quantity,f.taxrate,f.amount-f.notaxamount TAX");
strSql.Append(",f.UNIT UNIT");
strSql.Append(" FROM ch_fee_do c");
strSql.Append(" left join v_op_bill b on (b.bsno=c.bsno)");
strSql.Append(" left join ch_fee f on (f.gid=c.feeid) ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where (c.ISDELETED=0 or c.ISDELETED IS NULL) and " + strCondition);
}
strSql.Append(" order by b.MBLNO");
return BodySetData(strSql, db, tran);
}
private static List<Chfee_do_detail> BodySetData(StringBuilder strSql, Database db, DbTransaction tran)
{
var headList = new List<Chfee_do_detail>();
using (IDataReader reader = db.ExecuteReader(tran, CommandType.Text, strSql.ToString()))
{
while (reader.Read())
{
Chfee_do_detail data = new Chfee_do_detail();
#region Set DB data to Object
data.BSNO = Convert.ToString(reader["BSNO"]);
data.FEEDOID = Convert.ToString(reader["GID"]);
data.FEEID = Convert.ToString(reader["FEEID"]);
data.FEENAME = Convert.ToString(reader["FEENAME"]);
data.FEEOBJNAME = Convert.ToString(reader["FEEOBJNAME"]);
data.FEETYPE = Convert.ToInt16(reader["FEETYPE"]);
data.FEETYPEREF = Convert.ToString(reader["FEETYPEREF"]);
data.CURRENCY = Convert.ToString(reader["CURRENCY"]);
data.AMOUNT = Convert.ToDecimal(reader["AMOUNT"]);
data.DOAMOUNT = Convert.ToDecimal(reader["DOAMOUNT"]);
data.ORIGCURRENCY = Convert.ToString(reader["ORIGCURRENCY"]);
data.ORIGAMOUNT = Convert.ToDecimal(reader["ORIGAMOUNT"]);
data.ORIGSTLAMOUNT = Convert.ToDecimal(reader["ORIGSTLAMOUNT"]);
data.EXCHANGERATE = Convert.ToDecimal(reader["EXCHANGERATE"]);
if (reader["ETD"] != DBNull.Value)
data.ETD = Convert.ToString(reader["ETD"]);
data.ACCDATE = Convert.ToString(reader["ACCDATE"]);
data.OPLBNAME = Convert.ToString(reader["OPLBNAME"]);
data.MBLNO = Convert.ToString(reader["MBLNO"]);
data.HBLNO = Convert.ToString(reader["HBLNO"]);
data.CUSTNO = Convert.ToString(reader["CUSTNO"]);
data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
data.VESSEL = Convert.ToString(reader["VESSEL"]);
data.VOYNO = Convert.ToString(reader["VOYNO"]);
data.PORTLOAD = Convert.ToString(reader["PORTLOAD"]);
data.PORTDISCHARGE = Convert.ToString(reader["PORTDISCHARGE"]);
data.INPUTBY = Convert.ToString(reader["INPUTBY"]);
data.OP = Convert.ToString(reader["OP"]);
data.CUSTSERVICE = Convert.ToString(reader["CUSTSERVICE"]);
data.DOC = Convert.ToString(reader["DOC"]);
data.SALE = Convert.ToString(reader["SALE"]);
if (reader["ORIGEXCHANGERATE"] != DBNull.Value)
data.ORIGEXCHANGERATE = Convert.ToDecimal(reader["ORIGEXCHANGERATE"]);
if (reader["BSSTATUS"] != DBNull.Value)
data.BSSTATUS = Convert.ToBoolean(reader["BSSTATUS"]);
data.Remark = Convert.ToString(reader["Remark"]);
data.INPUTMODE = Convert.ToString(reader["INPUTMODE"]);
if (reader["AUDITDATE"] != DBNull.Value)
data.AUDITDATE = Convert.ToString(reader["AUDITDATE"]);
data.SALECORP = Convert.ToString(reader["SALECORP"]);
data.COMPANYNAME = Convert.ToString(reader["BSSALECORP"]);
data.ENTERP = Convert.ToString(reader["ENTERP"]);
if (reader["ACCTAXRATE"] != DBNull.Value)
data.ACCTAXRATE = Convert.ToDecimal(reader["ACCTAXRATE"]);
data.ORDERNO = Convert.ToString(reader["ORDERNO"]);
if (reader["TaxUnitPrice"] != DBNull.Value)
data.TaxUnitPrice = Convert.ToDecimal(reader["TaxUnitPrice"]);
if (reader["Quantity"] != DBNull.Value)
data.Quantity = Convert.ToDecimal(reader["Quantity"]);
if (reader["TaxRate"] != DBNull.Value)
data.TaxRate = Convert.ToDecimal(reader["TaxRate"]);
if (reader["Tax"] != DBNull.Value)
data.Tax = Convert.ToDecimal(reader["Tax"]);
data.UNIT = Convert.ToString(reader["UNIT"]);
#endregion
headList.Add(data);
}
reader.Close();
}
return headList;
}
static public List<TruckChfee_do_detail> GetTruckBodyList(string strCondition, string sort = null) static public List<TruckChfee_do_detail> GetTruckBodyList(string strCondition, string sort = null)
{ {

@ -25,7 +25,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication
{ {
#region 收费申请列表 #region 收费申请列表
static public List<ChRecvapplication> GetDataList(string strCondition, string userid="", string usercode="", string orgcode="", string sort = null) static public List<ChRecvapplication> GetDataList(string strCondition, string userid="", string usercode="", string orgcode="", string sort = null, string lan = "")
{ {
var rangstr = GetRangDAListStr("", userid, usercode, orgcode); var rangstr = GetRangDAListStr("", userid, usercode, orgcode);
@ -47,7 +47,12 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Recvapplication
strSql.Append(" ,APPLICANT,APPLYTIME,ENTERTIME,SETTLEUSER,SETTLETIME,AUDITUSER,AUDITTIME "); strSql.Append(" ,APPLICANT,APPLYTIME,ENTERTIME,SETTLEUSER,SETTLETIME,AUDITUSER,AUDITTIME ");
strSql.Append(" ,REMARK,COMPANYID,INVOICENUMREMARK,PREAMOUNTRMB,PREAMOUNTUSD,ACCOUNT "); strSql.Append(" ,REMARK,COMPANYID,INVOICENUMREMARK,PREAMOUNTRMB,PREAMOUNTUSD,ACCOUNT ");
strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNT) as ACCOUNTREF"); strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNT) as ACCOUNTREF");
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF"); if (lan == "en-us")
{
strSql.Append(",(select EnumValueName_2 from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF");
}
else
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF");
strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME"); strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME");
strSql.Append(",cm.SALECORPID,(select [NAME] from [company] where GID=cm.SALECORPID) as SALECORP"); strSql.Append(",cm.SALECORPID,(select [NAME] from [company] where GID=cm.SALECORPID) as SALECORP");

@ -373,7 +373,7 @@ Ext.extend(Shipping.MsChInvoiceapplicationIndex, Ext.Panel, {
this.comboxBillStatus = Ext.create('DsExt.ux.RefEnumCombox', { this.comboxBillStatus = Ext.create('DsExt.ux.RefEnumCombox', {
fieldLabel: Zi.LAN.status, fieldLabel: Zi.LAN.status,
forceSelection: false, forceSelection: false,
valueField: 'EnumValueName', valueField: 'EnumValueId',
displayField: BLTYPEDFIELDNAME, displayField: BLTYPEDFIELDNAME,
store: this.storeBillStatus, store: this.storeBillStatus,
name: 'BillStatus' name: 'BillStatus'

@ -84,7 +84,9 @@ Ext.extend(Shipping.MsChRecvapplicationIndex, Ext.Panel, {
value = Zi.LAN.SHENHETONGGUO; value = Zi.LAN.SHENHETONGGUO;
} else if (value == '录入状态') { } else if (value == '录入状态') {
value = Zi.LAN.LURUZHUAGNTAI; value = Zi.LAN.LURUZHUAGNTAI;
} else if (value == '已提交') { } else if (value == '未提交') {
value = Zi.LAN.WEITIJIAO;
}else if (value == '已提交') {
meta.tdCls = 'feestatus_refer'; meta.tdCls = 'feestatus_refer';
value = Zi.LAN.TIJIAOSHENHE; value = Zi.LAN.TIJIAOSHENHE;
} else if (value == '部分结算') { } else if (value == '部分结算') {

@ -20,7 +20,7 @@ Zi.LAN.ACCOUNT = "银行账号";
Zi.LAN.COMPANYNAME = "分公司"; Zi.LAN.COMPANYNAME = "分公司";
Zi.LAN.InvNo = "发票号"; Zi.LAN.InvNo = "发票号";
Zi.LAN.tjsfsqmx = "添加收费申请明细"; Zi.LAN.tjsfsqmx = "添加收费申请明细";
Zi.LAN.WEITIJIAO = "未提交";
//Zi.LAN. = ""; //Zi.LAN. = "";

@ -19,7 +19,9 @@ Zi.LAN.QUEDINGYAOBOHUI = "确认要驳回审核吗?";
Zi.LAN.ACCOUNT = "银行账号"; Zi.LAN.ACCOUNT = "银行账号";
Zi.LAN.COMPANYNAME = "分公司"; Zi.LAN.COMPANYNAME = "分公司";
Zi.LAN.InvNo = "发票号"; Zi.LAN.InvNo = "发票号";
Zi.LAN.tjsfsqmx ="添加收费申请明细"; Zi.LAN.tjsfsqmx = "添加收费申请明细";
Zi.LAN.WEITIJIAO = "未提交";

@ -354,4 +354,9 @@ Zi.LAN.SelecteBill = "Check:";//" 选中票数:";
Zi.LAN.INVOICETYPEREF1 = "Free";//"自由发票"; Zi.LAN.INVOICETYPEREF1 = "Free";//"自由发票";
Zi.LAN.INVOICETYPEREF2 = "Apply";//"申请发票"; Zi.LAN.INVOICETYPEREF2 = "Apply";//"申请发票";
Zi.LAN.LOCK = "Lock";//"锁定"; Zi.LAN.LOCK = "Lock";//"锁定";
Zi.LAN.UNLOCK = "Unlock";//"未锁定"; Zi.LAN.UNLOCK = "Unlock";//"未锁定";
Zi.LAN.SHENHETONGGUO = "Pass";//"审核通过";
Zi.LAN.LURUZHUAGNTAI = "Input";//"录入状态";
Zi.LAN.TIJIAOSHENHE = "Filed";//"已提交";
Zi.LAN.BUFENJIESUAN = "Partial Settlement";//"部分结算";
Zi.LAN.JIESUANWANBI = "Settlement Completed";//"结算完毕";

@ -354,4 +354,9 @@ Zi.LAN.SelecteBill = " 选中票数:";
Zi.LAN.INVOICETYPEREF1 = "自由发票"; Zi.LAN.INVOICETYPEREF1 = "自由发票";
Zi.LAN.INVOICETYPEREF2 = "申请发票"; Zi.LAN.INVOICETYPEREF2 = "申请发票";
Zi.LAN.LOCK = "锁定"; Zi.LAN.LOCK = "锁定";
Zi.LAN.UNLOCK = "未锁定"; Zi.LAN.UNLOCK = "未锁定";
Zi.LAN.SHENHETONGGUO = "审核通过";
Zi.LAN.LURUZHUAGNTAI = "录入状态";
Zi.LAN.TIJIAOSHENHE = "已提交";
Zi.LAN.BUFENJIESUAN = "部分结算";
Zi.LAN.JIESUANWANBI = "结算完毕";

@ -96,6 +96,29 @@ namespace DSWeb.MvcContainer.Controllers
public ActionResult UpLoadFile() public ActionResult UpLoadFile()
{ {
string LAN = Convert.ToString(Session["LANGUAGES"]);
if (LAN == "en-us") {
ViewData["SELECTFILE"] = "Please select a file";
ViewData["SUBMIT"] = "Submit selected files";
ViewData["DRAGFILE"] = "Please select or drag files";
ViewData["CHOOSE"] = "You can choose or drag multiple files";
ViewData["UPLOAD"] = "Upload selected files";
ViewData["SELECTMORE"] = "Select more files";
ViewData["SELECTORDRAGMORE"] = "You can choose or drag more files";
}
else {
ViewData["SELECTFILE"] = "请选择文件";
ViewData["SUBMIT"] = "提交选中文件";
ViewData["DRAGFILE"] = "请选择或拖拽文件";
ViewData["CHOOSE"] = "你可以选择或拖拽多个文件";
ViewData["UPLOAD"] = "上传选择的文件";
ViewData["SELECTMORE"] = "选择更多的文件";
ViewData["SELECTORDRAGMORE"] = "你可以选择或拖拽更多的文件";
}
//var months =<%= ViewData["MonthList"] %>;
return View(); return View();
} }

@ -1,4 +1,4 @@
<%@ Page Title="批量上传文件" Language="C#" MasterPageFile="~/Areas/MvcContainer/Views/Shared/SiteFile.Master" Inherits="System.Web.Mvc.ViewPage<dynamic>" %> <%@ Page Title="" Language="C#" MasterPageFile="~/Areas/MvcContainer/Views/Shared/SiteFile.Master" Inherits="System.Web.Mvc.ViewPage<dynamic>" %>
<asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server"> <asp:Content ID="Content1" ContentPlaceHolderID="Head" runat="server">
<link type="text/css" rel="stylesheet" href="../../Areas/MvcContainer/Content/css/normalize.css" /> <link type="text/css" rel="stylesheet" href="../../Areas/MvcContainer/Content/css/normalize.css" />
@ -30,10 +30,10 @@
<form method="POST" action="#" enctype="multipart/form-data"> <form method="POST" action="#" enctype="multipart/form-data">
<div class="uploader__contents"> <div class="uploader__contents">
<label class="button button--secondary" for="fileinput">请选择文件</label> <label class="button button--secondary" for="fileinput"><%=ViewData["SELECTFILE"]%></label>
<input id="fileinput" class="uploader__file-input" type="file" multiple value="Select Files"> <input id="fileinput" class="uploader__file-input" type="file" multiple value="Select Files">
</div> </div>
<input class="button button--big-bottom" type="submit" value="提交选中文件"> <input class="button button--big-bottom" type="submit" value="<%=ViewData["SUBMIT"]%>">
</form> </form>
</div> </div>
</section> </section>
@ -53,11 +53,11 @@
(function () { (function () {
var options = {}; var options = {};
$('.js-uploader__box').uploader({ $('.js-uploader__box').uploader({
'selectButtonCopy': '请选择或拖拽文件', 'selectButtonCopy': '<%=ViewData["DRAGFILE"]%>',
'instructionsCopy': '你可以选择或拖拽多个文件', 'instructionsCopy': '<%=ViewData["CHOOSE"]%>',
'submitButtonCopy': '上传选择的文件', 'submitButtonCopy': '<%=ViewData["UPLOAD"]%>',
'furtherInstructionsCopy': '你可以选择或拖拽更多的文件', 'furtherInstructionsCopy': '<%=ViewData["SELECTMORE"]%>',
'secondarySelectButtonCopy': '选择更多的文件', 'secondarySelectButtonCopy': '<%=ViewData["SELECTORDRAGMORE"]%>',
}); });
}()); }());
</script> </script>

@ -4551,7 +4551,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append("Select CURRENCYID,VALUE,"); strSql.Append("Select CURRENCYID,VALUE,");
strSql.Append("(select CodeName from code_currency where GID=currency_exchange_inv.CURRENCYID) as CODENAME"); strSql.Append("(select CodeName from code_currency where GID=currency_exchange_inv.CURRENCYID) as CODENAME");
strSql.Append(" from currency_exchange_inv where 1=1 "); strSql.Append(" from currency_exchange_inv where 1=1 ");
if (string.IsNullOrEmpty(companyid)) if (!string.IsNullOrEmpty(companyid))
strSql.Append(" and COMPANYID='"+ companyid + "' "); strSql.Append(" and COMPANYID='"+ companyid + "' ");
if (string.IsNullOrEmpty(invdate)) if (string.IsNullOrEmpty(invdate))

@ -1957,7 +1957,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
return; return;
} }
Ext.MessageBox.confirm('提示', Zi.LAN.QueshiYaoShanChu1, function (btn) { Ext.MessageBox.confirm(Zi.LAN.FEE.TiShi, Zi.LAN.QueshiYaoShanChu1, function (btn) {
if (btn == 'yes') { if (btn == 'yes') {
@ -2009,12 +2009,12 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
Ext.Msg.show({ title:Zi.LAN.FEE.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title:Zi.LAN.FEE.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.FEE.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -2087,7 +2087,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
var amount = memberyf.data.Amount; var amount = memberyf.data.Amount;
if (amount == 0) { if (amount == 0) {
Ext.Msg.show({ title: '警告', Ext.Msg.show({ title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.FeiYongJinEBuYunXuWeiLing, msg: Zi.LAN.FEE.FeiYongJinEBuYunXuWeiLing,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2095,7 +2095,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
return; return;
} }
if (ExChangerate == 0) { if (ExChangerate == 0) {
Ext.Msg.show({ title: '警告', Ext.Msg.show({ title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.HuiLvBuNengWeiLing, msg: Zi.LAN.FEE.HuiLvBuNengWeiLing,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2104,7 +2104,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
if (memberyf.data.FeeName == '') { if (memberyf.data.FeeName == '') {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.FeiYongMingChengBuNengWeiKong, msg: Zi.LAN.FEE.FeiYongMingChengBuNengWeiKong,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2113,7 +2113,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
if (memberyf.data.CustomerName == '') { if (memberyf.data.CustomerName == '') {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.KeHuMingChengBuNengWeiKong, msg: Zi.LAN.FEE.KeHuMingChengBuNengWeiKong,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2132,7 +2132,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
var ExChangerate = memberyf.data.ExChangerate; var ExChangerate = memberyf.data.ExChangerate;
if (amount == 0) { if (amount == 0) {
Ext.Msg.show({ title: '警告', Ext.Msg.show({ title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.FeiYongJinEBuYunXuWeiLing, msg: Zi.LAN.FEE.FeiYongJinEBuYunXuWeiLing,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2141,7 +2141,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
if (ExChangerate == 0) { if (ExChangerate == 0) {
Ext.Msg.show({ title: '警告', Ext.Msg.show({ title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.HuiLvBuNengWeiLing, msg: Zi.LAN.FEE.HuiLvBuNengWeiLing,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2150,7 +2150,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
if (memberyf.data.FeeName == '') { if (memberyf.data.FeeName == '') {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.FeiYongMingChengBuNengWeiKong, msg: Zi.LAN.FEE.FeiYongMingChengBuNengWeiKong,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2159,7 +2159,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
if (memberyf.data.CustomerName == '') { if (memberyf.data.CustomerName == '') {
Ext.Msg.show({ Ext.Msg.show({
title: '警告', title: Zi.LAN.FEE.JingGao,
msg: Zi.LAN.FEE.KeHuMingChengBuNengWeiKong, msg: Zi.LAN.FEE.KeHuMingChengBuNengWeiKong,
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
}); });
@ -2200,7 +2200,7 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
} }
} }
} else { } else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} else { } else {
Ext.Msg.show({ title: '请重试', Ext.Msg.show({ title: '请重试',
@ -2226,10 +2226,10 @@ Ext.extend(Shipping.OrderFeeGrid, Ext.Panel, {
getAllowOperationDetail: function () { getAllowOperationDetail: function () {
var feeStatus = this.getFeeStatus(); var feeStatus = this.getFeeStatus();
if (feeStatus == '9' || feeStatus == '2') { if (feeStatus == '9' || feeStatus == '2') {
//Ext.Msg.show({ title: '错误', msg: "当前状态,不允许操作费用!", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); //Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: "当前状态,不允许操作费用!", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
return true; return true;
} else { } else {
Ext.Msg.show({ title: '错误', msg: "当前状态,不允许操作费用!", icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: Zi.LAN.FEE.DangQianFeiYongZhangTaiWuFaShenQingXiuGa, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
return false; return false;
} }
}, },

@ -941,7 +941,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
me.onAuditPassClick(); me.onAuditPassClick();
} }
}, { }, {
text: "关闭", text: Zi.LAN.GuanBi,
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
me.winAuditShow.close(); me.winAuditShow.close();
@ -1009,7 +1009,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
me.onAuditBack(); me.onAuditBack();
} }
}, { }, {
text: "关闭", text: Zi.LAN.GuanBi,
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
me.winAuditBackShow.close(); me.winAuditBackShow.close();
@ -1284,7 +1284,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
if (record.data.ORSTATUS != '0') { if (record.data.ORSTATUS != '0') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.DANGQIANZHUANGTAIWUFAQUERENDINGCHANG , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.DANGQIANZHUANGTAIWUFAQUERENDINGCHANG , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (this.SaleOrderAuditSelf == 1) { if (this.SaleOrderAuditSelf == 1) {
@ -1292,7 +1292,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
} else { } else {
Ext.Msg.show({ title: '警告', msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1324,13 +1324,13 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QUERENDINGCHANGCHENGGONG, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QUERENDINGCHANGCHENGGONG, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
_this.winAuditShow.close() _this.winAuditShow.close()
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -1361,7 +1361,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
if (record.data.ORSTATUS != '1' && record.data.ORSTATUS != '0') { if (record.data.ORSTATUS != '1' && record.data.ORSTATUS != '0') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.DANGQIANZHUANGTAIWUFABOHUI , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.DANGQIANZHUANGTAIWUFABOHUI , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1385,13 +1385,13 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.BOHUICHENGGONG , icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.BOHUICHENGGONG , icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
_this.winAuditBackShow.close(); _this.winAuditBackShow.close();
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -1416,7 +1416,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
if (record.data.ORSTATUS != '1') { if (record.data.ORSTATUS != '1') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.DANGQIANZHUANGTAIWUFASHENHE, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.DANGQIANZHUANGTAIWUFASHENHE, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1425,7 +1425,7 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
} else { } else {
Ext.Msg.show({ title: '警告', msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1450,13 +1450,13 @@ Ext.extend(Shipping.MsSeaeOrderAudit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.SHENHECHENGGONG, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.SHENHECHENGGONG, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },

@ -2437,7 +2437,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
me.onAuditBack(); me.onAuditBack();
} }
}, { }, {
text: "关闭", text: Zi.LAN.GuanBi,
minWidth: 70, minWidth: 70,
handler: function () { handler: function () {
me.winAuditBackShow.close(); me.winAuditBackShow.close();
@ -3094,15 +3094,15 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var btnSubmitAudit = Ext.getCmp('btnSubmitAudit'); var btnSubmitAudit = Ext.getCmp('btnSubmitAudit');
btnSubmitAudit.disable(); btnSubmitAudit.disable();
if (!basicForm.isValid()) { if (!basicForm.isValid()) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JCYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JCYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (!basicForm2.isValid()) { if (!basicForm2.isValid()) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JCYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JCYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (!basicForm3.isValid()) { if (!basicForm3.isValid()) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.WTYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.WTYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
// //
@ -3114,20 +3114,20 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
isnoctn = true; isnoctn = true;
} }
if (member.data.CTNNUM == 0) { if (member.data.CTNNUM == 0) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
bodydatas.push(member); bodydatas.push(member);
} }
if (this.ISMUSTBECNTR == '1') { if (this.ISMUSTBECNTR == '1') {
if (this.storeBodyList.getCount() == 0) { if (this.storeBodyList.getCount() == 0) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
} }
if (isnoctn) { if (isnoctn) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -3211,7 +3211,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
this.LoadData('add', ''); this.LoadData('add', '');
} }
} else { } else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} else { } else {
Ext.Msg.show({ title: '请重试', Ext.Msg.show({ title: '请重试',
@ -3256,7 +3256,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
deleteDetail: function () { deleteDetail: function () {
var ORSTATUS = this.formHead.getForm().findField('ORSTATUS').getValue(); var ORSTATUS = this.formHead.getForm().findField('ORSTATUS').getValue();
if (ORSTATUS == '0') { if (ORSTATUS == '0') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU , icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
//this.serialNo = DsGetCurSerialNo(this.storeBodyList, this.serialNo); //this.serialNo = DsGetCurSerialNo(this.storeBodyList, this.serialNo);
@ -3285,12 +3285,12 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: jsonresult.Message, icon: Ext.Msg.INFO, 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.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
scope: this scope: this
}); //end Ext.Ajax.request }); //end Ext.Ajax.request
@ -3304,7 +3304,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
GetContractFee:function(){ GetContractFee:function(){
var ORSTATUS = this.formHead.getForm().findField('ORSTATUS').getValue(); var ORSTATUS = this.formHead.getForm().findField('ORSTATUS').getValue();
if (ORSTATUS == '0') { if (ORSTATUS == '0') {
Ext.Msg.show({ title: '警告', msg: '业务已提交审核,不允许操作!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '业务已提交审核,不允许操作!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (this.formHead.getForm().findField('ORDNO').getValue() == "") { if (this.formHead.getForm().findField('ORDNO').getValue() == "") {
@ -3313,28 +3313,28 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
} }
var CONTRACTNO = this.formHead.getForm().findField('CONTRACTNO').getValue(); var CONTRACTNO = this.formHead.getForm().findField('CONTRACTNO').getValue();
if (CONTRACTNO == '') { if (CONTRACTNO == '') {
Ext.Msg.show({ title: '警告', msg: '约号为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '约号为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
var CARRIER = this.formHead.getForm().findField('CARRIER').getValue(); var CARRIER = this.formHead.getForm().findField('CARRIER').getValue();
if (CARRIER == '') { if (CARRIER == '') {
Ext.Msg.show({ title: '警告', msg: '船公司为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '船公司为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
var PORTLOAD = this.formEdit.getForm().findField('PORTLOAD').getValue(); var PORTLOAD = this.formEdit.getForm().findField('PORTLOAD').getValue();
if (PORTLOAD == '') { if (PORTLOAD == '') {
Ext.Msg.show({ title: '警告', msg: '装货港为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '装货港为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
var PORTDISCHARGE = this.formEdit.getForm().findField('PORTDISCHARGE').getValue(); var PORTDISCHARGE = this.formEdit.getForm().findField('PORTDISCHARGE').getValue();
if (PORTDISCHARGE == '') { if (PORTDISCHARGE == '') {
Ext.Msg.show({ title: '警告', msg: '卸货港为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '卸货港为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (this.storeBodyList.getCount() == 0) { if (this.storeBodyList.getCount() == 0) {
Ext.Msg.show({ title: '警告', msg: '集装箱信息为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '集装箱信息为空,不能提取费用!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -3349,7 +3349,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
bodydatas.push(member); bodydatas.push(member);
} }
if (isnoctn) { if (isnoctn) {
Ext.Msg.show({ title: '警告', msg: '集装箱信息,箱型不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '集装箱信息,箱型不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -3489,7 +3489,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
isnoctn = true; isnoctn = true;
} }
if (member.data.CTNNUM == 0) { if (member.data.CTNNUM == 0) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.JZXYOUBITIAN, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
bodydatas.push(member); bodydatas.push(member);
@ -3498,7 +3498,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var jsonBody = ConvertRecordsToJsonAll(bodydatas); var jsonBody = ConvertRecordsToJsonAll(bodydatas);
if (isnoctn) { if (isnoctn) {
Ext.Msg.show({ title: '警告', msg: '集装箱信息,箱型不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '集装箱信息,箱型不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -3758,7 +3758,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
} else { } else {
Ext.Msg.show({ title: '警告', msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -3846,13 +3846,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '审核成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '审核成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
_this.winAuditShow.close() _this.winAuditShow.close()
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -3994,13 +3994,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '驳回成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '驳回成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
_this.winAuditBackShow.close(); _this.winAuditBackShow.close();
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -4028,7 +4028,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
} else { } else {
Ext.Msg.show({ title: '警告', msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '你仅能接受揽货人和默认揽货人是自己的业务!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -4115,13 +4115,13 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '审核成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '审核成功!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} }
else { else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: '服务器响应出错,请重试', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -4513,7 +4513,7 @@ Ext.extend(Shipping.MsSeaeOrderEdit, Ext.Panel, {
var basicForm = this.formHead.getForm(); var basicForm = this.formHead.getForm();
var billNo = basicForm.findField('BSNO').value; var billNo = basicForm.findField('BSNO').value;
if (billNo == '*' || billNo == '') { if (billNo == '*' || billNo == '') {
Ext.Msg.show({ title: '错误', msg: '单据还没有保存,请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.FEE.ChuoWu, msg: '单据还没有保存,请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
return; return;
} }

@ -24,6 +24,9 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
proxy: { url: '/CommMng/BasicDataRef/GetCtnDisp' } proxy: { url: '/CommMng/BasicDataRef/GetCtnDisp' }
}); });
this.StorebltypeQuery = Ext.create('DsExt.ux.RefEnumStore', {});
this.StorebltypeQuery.load({ params: { enumTypeId: 97042 } });
this.storeList = Ext.create('Ext.data.Store', { this.storeList = Ext.create('Ext.data.Store', {
pageSize: this.PageSize, pageSize: this.PageSize,
model: 'MsSeaeOrderModel', model: 'MsSeaeOrderModel',
@ -180,13 +183,28 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
sortable: true, sortable: true,
dataIndex: 'BLTYPE', dataIndex: 'BLTYPE',
header: Zi.LAN.BLTYPE, header: Zi.LAN.BLTYPE,
width: 60 width: 60,
renderer: function (value, meta) {
return _this.GetbltypeName(value);
}
}, },
{ {
sortable: true, sortable: true,
dataIndex: 'STLNAME', dataIndex: 'STLNAME',
header: Zi.LAN.STLNAME, header: Zi.LAN.STLNAME,
width: 60 width: 60,
renderer: function (value, meta) {
if (value == '月结')
return Zi.LAN.YUEJIE; //是
else if (value == '半月结')
return Zi.LAN.BANYUEJIE; //是
else if (value == '约定天数')
return Zi.LAN.YUEDINGTIANSHU; //是
else if (value == '周结')
return Zi.LAN.ZHOUJIE; //是
else if (value == '现结买单')
return Zi.LAN.XIANJIEMAIDAN; //是
}
}, },
{ {
sortable: true, sortable: true,
@ -354,7 +372,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
sortable: true, sortable: true,
id: '', id: '',
dataIndex: 'DRFEESTATUS', dataIndex: 'DRFEESTATUS',
header: '应收费用', //'应收费用', header: Zi.LAN.DRFEESTATUS, //'应收费用',
align: 'center', align: 'center',
width: 60, width: 60,
renderer: function (value, meta) { renderer: function (value, meta) {
@ -394,7 +412,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
sortable: true, sortable: true,
id: '', id: '',
dataIndex: 'CRFEESTATUS', dataIndex: 'CRFEESTATUS',
header: '应付费用', //'应付费用', header: Zi.LAN.CRFEESTATUS, //'应付费用',
align: 'center', align: 'center',
width: 60, width: 60,
renderer: function (value, meta) { renderer: function (value, meta) {
@ -1094,7 +1112,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
//} //}
, '-', { , '-', {
text: '显示Cover', text: Zi.LAN.XIANSHICOVER,
id: 'btnCover', id: 'btnCover',
handler: function (button, event) { handler: function (button, event) {
this.readingPaneChange(button); this.readingPaneChange(button);
@ -1200,26 +1218,26 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
var record = selections[0]; var record = selections[0];
if (record.data.ORSTATUS == '1') { if (record.data.ORSTATUS == '1') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (record.data.ORSTATUS == '0') { if (record.data.ORSTATUS == '0') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (record.data.ORSTATUS == '8') { if (record.data.ORSTATUS == '8') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (record.data.ORSTATUS == '4') { if (record.data.ORSTATUS == '4') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.YISHENHETONGGUOWUFASHANCHU, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
if (this.StoreOpRange.getCount() == 0) { if (this.StoreOpRange.getCount() == 0) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.QuanXianBuZuBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QuanXianBuZuBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} else { } else {
var op = record.data.OP; var op = record.data.OP;
@ -1231,7 +1249,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
if (recordins.getCount() > 0) { if (recordins.getCount() > 0) {
} else { } else {
canedit = false; canedit = false;
Ext.Msg.show({ title: '警告', msg: Zi.LAN.QuanXianBuZuBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.QuanXianBuZuBuYunXuShanChu, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
} }
@ -1259,7 +1277,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { }, success: function (response, options) { },
scope: this scope: this
@ -1280,7 +1298,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
if (record.data.ORSTATUS != '9' && record.data.ORSTATUS != '2') { if (record.data.ORSTATUS != '9' && record.data.ORSTATUS != '2') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.DANGQIANZHUANGTAIBUYUNXUCAOZUO, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.DANGQIANZHUANGTAIBUYUNXUCAOZUO, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1309,7 +1327,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -1332,7 +1350,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
if (record.data.ORSTATUS != '1') { if (record.data.ORSTATUS != '1') {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.DANGQIANZHUANGTAIWUFACHEXIAO, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.DANGQIANZHUANGTAIWUFACHEXIAO, icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });
return; return;
} }
@ -1361,7 +1379,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
} }
}, },
failure: function (response, options) { failure: function (response, options) {
Ext.Msg.show({ title: '警告', msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: Zi.LAN.JingGao, msg: Zi.LAN.FuWuQiXiangYingChuCuo, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
}, },
success: function (response, options) { success: function (response, options) {
}, },
@ -1371,6 +1389,15 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
}, this); }, this);
}, },
GetbltypeName: function (oplbname) {
if (strLANGUAGES != "en-us") return oplbname;
var records = DsStoreQueryBy(_this.StorebltypeQuery, 'EnumValueName', oplbname);
if (records.getCount() > 0) {
return records.getAt(0).data.EnumValueName_2;
} else {
return '';
}
},
onClearSql: function () { onClearSql: function () {
var form = this.formSearch.getForm(); var form = this.formSearch.getForm();
@ -1547,7 +1574,7 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
Ext.Msg.show({ title:'错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title:'错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} else { } else {
Ext.Msg.show({ title:'警告', msg:'服务器响应出错', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title:Zi.LAN.JingGao, msg:'服务器响应出错', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
} }
} }
}); });

Loading…
Cancel
Save