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

Merge branch 'DS7_JingHan' of http://60.209.125.238:13080/dengyu/DS7 into DS7_JingHan

Browse Source
DS7_JingHan
ddlucky 2 years ago
parent 546411a13b 076e410175
commit 715c890b07
11 changed files with 64 additions and 23 deletions
Show Stats Download Patch File Download Diff File

6
DSWeb/Areas/MvcShipping/Controllers/MsOpAireController.cs
Unescape Escape View File

@ -590,6 +590,12 @@ namespace DSWeb.MvcShipping.Controllers
{
headData.DbOperationType = DbOperationType.DbotDel;
}
if (!string.IsNullOrEmpty(headData.OP) && string.IsNullOrEmpty(headData.SALEDEPT))
{
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", Convert.ToString(Session["COMPANYID"]));
headData.SALEDEPT = OPUSER.DEPTNAME;
}
if (headData.MASTERNO == null || headData.MASTERNO =="") { headData.MASTERNO = headData.BSNO; }
if (headData.ETA == "") headData.ETA = null;

6
DSWeb/Areas/MvcShipping/Controllers/MsOpAiriController.cs
Unescape Escape View File

@ -522,6 +522,12 @@ namespace DSWeb.MvcShipping.Controllers
{
headData.DbOperationType = DbOperationType.DbotDel;
}
if (!string.IsNullOrEmpty(headData.OP) && string.IsNullOrEmpty(headData.SALEDEPT))
{
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", Convert.ToString(Session["COMPANYID"]));
headData.SALEDEPT = OPUSER.DEPTNAME;
}
if (headData.MASTERNO == null || headData.MASTERNO =="") { headData.MASTERNO = headData.BSNO; }
if (headData.ETA == "") headData.ETA = null;

6
DSWeb/Areas/MvcShipping/Controllers/MsOpApplyController.cs
Unescape Escape View File

@ -482,6 +482,12 @@ namespace DSWeb.MvcShipping.Controllers
{
headData.DbOperationType = DbOperationType.DbotDel;
}
if (!string.IsNullOrEmpty(headData.OP) && string.IsNullOrEmpty(headData.SALEDEPT))
{
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", Convert.ToString(Session["COMPANYID"]));
headData.SALEDEPT = OPUSER.DEPTNAME;
}
if (headData.MASTERNO == null) { headData.MASTERNO = headData.BSNO; }
if (headData.CUSTOMDATE == "") headData.CUSTOMDATE = null;
if (headData.CLEARCUSTOMDATE == "") headData.CLEARCUSTOMDATE = null;

6
DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs
Unescape Escape View File

@ -539,6 +539,12 @@ namespace DSWeb.MvcShipping.Controllers
{
headData.DbOperationType = DbOperationType.DbotDel;
}
if (!string.IsNullOrEmpty(headData.OP) && string.IsNullOrEmpty(headData.SALEDEPT))
{
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", Convert.ToString(Session["COMPANYID"]));
headData.SALEDEPT = OPUSER.DEPTNAME;
}
//if (headData.CTNNUM == null) { headData.CTNNUM = 0; }
#region 判断字段长度

6
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaiController.cs
Unescape Escape View File

@ -977,6 +977,12 @@ namespace DSWeb.MvcShipping.Controllers
if (_dmb.BSSOURCE != "") headData.BSSOURCE = _dmb.BSSOURCE;
}
headData.BSSOURCE = headData.BSSOURCE.Trim();
if (!string.IsNullOrEmpty(headData.OP) && string.IsNullOrEmpty(headData.SALEDEPT))
{
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", Convert.ToString(Session["COMPANYID"]));
headData.SALEDEPT = OPUSER.DEPTNAME;
}
if (headData.MASTERNO == null) { headData.MASTERNO = headData.BSNO; }
if (headData.ETA == "") headData.ETA = null;

6
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -1961,6 +1961,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
* */
}
T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
if (!string.IsNullOrEmpty(headData.OP)&& string.IsNullOrEmpty(headData.SALEDEPT)) {
var OPUSER = BasicDataRefDAL.GetUserLinkRef("u.SHOWNAME='" + headData.OP + "'", companyid);
headData.SALEDEPT = OPUSER.DEPTNAME;
}
if (headData.MBLNO != "" && headData.MBLNO != null && headData.BLTYPE != "拼箱分票"&&headData.SALEDEPT!= "市场部")

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

@ -175,8 +175,8 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 0)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
//if (this.SALEORDERDEPTBYOP == 0)
// this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}
@ -200,7 +200,6 @@ Ext.extend(Shipping.MsOpApplyEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 1)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}

28
DSWeb/Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyLSEdit.js
Unescape Escape View File

@ -176,15 +176,15 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
var recs = DsStoreQueryBy(this.storeUserBase, 'USERID', records[0].data.GID);
var SALEDEPT = this.formHead.getForm().findField('SALEDEPT');
if (recs.getCount() > 0) {
var data = recs.getAt(0).data;
SALEDEPT.setValue(data.DEPTNAME);
} else {
SALEDEPT.setValue('');
}
//var recs = DsStoreQueryBy(this.storeUserBase, 'USERID', records[0].data.GID);
//var SALEDEPT = this.formHead.getForm().findField('SALEDEPT');
//if (recs.getCount() > 0) {
// var data = recs.getAt(0).data;
// SALEDEPT.setValue(data.DEPTNAME);
//} else {
// SALEDEPT.setValue('');
//}
}
}
}
@ -203,7 +203,15 @@ Ext.extend(Shipping.MsOpApplyLSEdit, Ext.Panel, {
name: 'OP',
valueField: 'UserName',
displayField: 'CodeAndName',
value: SHOWNAME
value: SHOWNAME,
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}
});
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {

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

@ -97,8 +97,8 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 0)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
//if (this.SALEORDERDEPTBYOP == 0)
// this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}
@ -136,8 +136,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 1)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}

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

@ -97,8 +97,8 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 0)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
//if (this.SALEORDERDEPTBYOP == 0)
// this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}
@ -136,7 +136,6 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 1)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOther_KuaiDiEdit.js
Unescape Escape View File

@ -97,8 +97,8 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 0)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
//if (this.SALEORDERDEPTBYOP == 0)
// this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}
}
@ -136,7 +136,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (this.SALEORDERDEPTBYOP == 1)
//if (this.SALEORDERDEPTBYOP == 1)
this.formHead.getForm().findField('SALEDEPT').setValue(records[0].data.DEPTNAME);
}
}

Write Preview
Loading…
Cancel
Save