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

1

Browse Source
dev
hanxuntao 3 months ago
parent 6544d05d1e
commit 7c0fd50eb1
5 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File

14
DSWeb/Areas/MvcShipping/DAL/MsOpSaleRpt/MsOpSaleRptDAL.cs
Unescape Escape View File

@ -172,7 +172,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSaleRptDAL
static public List<MsOpSaleRpt> GetNewDataList()
{
String strSql = "SELECT *, DATEDIFF([day],STLDATE,GETDATE()) NODAY,(select top 1 PLANDATE from op_sale_rpt where BSNO=v_noday_fee.BSNO ORDER BY CREATETIME DESC) PLANDATE FROM v_noday_fee WHERE DATEDIFF([day],STLDATE,GETDATE())>0 ";
String strSql = "SELECT *, DATEDIFF([day],STLDATE,GETDATE()) NODAY,(select top 1 PLANDATE from op_sale_rpt where BSNO=v_noday_fee.BSNO ORDER BY CREATETIME DESC) PLANDATE,(select top 1 REMARK from op_sale_rpt where BSNO=v_noday_fee.BSNO ORDER BY CREATETIME DESC) REMARK FROM v_noday_fee WHERE DATEDIFF([day],STLDATE,GETDATE())>0 ";
return SetNewData(strSql);
}
@ -216,7 +216,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSaleRptDAL
if (reader["NODAY"] != DBNull.Value)
data.NODAY = Convert.ToString(reader["NODAY"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
#endregion
headList.Add(data);
@ -240,13 +240,15 @@ namespace DSWeb.MvcShipping.DAL.MsOpSaleRptDAL
try
{
var cmdUpdate =db.GetSqlStringCommand( @"update op_sale_rpt set SORT=1 ");
cmdUpdate.Parameters.Clear();
db.ExecuteNonQuery(cmdUpdate, tran);
var cmdInsert =
db.GetSqlStringCommand(
@"insert into op_sale_rpt ([GID],[BSNO],[MBLNO],[CUSTOMERNAME],[ACCDATE],[OP],[SALE],[ETD],[RMBDR],[USDDR],[STLRMBDR],[STLUSDDR]
,[BALRMBDR],[BALUSDDR],[TTLBALDR],[CREATEUSER],[CREATETIME],[PLANDATE],[RPTSTATUS],STLDATE,NODAY)
,[BALRMBDR],[BALUSDDR],[TTLBALDR],[CREATEUSER],[CREATETIME],[PLANDATE],[RPTSTATUS],STLDATE,NODAY,REMARK,SORT)
values (NEWID(),@BSNO,@MBLNO,@CUSTOMERNAME,@ACCDATE,@OP,@SALE,@ETD,@RMBDR,@USDDR,@STLRMBDR,@STLUSDDR
,@BALRMBDR,@BALUSDDR,@TTLBALDR,@CREATEUSER,GETDATE(),@PLANDATE,'未发布',@STLDATE,@NODAY) ");
,@BALRMBDR,@BALUSDDR,@TTLBALDR,@CREATEUSER,GETDATE(),@PLANDATE,'未发布',@STLDATE,@NODAY,@REMARK,@SORT) ");
if (headList!=null&& headList.Count != 0)
@ -275,6 +277,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSaleRptDAL
db.AddInParameter(cmdInsert, "@PLANDATE", DbType.String, null);
db.AddInParameter(cmdInsert, "@STLDATE", DbType.String, enumValue.STLDATE);
db.AddInParameter(cmdInsert, "@NODAY", DbType.String, enumValue.NODAY);
db.AddInParameter(cmdInsert, "@REMARK", DbType.String, enumValue.REMARK);
db.AddInParameter(cmdInsert, "@SORT", DbType.Int16,0);
db.ExecuteNonQuery(cmdInsert, tran);

4
DSWeb/Areas/MvcShipping/DAL/MsOpVgmSend/MsOpVgmSendDAL.cs
Unescape Escape View File

@ -469,8 +469,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpVgmSendDAL
{
if (bodyList.Exists(x => x.carrierSendFlag == 1))
{
var ctn = bodyList.FirstOrDefault(x => x.carrierSendFlag == 1);
result.SetErrorInfo($"箱号{ctn.CNTRNO}已发船公司，不能再次发送新增");
//var ctn = bodyList.FirstOrDefault(x => x.carrierSendFlag == 1);
//result.SetErrorInfo($"箱号{ctn.CNTRNO}已发船公司，不能再次发送新增");
}
}
else

32
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSaleRpt/MsOpSaleRptIndex.js
Unescape Escape View File

@ -344,6 +344,18 @@ Ext.extend(Shipping.MsOpSaleRptIndex, Ext.Panel, {
}
});
this.CheckNow = new Ext.form.Checkbox({
fieldLabel:'本期',
flex: 0.5,
checked: true
});
this.CheckBefore = new Ext.form.Checkbox({
fieldLabel:'上期',
flex: 0.5,
checked: false
});
this.formSearch = Ext.widget('form', {
@ -437,7 +449,7 @@ Ext.extend(Shipping.MsOpSaleRptIndex, Ext.Panel, {
}
}
}
}, this.comboxSALE, {
}, this.comboxSALE, this.CheckNow, this.CheckBefore,{
xtype: 'button',
width: 90,
text: "查询",
@ -1098,13 +1110,29 @@ Ext.extend(Shipping.MsOpSaleRptIndex, Ext.Panel, {
return '';
}
var sql = '';
var sql = ' 1=1 ';
if (_thisSaleRpt.modOpSaleRptAdd == '0') {
sql = " RPTSTATUS='发布' "
}
if (this.CheckNow.checked && this.CheckBefore.checked) {
} else {
if (this.CheckNow.checked) {
sql = sql + " and SORT=0 "
}
if (this.CheckBefore.checked) {
sql = sql + " and isnull(SORT,1)<>0 "
}
}
var MBLNO = form.findField('MBLNO').getValue();
sql = sql + getAndConSql(sql, MBLNO, "MBLNO like '%" + MBLNO + "%'");

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

@ -518,7 +518,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{
sortable: true,
dataIndex: 'BillNo',
header: '委托编号',
header: '工作号',
width: 160
},
{
@ -1449,7 +1449,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}
}
}, {
fieldLabel: '委托单号',
fieldLabel: '工作号',
name: 'BillNo',
enableKeyEvents: true,
listeners: {
@ -1933,7 +1933,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{
xtype: 'textfield',
fieldLabel: '委托编号',
fieldLabel: '工作号',
name: 'BillNo',
enableKeyEvents: true,
listeners: {

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

@ -493,7 +493,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{
sortable: true,
dataIndex: 'BillNo',
header: '委托编号',
header: '工作号',
width: 160
},
{
@ -1389,7 +1389,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
}
}
}, {
fieldLabel: '委托单号',
fieldLabel: '工作号',
name: 'BillNo',
enableKeyEvents: true,
listeners: {
@ -1879,7 +1879,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{
xtype: 'textfield',
fieldLabel: '委托编号',
fieldLabel: '工作号',
name: 'BillNo',
enableKeyEvents: true,
listeners: {

Write Preview
Loading…
Cancel
Save