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

'20221202工单SR2022111700008经汉舱单业务改多票；舱单和报关增加实际用户；费用中使用BXGID存储分单号'

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent ab60a5bfe3
commit 8173de32d3
20 changed files with 232 additions and 38 deletions
Show Stats Download Patch File Download Diff File

1
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -594,6 +594,7 @@ namespace DSWeb.Common.DB
public string ISPRINTPR { get; set; }
public int BillFeeStatus { get; set; }
public string OPERATOR { get; set; }
public string CUSTOMERNAME2 { get; set; }
public string SALECORPID { get; set; }
public string FRCUSTSERVICE { get; set; }
public DateTime? CLOSINGDATE { get; set; }

4
DSWeb/Areas/MvcShipping/Controllers/MsChFeeController.cs
Unescape Escape View File

@ -156,7 +156,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json };
}
public ContentResult GetSaleDataList(string billno, int type, string optype, string condition)
public ContentResult GetSaleDataList(string billno, int type, string optype, string condition)
{
var fieldcomm = "";
if (condition != null && condition.Trim() != "")
@ -243,7 +243,7 @@ namespace DSWeb.MvcShipping.Controllers
var json = JsonConvert.Serialize(new { Success = result.Success});
return new ContentResult() { Content = json };
}
public ContentResult GetAmendGainData(string bsno,string bltype="")
public ContentResult GetAmendGainData(string bsno,string bltype="")
{
var dataList = new List<MsChFeeGain>();

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

@ -91,7 +91,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
private const string PARM_FEE_ISACC = "@ISACC";
private const string PARM_SALECORP = "@SALECORP";
private const string PARM_FEE_ISCRMORDERFEE = "@ISCRMORDERFEE";
private const string PARM_FEE_BXGID= "@BXGID";
#endregion
static private SqlParameter[] GetInsertParms()
@ -135,7 +135,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
new SqlParameter(PARM_MANAGER,SqlDbType.VarChar,50),
new SqlParameter(PARM_FEE_ISACC,SqlDbType.VarChar,1),
new SqlParameter(PARM_SALECORP,SqlDbType.VarChar,60),
new SqlParameter(PARM_FEE_ISCRMORDERFEE,SqlDbType.VarChar,1)
new SqlParameter(PARM_FEE_ISCRMORDERFEE,SqlDbType.VarChar,1),
new SqlParameter(PARM_FEE_BXGID,SqlDbType.VarChar,50)
};
@ -146,16 +147,16 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
private const string SQL_INSERT_FEE = " INSERT INTO ch_fee(GID, BSNO, FEETYPE, FEENAME, FEEDESCRIPTION, CUSTOMERTYPE, CUSTOMERNAME, UNIT, UNITPRICE, QUANTITY, AMOUNT, CURRENCY, "
+ " EXCHANGERATE, REASON, REMARK, COMMISSIONRATE,ENTEROPERATOR, ENTERDATE,ISOPEN, ISADVANCEDPAY, SORT, FEESTATUS, FEEFRT, "
+ " TAXRATE,NOTAXAMOUNT,ACCTAXRATE,LINENUM,TAXUNITPRICE,MODIFIEDUSER,MODIFIEDTIME,WMSOUTBSNO,PREAMOUNT,ISINVOICE,INPUTMODE,LOCALCURR,MANAGER,ISACC,SALECORP,ISCRMORDERFEE) "
+ " TAXRATE,NOTAXAMOUNT,ACCTAXRATE,LINENUM,TAXUNITPRICE,MODIFIEDUSER,MODIFIEDTIME,WMSOUTBSNO,PREAMOUNT,ISINVOICE,INPUTMODE,LOCALCURR,MANAGER,ISACC,SALECORP,ISCRMORDERFEE,BXGID) "
+ " VALUES "
+ " (@gid,@bsno,@fee_type,@fee_name,@fee_description,@customer_type,@customer_name,@unit,@unit_price,@quantity,@amount,@currency, "
+ " @exchange_rate,@reason,@remark,@comm_rate,@enter_operator,@enter_date,@is_open,@is_advance_pay,@sort,@fee_status,@fee_frt, "
+ " @taxrate,@notaxamount,@acctaxrate,@LINENUM,@taxunit_price,@MODIFIEDUSER,@MODIFIEDTIME,@WMSOUTBSNO,@PREAMOUNT,@ISINVOICE,@INPUTMODE,@LOCALCURR,@MANAGER,@ISACC,@SALECORP,@ISCRMORDERFEE)";//DateTime.Now.ToString()
+ " @taxrate,@notaxamount,@acctaxrate,@LINENUM,@taxunit_price,@MODIFIEDUSER,@MODIFIEDTIME,@WMSOUTBSNO,@PREAMOUNT,@ISINVOICE,@INPUTMODE,@LOCALCURR,@MANAGER,@ISACC,@SALECORP,@ISCRMORDERFEE,@BXGID)";//DateTime.Now.ToString()
private const string SQL_UPDATE_CH_FE = " UPDATE ch_fee SET FEENAME = @fee_name,FEEDESCRIPTION=@fee_description,CUSTOMERTYPE=@customer_type,CUSTOMERNAME = @customer_name,UNIT = @unit,UNITPRICE = @unit_price,QUANTITY = @quantity,COMMISSIONRATE = @comm_rate,"
+ " AMOUNT = @amount,CURRENCY = @currency,EXCHANGERATE = @exchange_rate,FEEFRT = @fee_frt,REMARK = @remark,ISADVANCEDPAY = @is_advance_pay,"
+ " WMSOUTBSNO=@WMSOUTBSNO,LINENUM=@LINENUM,TaxRate=@TAXRATE,NoTaxAmount=@NOTAXAMOUNT,AccTaxRate=@ACCTAXRATE,TAXUNITPRICE=@TAXUNITPRICE,PREAMOUNT=@PREAMOUNT,"
+ "MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME,ISOPEN = @ISOPEN,IsInvoice=@IsInvoice,INPUTMODE=@INPUTMODE,LOCALCURR=@LOCALCURR,MANAGER=@MANAGER,ISACC=@ISACC,SALECORP=@SALECORP,ISCRMORDERFEE=@ISCRMORDERFEE WHERE GID = @gid ";
+ "MODIFIEDUSER=@MODIFIEDUSER,MODIFIEDTIME=@MODIFIEDTIME,ISOPEN = @ISOPEN,IsInvoice=@IsInvoice,INPUTMODE=@INPUTMODE,LOCALCURR=@LOCALCURR,MANAGER=@MANAGER,ISACC=@ISACC,SALECORP=@SALECORP,ISCRMORDERFEE=@ISCRMORDERFEE,BXGID=@BXGID WHERE GID = @gid ";
private const string SQL_INSERT_ORDERFEE = " INSERT INTO ch_fee_order(GID, BSNO, FEETYPE, FEENAME, FEEDESCRIPTION, CUSTOMERTYPE, CUSTOMERNAME, UNIT, UNITPRICE, QUANTITY, AMOUNT, CURRENCY, "
@ -329,6 +330,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
}
else parms[38].Value = "0";
parms[39].Value = feeEntity.BXGID;
SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, SQL_INSERT_FEE, parms);
}
@ -366,9 +368,10 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
new SqlParameter("@MANAGER",SqlDbType.VarChar,60),
new SqlParameter("@ISACC",SqlDbType.VarChar,1),
new SqlParameter("@SALECORP",SqlDbType.VarChar,60),
new SqlParameter("@ISCRMORDERFEE",SqlDbType.VarChar,1)
new SqlParameter("@ISCRMORDERFEE",SqlDbType.VarChar,1),
new SqlParameter("@BXGID",SqlDbType.VarChar,50)
};
};
updateParms[0].Value = feeEntity.GId;
updateParms[1].Value = feeEntity.FeeName;
@ -497,7 +500,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
}
}
else updateParms[31].Value = "0";
updateParms[32].Value = feeEntity.BXGID;
SqlHelper.ExecuteNonQuery(sqlTran, CommandType.Text, SQL_UPDATE_CH_FE, updateParms);
}
}
@ -793,7 +796,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",(select showname from [user] where gid=ch_fee.Auditoperator) Auditoperatorref,LOCALCURR,MANAGER");
strSql.Append(",(select showname from [user] where gid=ch_fee.MANAGER) MANAGERREF ");
strSql.Append(",(select top 1 DESCRIPTION from info_client where SHORTNAME=ch_fee.CustomerName) CustomerFullName,STATEMENTNO,SALECORP ");
strSql.Append(",(select TOP 1 VOUALLNO FROM cw_vouno_bs_gl WHERE BSGID=ch_fee.GID AND BSTABLENAME='ch_fee') VOUNO,ISNULL(ISDJY,0) ISDJY,INVLINKGID,DEBITAMOUNT ");
strSql.Append(",(select TOP 1 VOUALLNO FROM cw_vouno_bs_gl WHERE BSGID=ch_fee.GID AND BSTABLENAME='ch_fee') VOUNO,ISNULL(ISDJY,0) ISDJY,INVLINKGID,DEBITAMOUNT,BXGID ");
strSql.Append(" from ch_fee ");
@ -901,7 +904,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",(select showname from [user] where gid=ch_fee.Auditoperator) Auditoperatorref,LOCALCURR,MANAGER ");
strSql.Append(",(select showname from [user] where gid=ch_fee.MANAGER) MANAGERREF ");
strSql.Append(",(select top 1 DESCRIPTION from info_client where SHORTNAME=ch_fee.CustomerName) CustomerFullName,STATEMENTNO,SALECORP ");
strSql.Append(",(select TOP 1 VOUALLNO FROM cw_vouno_bs_gl WHERE BSGID=ch_fee.GID AND BSTABLENAME='ch_fee') VOUNO,ISNULL(ISDJY,0) ISDJY,INVLINKGID,DEBITAMOUNT ");
strSql.Append(",(select TOP 1 VOUALLNO FROM cw_vouno_bs_gl WHERE BSGID=ch_fee.GID AND BSTABLENAME='ch_fee') VOUNO,ISNULL(ISDJY,0) ISDJY,INVLINKGID,DEBITAMOUNT,BXGID ");
strSql.Append(" from ch_fee ");
@ -1034,6 +1037,8 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
data.INVLINKGID = Convert.ToString(reader["INVLINKGID"]);
if (reader["DEBITAMOUNT"] != DBNull.Value)
data.DEBITAMOUNT = Convert.ToDecimal(reader["DEBITAMOUNT"]);
if (reader["BXGID"] != DBNull.Value)
data.BXGID = Convert.ToString(reader["BXGID"]);
#endregion
@ -2434,7 +2439,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",(select showname from [user] where gid=ch_fee_modify.APPLYUSER) MODIFIEDUSER ");
strSql.Append(",'' Auditoperatorref,'' LOCALCURR,MANAGER,(select showname from [user] where gid=ch_fee_modify.MANAGER) MANAGERREF ");
strSql.Append(",'' customerFullName,''STATEMENTNO,SALECORP,0 ISDJY");
strSql.Append(",'' VOUNO ,'' INVLINKGID,0 DEBITAMOUNT");
strSql.Append(",'' VOUNO ,'' INVLINKGID,0 DEBITAMOUNT,'' BXGID");
strSql.Append(" from ch_fee_modify ");
@ -2463,7 +2468,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",(select showname from [user] where gid=ch_fee_modify.APPLYUSER) MODIFIEDUSER ");
strSql.Append(",'' Auditoperatorref,'' LOCALCURR,MANAGER,(select showname from [user] where gid=ch_fee_modify.MANAGER) MANAGERREF ");
strSql.Append(",'' customerFullName,''STATEMENTNO, SALECORP,0 ISDJY");
strSql.Append(",'' VOUNO,'' INVLINKGID,0 DEBITAMOUNT ");
strSql.Append(",'' VOUNO,'' INVLINKGID,0 DEBITAMOUNT,'' BXGID ");
strSql.Append(" from ch_fee_modify ");
strSql.Append(" where APPLYTYPE=" + ApplyType + " AND FEEID='" + FeeID + "'");
@ -5106,7 +5111,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",'' MODIFIEDUSER,null MODIFIEDTIME,0 UNINVOICE,0 PREAMOUNT,0 TAX,'' INPUTMODE ");
strSql.Append(",'' Auditoperatorref,'' LOCALCURR,'' MANAGER ,'' MANAGERREF ");
strSql.Append(",'' customerFullName,''STATEMENTNO,'' SALECORP,0 ISDJY ");
strSql.Append(",'' VOUNO,'' INVLINKGID,0 DEBITAMOUNT ");
strSql.Append(",'' VOUNO,'' INVLINKGID,0 DEBITAMOUNT,'' BXGID ");
strSql.Append(" from ch_fee_order ");
if (strCondition.Trim() != String.Empty)
@ -5138,7 +5143,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
strSql.Append(",'' MODIFIEDUSER,null MODIFIEDTIME,0 UNINVOICE,0 PREAMOUNT,[报文类型] INPUTMODE ");
strSql.Append(",'' Auditoperatorref,'' LOCALCURR,'' MANAGER ,'' MANAGERREF ");
strSql.Append(",'' customerFullName,''STATEMENTNO,'' SALECORP");
strSql.Append(",'' VOUNO,0 ISDJY,'' INVLINKGID,0 DEBITAMOUNT ");
strSql.Append(",'' VOUNO,0 ISDJY,'' INVLINKGID,0 DEBITAMOUNT,'' BXGID ");
strSql.Append(" from t_ch_fee_edi ");
if (strCondition.Trim() != String.Empty)

6
DSWeb/Areas/MvcShipping/DAL/MsOpApply/MsOpApplyDAL.cs
Unescape Escape View File

@ -80,7 +80,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=OP_APPLY.SALECORPID) as SALECORP,BillFeeStatus ");
strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE ");
strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2");
strSql.Append(" from OP_APPLY ");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=OP_APPLY.BSNO) ");
@ -219,7 +219,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=OP_APPLY.SALECORPID) as SALECORP,BillFeeStatus ");
strSql.Append(",[DOCSTATUS],[CUSCIQNO],[TRANCUSTOMNO],[CUSTOMLOCKNO],[EXPCUSTOMTYPE],[DESPPORT],CONSIGNEE ");
strSql.Append(",(SELECT TOP 1 STATUS FROM OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_APPLY.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE");
strSql.Append(",ETPS_CATEGORY,CDNTYPE,CUSTSERVICE,OPERATORCODE,CUSTOMERNAME2");
strSql.Append(" from OP_APPLY ");
@ -417,7 +417,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpApplyDAL
if(reader["CDNTYPE"] != DBNull.Value)
data.CDNTYPE = Convert.ToInt32(reader["CDNTYPE"]);//
data.OPERATORCODE = Convert.ToString(reader["OPERATORCODE"]);//
data.CUSTOMERNAME2 = Convert.ToString(reader["CUSTOMERNAME2"]);//
#endregion
headList.Add(data);
}

5
DSWeb/Areas/MvcShipping/DAL/MsOpOther/MsOpOtherDAL.cs
Unescape Escape View File

@ -57,7 +57,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
strSql.Append(" CUSTNO, MBLNO, HBLNO, CONTRACTNO, CUSTOMERNAME, CONVERT(char(10), BSDATE, 20) as BSDATE, ACCDATE, BSSOURCE, BSSOURCEDETAIL, OP, CUSTSERVICE, SALE, FRCUSTSERVICE,CORPID, TRANSTYPE, VESSEL, VOYNO,");
strSql.Append(" CONVERT(char(10), ETD, 20) as ETD, PORTLOAD, PORTDISCHARGE, TRADETYPE, GOODSNAME, KGS, NETWEIGHT, PKGS, KINDPKGS, CBM,CTNALL,CTNNUM,ISVOU, VOUNO, REMARK,");
strSql.Append(" (select top 1 showname from [user] where GID=op_other.CREATEUSER) as CREATEUSER, CREATETIME, (select top 1 showname from [user] where GID=op_other.MODIFIEDUSER) as MODIFIEDUSER, ");
strSql.Append(" MODIFIEDTIME, ORDERNO,OPERATOR,STLNAME,STLDATE,ENTERP,BOOKNO,dbo.F_GetBillDrFeeStatus(op_other.BSNO) DRFEESTATUS,dbo.F_GetBillCrFeeStatus(op_other.BSNO) CRFEESTATUS,ISPRINTPR,I.TTLDR,I.TTLINVDR,I.TTLDUIDR ");
strSql.Append(" MODIFIEDTIME, ORDERNO,OPERATOR,CUSTOMERNAME2,STLNAME,STLDATE,ENTERP,BOOKNO,dbo.F_GetBillDrFeeStatus(op_other.BSNO) DRFEESTATUS,dbo.F_GetBillCrFeeStatus(op_other.BSNO) CRFEESTATUS,ISPRINTPR,I.TTLDR,I.TTLINVDR,I.TTLDUIDR ");
strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=op_other.SALECORPID) as SALECORP,CLOSINGDATE,CLOSEDOCDATE,SALEDEPT,CUSTOMSER,WAREHOUSE,COUNTRYOFORIGIN");
strSql.Append(",(SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID = op_other.BSNO) as AMENDCOUNT");
strSql.Append(",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,op_other.BillFeeStatus FROM op_other");
@ -146,7 +146,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
static public MsOpOtherEntity GetData(string condition)
{
String strSql = "SELECT BSNO, OPLB, OPLBNAME, BSSTATUS, FEESTATUS, (CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF, (CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF, CUSTNO, MBLNO, HBLNO, CONTRACTNO, CUSTOMERNAME, CONVERT(char(10), BSDATE, 20) as BSDATE";
strSql = strSql + ", ACCDATE, BSSOURCE, BSSOURCEDETAIL, OP, CUSTSERVICE,FRCUSTSERVICE, SALE, CORPID, TRANSTYPE, VESSEL, VOYNO, CONVERT(char(10), ETD, 20) as ETD, PORTLOAD, PORTDISCHARGE, TRADETYPE, GOODSNAME, KGS, NETWEIGHT, PKGS, KINDPKGS, CBM,CTNALL,CTNNUM, ISVOU, VOUNO, REMARK, (select top 1 showname from [user] where GID=op_other.CREATEUSER) as CREATEUSER, CREATETIME, (select top 1 showname from [user] where GID=op_other.MODIFIEDUSER) as MODIFIEDUSER, MODIFIEDTIME, ORDERNO,OPERATOR,STLNAME,STLDATE,ENTERP,BOOKNO ";
strSql = strSql + ", ACCDATE, BSSOURCE, BSSOURCEDETAIL, OP, CUSTSERVICE,FRCUSTSERVICE, SALE, CORPID, TRANSTYPE, VESSEL, VOYNO, CONVERT(char(10), ETD, 20) as ETD, PORTLOAD, PORTDISCHARGE, TRADETYPE, GOODSNAME, KGS, NETWEIGHT, PKGS, KINDPKGS, CBM,CTNALL,CTNNUM, ISVOU, VOUNO, REMARK, (select top 1 showname from [user] where GID=op_other.CREATEUSER) as CREATEUSER, CREATETIME, (select top 1 showname from [user] where GID=op_other.MODIFIEDUSER) as MODIFIEDUSER, MODIFIEDTIME, ORDERNO,OPERATOR,CUSTOMERNAME2,STLNAME,STLDATE,ENTERP,BOOKNO ";
strSql = strSql + ",SALECORPID,(select [NAME] from [company] where GID=SALECORPID) as SALECORP,CLOSINGDATE,CLOSEDOCDATE,SALEDEPT,CUSTOMSER,WAREHOUSE,COUNTRYOFORIGIN";
strSql = strSql + ",(SELECT COUNT(*) FROM OP_AMEND WHERE PARENTID = op_other.BSNO) as AMENDCOUNT";
strSql = strSql + ",IsService1,IsService2,IsService3,IsService4,IsService5,IsService6,IsService7,IsService8,IsService9,IsService10,IsService11,IsService12,IsService13,IsService14,IsService15,IsService16,'' DRFEESTATUS,'' CRFEESTATUS,ISPRINTPR,0 TTLDR,0 TTLINVDR,0 TTLDUIDR,BillFeeStatus FROM op_other";
@ -242,6 +242,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
data.ENTERP = Convert.ToString(reader["ENTERP"]);
data.ORDERNO = Convert.ToString(reader["ORDERNO"]);
data.OPERATOR = Convert.ToString(reader["OPERATOR"]);
data.CUSTOMERNAME2 = Convert.ToString(reader["CUSTOMERNAME2"]);
data.STLNAME = Convert.ToString(reader["STLNAME"]);
data.STLDATE = Convert.ToString(reader["STLDATE"]);
data.BOOKNO = Convert.ToString(reader["BOOKNO"]);

3
DSWeb/Areas/MvcShipping/Models/MsChFee/MsChFee.cs
Unescape Escape View File

@ -474,6 +474,9 @@ namespace DSWeb.MvcShipping.Models.MsChFee
public decimal DEBITAMOUNT { get; set; }
[ModelDB]
public string BXGID {get;set;}
#endregion
public MsChFee()

12
DSWeb/Areas/MvcShipping/Models/MsOpApply/MsOpApply.cs
Unescape Escape View File

@ -1029,6 +1029,18 @@ namespace DSWeb.MvcShipping.Models.MsOpApply
get { return _operatorcode; }
set { _operatorcode = value; }
}
private string _CUSTOMERNAME2 = "";
/// <summary>
/// 实际客户
/// </summary>
[ModelDB]
public string CUSTOMERNAME2
{
get { return _CUSTOMERNAME2; }
set { _CUSTOMERNAME2 = value; }
}
#endregion
public MsOpApply()

12
DSWeb/Areas/MvcShipping/Models/MsOpOther/MsOpOtherEntity.cs
Unescape Escape View File

@ -289,8 +289,18 @@ namespace DSWeb.MvcShipping.Models.MsOpOther
{
get { return _operator; }
set { _operator = value; }
}
}
private string _CUSTOMERNAME2 = "";
/// <summary>
/// 实际客户
/// </summary>
[ModelDB]
public string CUSTOMERNAME2
{
get { return _CUSTOMERNAME2; }
set { _CUSTOMERNAME2 = value; }
}
private string _vessel = "";
/// <summary>

23
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGrid.js
Unescape Escape View File

@ -1119,7 +1119,28 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
// header: Zi.LAN.FEE.InvoiceNum, //'发票号码',
// width: 80
// },
{
sortable: true,
dataIndex: 'BXGID',
header: Zi.LAN.FEE.BXGID, //'対帐编号',
width: 80,
editor: {
xtype: 'textfield',
selectOnFocus: true,
enableKeyEvents: true,
listeners: {
keydown: function (textfield, e) {
if (e.getKey() == 40) {
_thisfee.onNextKeyClick(1, 17)
} else if (e.getKey() == 38) {
_thisfee.onUpKeyClick(1, 17)
}
}
}
}
},
{
sortable: true,
dataIndex: 'DEBITAMOUNT',

3
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeMode.js
Unescape Escape View File

@ -70,7 +70,8 @@ Ext.define('MsChFee', {
{ name: 'INVLINKGID', type: 'string' },
{ name: 'VOUALLNO', type: 'string' },
{ name: 'STATEMENTNO', type: 'string' },
{ name: 'SALECORP', type: 'string' }
{ name: 'SALECORP', type: 'string' },
{ name: 'BXGID', type: 'string' }
]
});

1
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_en-us.js
Unescape Escape View File

@ -254,6 +254,7 @@ Zi.LAN.FEE.AutoInv = "自助开票";
Zi.LAN.FEE.btnAgentFc = "代理分成";
Zi.LAN.FEE.SLNO = "更改次数";
Zi.LAN.FEE.DEBITAMOUNT = "对帐金额";
Zi.LAN.FEE.BXGID = "HBLNO";
//#endregion
//Zi.LAN.FEE. = "";

1
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/Zi_zh-cn.js
Unescape Escape View File

@ -259,6 +259,7 @@ Zi.LAN.FEE.AutoInv = "上传账单";
Zi.LAN.FEE.btnAgentFc = "代理分成";
Zi.LAN.FEE.SLNO = "更改次数";
Zi.LAN.FEE.DEBITAMOUNT = "对帐金额";
Zi.LAN.FEE.BXGID = "分单号";
//#endregion
//Zi.LAN.FEE. = "";

62
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyEdit.js
Unescape Escape View File

@ -304,6 +304,64 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
});
this.comboxCUSTOMERNAME2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '实际客户',
store: this.storeCustCode,
forceSelection: true,
queryMode: 'remote',
minChars: 1,
queryParam: 'CODENAME',
name: 'CUSTOMERNAME2',
valueField: 'CustName',
displayField: 'CodeAndName',
listeners: {
//scope: this,
//'select': function (combo, records, eOpts) {
// if (this.ENTERSAMEASCUSTOMER == 1) {
// var ENTERP = this.formEdit.getForm().findField('ENTERP');
// ENTERP.setValue(combo.value);
// }
// if (records[0].data.BSSOURCE != '') {
// this.formHead.getForm().findField('BSSOURCE').setValue(records[0].data.BSSOURCE);
// var recs = DsStoreQueryBy(this.storeSource, 'SourceName', records[0].data.BSSOURCE);
// if (recs.getCount() > 0) {
// var data = recs.getAt(0).data;
// var s = "SOURCEID='" + data.SourceID + "'";
// this.storeSourceDetail.load({ params: { condition: s } });
// } else {
// var BSSOURCEDETAIL = this.formHead.getForm().findField('BSSOURCEDETAIL');
// BSSOURCEDETAIL.setValue('');
// }
// }
// var s = " ISOPERATOR=1 and LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')";
// this.storeInfoClientContact.load({
// params: { condition: s },
// callback: function (r, options, success) {
// if (success) {
// if (this.storeInfoClientContact.getCount() > 0) {
// var member = this.storeInfoClientContact.getAt(0);
// this.comboxInfoClientContact.setValue(member.data.SHOWNAME);
// // this.formHead.getForm().findField('OPERATOREMAIL').setValue(member.data.EMAIL);
// this.formHead.getForm().findField('OPERATORTEL').setValue(member.data.TEL);
// // this.formHead.getForm().findField('OPERATORFAX').setValue(member.data.FAX);
// } else {
// this.comboxInfoClientContact.setValue('');
// // this.formHead.getForm().findField('OPERATOREMAIL').setValue('');
// this.formHead.getForm().findField('OPERATORTEL').setValue('');
// // this.formHead.getForm().findField('OPERATORFAX').setValue('');
// }
// }
// },
// scope: this
// });
//}
}
});
//委托单位_联系人
this.storeInfoClientContact = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.InfoClientContactModel',
@ -746,8 +804,10 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
items: [
this.combox_etps_category,
this.comboxcdnType, this.comboxCustservice, this.comboxInfoClientContact,
this.comboxCUSTOMERNAME2,
{
flex: 2,
flex: 1,
xtype: 'hiddenfield'
}
]

5
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyIndex.js
Unescape Escape View File

@ -558,6 +558,11 @@ Ext.extend(Shipping.MsOpApplyIndex, Ext.Panel, {
dataIndex: 'REMARK',
header: '备注',
width: 80
}, {
sortable: true,
dataIndex: 'CUSTOMERNAME2',
header: '实际客户',
width: 80
}, {
sortable: true,
dataIndex: 'CUSTOMSNUM',

15
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js
Unescape Escape View File

@ -2,13 +2,13 @@
extend: 'Ext.data.Model',
idProperty: 'BSNO',
fields: [
{ name: 'BSNO', type: 'string' },
{ name: 'BSSTATUS', type: 'boolean' },
{ name: 'FEESTATUS', type: 'boolean' },
{ name: 'BSSTATUSREF', type: 'string' },
{ name: 'FEESTATUSREF', type: 'string' },
{ name: 'DRFEESTATUS', type: 'string' },
{ name: 'CRFEESTATUS', type: 'string' },
{ name: 'BSNO', type: 'string' },
{ name: 'BSSTATUS', type: 'boolean' },
{ name: 'FEESTATUS', type: 'boolean' },
{ name: 'BSSTATUSREF', type: 'string' },
{ name: 'FEESTATUSREF', type: 'string' },
{ name: 'DRFEESTATUS', type: 'string' },
{ name: 'CRFEESTATUS', type: 'string' },
{ name: 'DRINVSTATUS', type: 'string' },
{ name: 'DRDUISTATUS', type: 'string' },
{ name: 'OPSTATUS', type: 'string' },
@ -65,6 +65,7 @@
{ name: 'ENTERP', type: 'string' },
{ name: 'CUSTOMSNUM', type: 'number' },
{ name: 'OPERATORCODE', type: 'string' },
{ name: 'CUSTOMERNAME2', type: 'string' },
{ name: 'IsSERVICE1', type: 'boolean', convert: function (v) { return v === '1'; } },
{ name: 'IsSERVICE2', type: 'boolean', convert: function (v) { return v === '1'; } },
{ name: 'IsSERVICE3', type: 'boolean', convert: function (v) { return v === '1'; } },

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js
Unescape Escape View File

@ -48,7 +48,8 @@
{ name: 'AMEND', type: 'string' },
{ name: 'ISVOU', type: 'boolean', convert: function (v) { return v === '1'; } }, // 是否生成凭证
{name: 'VOUNO', type: 'string' }, // 凭证号
{name: 'OPERATOR', type: 'string' },
{ name: 'OPERATOR', type: 'string' },//客户联系人
{ name: 'CUSTOMERNAME2', type: 'string' },//实际客户
{ name: 'STLNAME', type: 'string' },
{ name: 'STLDATE', type: 'string' },
{ name: 'ENTERP', type: 'string' },

70
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanEdit.js
Unescape Escape View File

@ -212,6 +212,58 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
}
});
this.comboxCUSTOMERNAME2 = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '实际客户',
store: this.storeCustCode,
forceSelection: true,
name: 'CUSTOMERNAME2',
valueField: 'CustName',
displayField: 'CodeAndName',
listeners: {
//scope: this,
//'select': function (combo, records, eOpts) {
// if (records.length > 0) {
// var basicForm = _this.formEdit.getForm();
// var ENTERP = basicForm.findField('ENTERP').getValue();
// if (ENTERP == '' || ENTERP == null) {
// basicForm.findField('ENTERP').setValue(combo.value);
// }
// this.formHead.getForm().findField('SALECORPID').setValue(records[0].data.SALECORPID);
// this.formHead.getForm().findField('SALE').setValue(records[0].data.SALE);
// var s = " LINKID in (select gid from [info_client] where SHORTNAME='" + combo.value + "')";
// this.storeInfoClientContact.load({
// params: { condition: s },
// callback: function (r, options, success) {
// if (success) {
// if (this.storeInfoClientContact.getCount() > 0) {
// var member = this.storeInfoClientContact.getAt(0);
// this.comboxInfoClientContact.setValue(member.data.SHOWNAME);
// } else {
// this.comboxInfoClientContact.setValue('');
// }
// }
// },
// scope: this
// });
// if (records[0].data.BSSOURCE != '') {
// this.formEdit.getForm().findField('BSSOURCE').setValue(records[0].data.BSSOURCE);
// var recs = DsStoreQueryBy(this.storeSource, 'SourceName', records[0].data.BSSOURCE);
// if (recs.getCount() > 0) {
// var data = recs.getAt(0).data;
// var s = "SOURCEID='" + data.SourceID + "'";
// this.storeSourceDetail.load({ params: { condition: s } });
// } else {
// var BSSOURCEDETAIL = this.formHead.getForm().findField('BSSOURCEDETAIL');
// BSSOURCEDETAIL.setValue('');
// }
// }
// }
//}
}
});
//委托单位_联系人
this.storeInfoClientContact = Ext.create('DsExt.ux.RefTableStore', {
@ -221,7 +273,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
//this.storeInfoClientContact.load();
this.comboxInfoClientContact = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '客户联系人', //'客户操作',
fieldLabel: '客户操作', //'客户操作',
store: this.storeInfoClientContact,
// forceSelection: true,
name: 'OPERATOR',
@ -478,8 +530,10 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxCUSTSERVICE, this.comboxFRCUSTSERVICE, this.comboxInfoClientContact]
}, {
items: [this.comboxCustCode, this.comboxOP, this.comboxSALE, this.comboxCUSTSERVICE, this.comboxFRCUSTSERVICE, this.comboxInfoClientContact]
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
@ -533,7 +587,15 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
xtype: 'datefield',
name: 'STLDATE'
}]
}]//end items(fieldset 1)
}
, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [this.comboxCUSTOMERNAME2 , { xtype: 'hiddenfield', flex: 5 }]
}
]//end items(fieldset 1)
}]//end root items
}); //end this.formHead

7
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_CangDanIndex.js
Unescape Escape View File

@ -286,10 +286,15 @@ Ext.extend(Shipping.MsOpOtherIndex, Ext.Panel, {
dataIndex: 'CUSTSERVICE',
header: '客服',
width: 80
}, {
sortable: true,
dataIndex: 'CUSTOMERNAME2',
header: '实际客户',
width: 80
}, {
sortable: true,
dataIndex: 'OPERATOR',
header: '客户联系人',
header: '客户操作',
width: 80
}, {
sortable: true,

4
UpdateSQL/20221201165610.txt
Unescape Escape View File

@ -0,0 +1,4 @@
开始升级2022-12-1 16:56:09
当前程序版本号:7.22.1125
升级版本号：7221201
升级完毕,时间2022-12-1 16:56:10

BIN
UpdateSQL/update.ldb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save