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

'20221117监管车业务、未完成'

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent ce1f4bd06a
commit 78f759bcf6
6 changed files with 1208 additions and 1035 deletions
Show Stats Download Patch File Download Diff File

15
DSWeb/Areas/MvcShipping/Controllers/MsOp_SuperVision_TruckController.cs
Unescape Escape View File

@ -188,6 +188,21 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
public ContentResult GetBodyList(string BSNO)
{
var count = 0;
var condition = " BSNO='" + BSNO + "'";
var dataList = MsOp_SuperVision_TruckDAL.GetBodyList(condition);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList.ToList() });
return new ContentResult() { Content = json };
}
}
}

46
DSWeb/Areas/MvcShipping/DAL/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckDAL.cs
Unescape Escape View File

@ -75,19 +75,20 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
strSql.Append(" * from OP_SuperVision_Truck ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where 1=1 AND " + strCondition + " )");
strSql.Append(" where 1=1 AND " + strCondition + "");
}
else
{
strSql.Append(" where 1=1 ");
}
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit));
strSql.Append(@")as t ");
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit));
count = getTotalCount(strCondition, USERID);
return SetData(strSql );
@ -96,18 +97,18 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
public static int getTotalCount(string strCondition, string userid)
{
var rangstr = OP_SuperVision_Truck_md.GetRangeCondition(userid);
if (!string.IsNullOrEmpty(rangstr))
{
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstr;
}
else
{
strCondition = rangstr;
}
}
//var rangstr = OP_SuperVision_Truck_md.GetRangeCondition(userid);
//if (!string.IsNullOrEmpty(rangstr))
//{
// if (!string.IsNullOrEmpty(strCondition))
// {
// strCondition = strCondition + " and " + rangstr;
// }
// else
// {
// strCondition = rangstr;
// }
//}
StringBuilder strSql = new StringBuilder();
strSql.Append("select count(*) ");
strSql.Append(" from OP_SuperVision_Truck ");
@ -115,7 +116,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where 1=1 AND " + strCondition + " )");
strSql.Append(" where 1=1 and " + strCondition + " ");
}
else
{
@ -185,6 +186,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
result.BILLTYPE = "主单";
result.TRANSPORTTYPE = "普通业务";
result.FEEFRT = "PP";
return result;
}
@ -203,13 +205,13 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
// result.SetErrorInfo("发车日期必填");
//}
var _count = BasicDataRefDAL.GetExist("OP_SuperVision_Truck", $" headData<>'{headData.GID}' and isnull(MBLNO,'')<>'' and isnull(MBLNO,'')='{headData.MBLNO}' ");
var _count = BasicDataRefDAL.GetExist("OP_SuperVision_Truck", $" GID<>'{headData.GID}' and isnull(MBLNO,'')<>'' and isnull(MBLNO,'')='{headData.MBLNO}' ");
if (_count > 0)
{
result.SetErrorInfo("主单号不允许重复");
}
_count = BasicDataRefDAL.GetExist("OP_SuperVision_Truck", $" headData<>'{headData.GID}' and isnull(HBLNO,'')<>'' and isnull(HBLNO,'')='{headData.HBLNO}' ");
_count = BasicDataRefDAL.GetExist("OP_SuperVision_Truck", $" GID<>'{headData.GID}' and isnull(HBLNO,'')<>'' and isnull(HBLNO,'')='{headData.HBLNO}' ");
if (_count > 0)
{
result.SetErrorInfo("分单号不允许重复");
@ -383,9 +385,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
OP_SuperVision_Truck_md data = new OP_SuperVision_Truck_md();
#region Set DB data to Object
data.GID = Convert.ToString(reader["GID"]);
data.CUSTNO = Convert.ToString(reader["CUSTNO"]);
data.MASTERNO = Convert.ToString(reader["MASTERNO"]);
data.BILLTYPE = Convert.ToString(reader["BILLTYPE"]);
data.CUSTNO = Convert.ToString(reader["CUSTNO"]);
data.ACCDATE = Convert.ToString(reader["ACCDATE"]);
data.BSSTATUS = Convert.ToBoolean(reader["BSSTATUS"]);
data.FEESTATUS = Convert.ToBoolean(reader["FEESTATUS"]);
data.TRANSPORTTYPE = Convert.ToString(reader["TRANSPORTTYPE"]);
data.FEEFRT = Convert.ToString(reader["FEEFRT"]);
data.CreatorID = Convert.ToString(reader["CreatorID"]);
data.CreateTime = Convert.ToDateTime(reader["CreateTime"]);
data.Creator = Convert.ToString(reader["Creator"]);
@ -398,6 +405,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpOtherDAL
data.HBLNO = Convert.ToString(reader["HBLNO"]);
data.WBLNO = Convert.ToString(reader["WBLNO"]);
data.CUSTOMERNAME = Convert.ToString(reader["CUSTOMERNAME"]);
data.OPERATOR = Convert.ToString(reader["OPERATOR"]);
data.TRANSFERCOMPANY = Convert.ToString(reader["TRANSFERCOMPANY"]);
data.PKGS = Convert.ToDecimal(reader["PKGS"]);
data.KGS = Convert.ToDecimal(reader["KGS"]);

9
DSWeb/Areas/MvcShipping/Models/MsOp_SuperVision_Truck/MsOp_SuperVision_Truck.cs
Unescape Escape View File

@ -31,6 +31,9 @@ namespace DSWeb.MvcShipping.Models.MsOp_SuperVision_Truck
[ModelDB]
public string TRANSPORTTYPE { get; set; }
[ModelDB]
public string FEEFRT { get; set; }
[ModelDB]
public string CreatorID { get; set; }
[ModelDB]
@ -55,6 +58,12 @@ namespace DSWeb.MvcShipping.Models.MsOp_SuperVision_Truck
public string WBLNO { get; set; }
[ModelDB]
public string CUSTOMERNAME { get; set; }
/// <summary>
/// 客户联系人 源操作
/// </summary>
[ModelDB]
public string OPERATOR { get; set; }
[ModelDB]
public string TRANSFERCOMPANY { get; set; }
[ModelDB]

1075
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckEdit.js
View File

File diff suppressed because it is too large Load Diff

1034
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckIndex.js
View File

File diff suppressed because it is too large Load Diff

64
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_SuperVision_Truck/MsOp_SuperVision_TruckModel.js
Unescape Escape View File

@ -101,7 +101,6 @@
]
});
Ext.define('MsCodeOpService', {
extend: 'Ext.data.Model',
idProperty: 'OS_ID',
@ -142,4 +141,67 @@ Ext.define('OpSeaeShipper', {
{ name: 'DELIVERADDRESS', type: 'string' },
{ name: 'ISPUBLIC', type: 'bool' }
]
});
Ext.define('MsOpSuperVisionTruckModel', {
extend: 'Ext.data.Model',
idProperty: 'GID',
fields: [
{ name: 'GID', type: 'string' },
{ name: 'MASTERNO', type: 'string' },
{ name: 'BILLTYPE', type: 'string' },
{ name: 'CUSTNO', type: 'string' },
{ name: 'ACCDATE', type: 'string' },
{ name: 'BSSTATUS', type: 'string' },
{ name: 'FEESTATUS', type: 'string' },
{ name: 'TRANSPORTTYPE', type: 'string' },
{ name: 'FEEFRT', type: 'string' },
{ name: 'CreatorID', type: 'string' },
{ name: 'CreateTime', type: 'datetime' },
{ name: 'Creator', type: 'string' },
{ name: 'CORPID', type: 'string' },
{ name: 'DEPTID', type: 'string' },
{ name: 'SALECORPID', type: 'string' },
{ name: 'SALE', type: 'string' },
{ name: 'OP', type: 'string' },
{ name: 'MBLNO', type: 'string' },
{ name: 'HBLNO', type: 'string' },
{ name: 'WBLNO', type: 'string' },
{ name: 'CUSTOMERNAME', type: 'string' },
{ name: 'OPERATOR', type: 'string' },
{ name: 'TRANSFERCOMPANY', type: 'string' },
{ name: 'PKGS', type: 'number' },
{ name: 'KGS', type: 'number' },
{ name: 'CBM', type: 'number' },
{ name: 'STORAGEUNITCOUNT', type: 'number' },
{ name: 'NEEDSEND', type: 'string' },
{ name: 'LOADPORT', type: 'string' },
{ name: 'DESTINATION', type: 'string' },
{ name: 'ETD', type: 'date' },
{ name: 'TRUCKNO', type: 'string' },
{ name: 'SJDH', type: 'string' },
{ name: 'REMARK', type: 'string' }
]
});
Ext.define('MsOpSuperVisionTruckDetailModel', {
extend: 'Ext.data.Model',
idProperty: 'GID',
fields: [
{ name: 'GID', type: 'string' },
{ name: 'BSNO', type: 'string' },
{ name: 'ROWNUM', type: 'number' },
{ name: 'TRUCKNO', type: 'string' },
{ name: 'CUSTOMERNAME', type: 'string' },
{ name: 'PKGS', type: 'number' },
{ name: 'KGS', type: 'number' },
{ name: 'CBM', type: 'number' },
{ name: 'RECEIVER', type: 'string' },
{ name: 'RECEIVER_TEL', type: 'string' },
{ name: 'HBLNO', type: 'datetime' },
{ name: 'DESTINATION', type: 'string' },
{ name: 'KINGPKGS', type: 'string' },
{ name: 'REMARK', type: 'string' }
]
});
Write Preview
Loading…
Cancel
Save