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

Merge branch 'dev' of http://60.209.125.238:20010/dengyu/DS7 into dev

Browse Source
dev
dengyu 4 weeks ago
parent e91aa3a095 75cf6f1893
commit 34f9774d8a
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File

20
DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
Unescape Escape View File

@ -842,12 +842,12 @@ namespace DSWeb.Areas.TruckMng.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
if (Fenlist!=null&& Fenlist.Count!=0)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "已生成分票,不允许引入生成！" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
//if (Fenlist!=null&& Fenlist.Count!=0)
//{
// var jsonRespose2 = new JsonResponse { Success = false, Message = "已生成分票,不允许引入生成！" };
// return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
//}
if (bodyctnData == null|| bodyctnData.Count == 0)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "不存在要生成分票的数据！" };
@ -902,15 +902,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
headData.ACCDATE = DateTime.Now.ToString("yyyy-MM");
headData.LrDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//if (!string.IsNullOrEmpty(headData.LrDate))
//{
// headData.LrDate = headData.LrDate.Substring(0, 10);
//}
//else
//{
// var currentTime = System.DateTime.Now;
// headData.LrDate = currentTime.ToString("d");
//}
var BSNO = headData.gId;

18
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcHYRDEdit.js
Unescape Escape View File

@ -54,6 +54,8 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
{ name: 'EndPortDate', type: 'string'},
{ name: 'EtDate', type: 'string' },
{ name: 'VoyVeg', type: 'string' },
{ name: 'VoyVegSe', type: 'string' },
{ name: 'EtDateSe', type: 'string' },
{ name: 'ArriveDate', type: 'string' },
{ name: 'ReturnDate', type: 'string' },
{ name: 'CustomerName', type: 'string' },
@ -1859,7 +1861,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));
this.formEdit.getForm().findField('EtDate').setValue(this.editRecord.get('EtDate'));
this.formEdit.getForm().findField('MblNoSe').setValue(this.editRecord.get('MblNoSe'));
this.formEdit.getForm().findField('ContainerQty').setValue(this.editRecord.get('ContainerQty'));
this.formEdit.getForm().findField('ContainerQty').setValue(1);
this.formEdit.getForm().findField('GoodsName').setValue(this.editRecord.get('GoodsName'));
this.formEdit.getForm().findField('ContainerNoSe').setValue(this.editRecord.get('ContainerNoSe'));
this.formEdit.getForm().findField('ContainerNo').setValue(this.editRecord.get('ContainerNo'));
@ -1885,6 +1887,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DstAreaSe').setValue(this.editRecord.get('DstAreaSe'));
/* this.formEdit.getForm().findField('SealNoSe').setValue(this.editRecord.get('SealNoSe'));*/
this.formEdit.getForm().findField('ContainerTypeSe').setValue(this.editRecord.get('ContainerTypeSe'));
this.formEdit.getForm().findField('ContainerType').setValue(this.editRecord.get('ContainerType'));
this.formEdit.getForm().findField('Remark').setValue(this.editRecord.get('Remark'));
this.formEdit.getForm().findField('FactoryAddrSe').setValue(this.editRecord.get('FactoryAddrSe'));
}
@ -2060,7 +2063,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));
this.formEdit.getForm().findField('EtDate').setValue(this.editRecord.get('EtDate'));
this.formEdit.getForm().findField('MblNoSe').setValue(this.editRecord.get('MblNoSe'));
this.formEdit.getForm().findField('ContainerQty').setValue(this.editRecord.get('ContainerQty'));
this.formEdit.getForm().findField('ContainerQty').setValue(1);
this.formEdit.getForm().findField('GoodsName').setValue(this.editRecord.get('GoodsName'));
this.formEdit.getForm().findField('ContainerNoSe').setValue(this.editRecord.get('ContainerNoSe'));
this.formEdit.getForm().findField('ContainerNo').setValue(this.editRecord.get('ContainerNo'));
@ -2086,6 +2089,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('DstAreaSe').setValue(this.editRecord.get('DstAreaSe'));
/* this.formEdit.getForm().findField('SealNoSe').setValue(this.editRecord.get('SealNoSe'));*/
this.formEdit.getForm().findField('ContainerTypeSe').setValue(this.editRecord.get('ContainerTypeSe'));
this.formEdit.getForm().findField('ContainerType').setValue(this.editRecord.get('ContainerType'));
this.formEdit.getForm().findField('Remark').setValue(this.editRecord.get('Remark'));
this.formEdit.getForm().findField('FactoryAddrSe').setValue(this.editRecord.get('FactoryAddrSe'));
}
@ -2538,12 +2542,12 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d');
member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN;
if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0';
if (cntrnostr!=''&&cntrnostr.indexOf(member.data.CNTRNO)>0)
if (cntrnostr == '' ||cntrnostr.indexOf(member.data.CNTRNO)<0) {
bodydatas.push(member);
cntrnostr = cntrnostr + ' ' + member.data.CNTRNO;
sealnostr = sealnostr + ' ' + member.data.SEALNO;
pkgsstr = pkgsstr + ' ' + member.data.PKGS + '/' + member.data.KGS + '/' + member.data.CBM;
cntrnostr = cntrnostr + ' ' + member.data.CNTRNO;
sealnostr = sealnostr + ' ' + member.data.SEALNO;
pkgsstr = pkgsstr + ' ' + member.data.PKGS + '/' + member.data.KGS + '/' + member.data.CBM;
}
var tixiangshijian = member.data.TiXiangShiJian;
if (tixiangshijian != '')
tixiangshijian = Ext.util.Format.date(tixiangshijian, 'Y-m-d');

4
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcZXEdit.js
Unescape Escape View File

@ -55,6 +55,8 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
{ name: 'EndPortDate', type: 'string'},
{ name: 'EtDate', type: 'string' },
{ name: 'VoyVeg', type: 'string' },
{ name: 'VoyVegSe', type: 'string' },
{ name: 'EtDateSe', type: 'string' },
{ name: 'ArriveDate', type: 'string' },
{ name: 'ReturnDate', type: 'string' },
{ name: 'CustomerName', type: 'string' },
@ -2437,7 +2439,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
this.formEdit.getForm().findField('EndPortDate').setValue(this.editRecord.get('EndPortDate'));
this.formEdit.getForm().findField('EtDate').setValue(this.editRecord.get('EtDate'));
this.formEdit.getForm().findField('MblNoSe').setValue(this.editRecord.get('MblNoSe'));
this.formEdit.getForm().findField('ContainerQty').setValue(this.editRecord.get('ContainerQty'));
this.formEdit.getForm().findField('ContainerQty').setValue(1);
this.formEdit.getForm().findField('GoodsName').setValue(this.editRecord.get('GoodsName'));
this.formEdit.getForm().findField('ContainerNoSe').setValue(this.editRecord.get('ContainerNoSe'));
this.formEdit.getForm().findField('ContainerNo').setValue(this.editRecord.get('ContainerNo'));

Write Preview
Loading…
Cancel
Save