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 1 month ago
parent 320fe626f0 8a7ccb6ef6
commit f09f64917a
10 changed files with 79 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
Unescape Escape View File

@ -25407,7 +25407,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
sortint = sortint + 1; sortint = sortint + 1;
} }
CwVouitemsEntities = tmpCwVouitemsEntities.OrderByDescending(x => x.TMPGID).ThenBy(p => p.ITEMNO).ToList(); CwVouitemsEntities = tmpCwVouitemsEntities.OrderBy(x => x.TMPGID).ThenBy(p => p.ITEMNO).ToList();
} }
else { else {
foreach (var vouitem in CwVouitemsEntities) foreach (var vouitem in CwVouitemsEntities)
@ -25678,7 +25678,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
result = modb.Save(MsCwVouchersGl); result = modb.Save(MsCwVouchersGl);
if (result.Success == true) if (result.Success == true)
{ {
var NewCwVouitemsEntities=CwVouitemsEntities.OrderByDescending(x=>x.TMPBILLNO).ThenBy(x=>x.ITEMNO); var NewCwVouitemsEntities=CwVouitemsEntities.OrderBy(x=>x.TMPBILLNO).ThenBy(x=>x.ITEMNO);
int n = 1; int n = 1;
foreach (var enumValue in NewCwVouitemsEntities) foreach (var enumValue in NewCwVouitemsEntities)

1
DSWeb/Areas/MvcShipping/Views/Ocr/SelectRegionAir.aspx
Unescape Escape View File

@ -218,6 +218,7 @@
|| name == "ENTERPID" || name == "ENTERPID"
|| name == "OPERATORFAX" || name == "OPERATORFAX"
|| name == "KGS" || name == "KGS"
|| name == "PKGS"
|| name == "CBM" || name == "CBM"
|| name == "VOYNO"|| name == "ETD"|| name == "YARD") { || name == "VOYNO"|| name == "ETD"|| name == "YARD") {
tag = "input"; tag = "input";

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceEdit.js
Unescape Escape View File

@ -2653,14 +2653,14 @@ Ext.extend(Shipping.MsOpPriceEdit, Ext.Panel, {
Print: function () { Print: function () {
var basicForm = this.formHead.getForm(); var basicForm = this.formHead.getForm();
var billNo = basicForm.findField('BSNO').value; var billNo = basicForm.findField('GID').value;
if (billNo == '*' || billNo == '') { if (billNo == '*' || billNo == '') {
Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
return; return;
} }
var printType = 'MSOPOHTER'; var printType = 'MSOPPRICE';
var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_other WHERE BSNO = '" + billNo + "'"; var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_price WHERE GID = '" + billNo + "'";
var sql2 = ""; var sql2 = "";
var sql3 = ""; var sql3 = "";
var sql4 = ""; var sql4 = "";

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpPrice/MsOpPriceSellEdit.js
Unescape Escape View File

@ -2759,14 +2759,14 @@ Ext.extend(Shipping.MsOpPriceSellEdit, Ext.Panel, {
Print: function () { Print: function () {
var basicForm = this.formHead.getForm(); var basicForm = this.formHead.getForm();
var billNo = basicForm.findField('BSNO').value; var billNo = basicForm.findField('GID').value;
if (billNo == '*' || billNo == '') { if (billNo == '*' || billNo == '') {
Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK }); Ext.Msg.show({ title: '错误', msg: '单据还没有保存，请保存后再打印', icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
return; return;
} }
var printType = 'MSOPOHTER'; var printType = 'MSOPPRICE';
var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_other WHERE BSNO = '" + billNo + "'"; var sql1 = "SET LANGUAGE 'us_english' SELECT * FROM op_price WHERE GID = '" + billNo + "'";
var sql2 = ""; var sql2 = "";
var sql3 = ""; var sql3 = "";
var sql4 = ""; var sql4 = "";

8
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/SeaeFee.js
Unescape Escape View File

@ -78,6 +78,7 @@ Ext.extend(Shipping.SeaeFee, Ext.Panel, {
}, },
{ {
fieldLabel: Zi.LAN.CNTRTOTAL3, //'箱型箱量', fieldLabel: Zi.LAN.CNTRTOTAL3, //'箱型箱量',
flex: 0.5,
readOnly: true, readOnly: true,
name: 'CNTRTOTAL' name: 'CNTRTOTAL'
}, },
@ -108,6 +109,13 @@ Ext.extend(Shipping.SeaeFee, Ext.Panel, {
labelWidth: 45, labelWidth: 45,
readOnly: true, readOnly: true,
name: 'INVNO' name: 'INVNO'
},
{
fieldLabel: Zi.LAN.KGSCBM, //'毛重',
flex: 0.5,
labelWidth: 45,
readOnly: true,
name: 'INVNO'
} }
] ]
}, },

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js
Unescape Escape View File

@ -956,4 +956,4 @@ Zi.LAN.PKGTYPE = "包件种类";
Zi.LAN.FACTORY = "生产企业"; Zi.LAN.FACTORY = "生产企业";
Zi.LAN.GXWTHM = "更新委托货描"; Zi.LAN.GXWTHM = "更新委托货描";
Zi.LAN.DGTRUCKER = "危险品车队"; Zi.LAN.DGTRUCKER = "危险品车队";
Zi.LAN.KGSCBM = "重抛比";

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

@ -857,6 +857,9 @@ namespace DSWeb.Areas.TruckMng.Controllers
DBResult result = new DBResult(); DBResult result = new DBResult();
foreach (var ctn in bodyctnData) { foreach (var ctn in bodyctnData) {
var fen = Fenlist.Find(x => x.ContainerNo == ctn.CNTRNO);
if (fen == null)
{
if (headData.BsType == "装箱") if (headData.BsType == "装箱")
{ {
@ -885,34 +888,35 @@ namespace DSWeb.Areas.TruckMng.Controllers
} }
headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request); headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request);
headData.DbOperationType = DbOperationType.DbotIns; headData.DbOperationType = DbOperationType.DbotIns;
headData.TRANSSTATUS = "新建"; headData.TRANSSTATUS = "新建";
headData.gId = "PC" + Guid.NewGuid().ToString("N").ToUpper(); headData.gId = "PC" + Guid.NewGuid().ToString("N").ToUpper();
headData.PGid = PGID; headData.PGid = PGID;
headData.SealNo = ctn.SEALNO; headData.SealNo = ctn.SEALNO;
headData.ContainerNo = ctn.CNTRNO; headData.ContainerNo = ctn.CNTRNO;
headData.ContainerType = ctn.CTNALL; headData.ContainerType = ctn.CTNALL;
headData.ContainerQty = "1"; headData.ContainerQty = "1";
headData.BLTYPE = "派车分票"; headData.BLTYPE = "派车分票";
headData.ACCDATE = DateTime.Now.ToString("yyyy-MM"); headData.ACCDATE = DateTime.Now.ToString("yyyy-MM");
headData.LrDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); headData.LrDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//if (!string.IsNullOrEmpty(headData.LrDate)) //if (!string.IsNullOrEmpty(headData.LrDate))
//{ //{
// headData.LrDate = headData.LrDate.Substring(0, 10); // headData.LrDate = headData.LrDate.Substring(0, 10);
//} //}
//else //else
//{ //{
// var currentTime = System.DateTime.Now; // var currentTime = System.DateTime.Now;
// headData.LrDate = currentTime.ToString("d"); // headData.LrDate = currentTime.ToString("d");
//} //}
var BSNO = headData.gId; var BSNO = headData.gId;
var modb = new ModelObjectDB(); var modb = new ModelObjectDB();
result = modb.Save(headData); result = modb.Save(headData);
}
} }

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

@ -1839,6 +1839,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
var PGid = this.formEdit.getForm().findField('PGid'); var PGid = this.formEdit.getForm().findField('PGid');
PGid.setValue(this.selectPGID); PGid.setValue(this.selectPGID);
if (this.editRecord != NaN && this.editRecord != null) { if (this.editRecord != NaN && this.editRecord != null) {
this.formEdit.getForm().findField('CUSTNO').setValue(this.editRecord.get('CUSTNO'));
this.formEdit.getForm().findField('TruckSpec').setValue(this.editRecord.get('TruckSpec'));
this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName')); this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName'));
this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName')); this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName'));
this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName')); this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName'));
@ -2479,12 +2482,14 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
return; return;
} }
var ContainerNo = _thisPc.formEdit.getForm().findField('ContainerNo').getValue(); var cntrnostr = '';
if (ContainerNo != '') {
Ext.Msg.show({ title: '警告', msg: '已存在箱号,不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
return;
} var cntrnostr = _thisPc.formEdit.getForm().findField('ContainerNo').getValue();
//if (ContainerNo != '') {
// Ext.Msg.show({ title: '警告', msg: '已存在箱号,不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
// return;
//}
@ -2516,12 +2521,12 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
var sVESSEL = ""; var sVESSEL = "";
var sVOYNO = ""; var sVOYNO = "";
var bodydatas = []; var bodydatas = [];
var cntrnostr = '';
var sealnostr = ''; var sealnostr = '';
var pkgsstr = ''; var pkgsstr = '';
var tixiangshijian = ''; var tixiangshijian = '';
var fanchangshijian = ''; var fanchangshijian = '';
var ctnnum = 0; var ctnnum = 0;
var createfen = 0;
for (var j = 0; j < storeyardctn.getCount(); j += 1) { for (var j = 0; j < storeyardctn.getCount(); j += 1) {
var member = storeyardctn.getAt(j); var member = storeyardctn.getAt(j);
var WEIGHDATE = member.data.WEIGHDATE; var WEIGHDATE = member.data.WEIGHDATE;
@ -2533,6 +2538,9 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d'); TIXIANGSHIJIAN = Ext.util.Format.date(TIXIANGSHIJIAN, 'Y-m-d');
member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN; member.data.TIXIANGSHIJIAN = TIXIANGSHIJIAN;
if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0'; if (member.data.TAREWEIGHT == '') member.data.TAREWEIGHT = '0';
if (cntrnostr!=''&&cntrnostr.indexOf(member.data.CNTRNO)>0)
bodydatas.push(member);
cntrnostr = cntrnostr + ' ' + member.data.CNTRNO; cntrnostr = cntrnostr + ' ' + member.data.CNTRNO;
sealnostr = sealnostr + ' ' + member.data.SEALNO; sealnostr = sealnostr + ' ' + member.data.SEALNO;
pkgsstr = pkgsstr + ' ' + member.data.PKGS + '/' + member.data.KGS + '/' + member.data.CBM; pkgsstr = pkgsstr + ' ' + member.data.PKGS + '/' + member.data.KGS + '/' + member.data.CBM;
@ -2543,7 +2551,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
if (fanchangshijian != '') if (fanchangshijian != '')
fanchangshijian = Ext.util.Format.date(fanchangshijian, 'Y-m-d'); fanchangshijian = Ext.util.Format.date(fanchangshijian, 'Y-m-d');
ctnnum = ctnnum + 1; ctnnum = ctnnum + 1;
bodydatas.push(member);
}; };
var field = _thisPc.formEdit.getForm().findField('ContainerNo'); var field = _thisPc.formEdit.getForm().findField('ContainerNo');
field.setValue(cntrnostr); field.setValue(cntrnostr);
@ -2563,7 +2571,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
if (field.getValue == "") if (field.getValue == "")
field.setValue(fanchangshijian); field.setValue(fanchangshijian);
if (ctnnum != 1) { if ((ctnnum != 1) && (bodydatas.length != 0)) {
var jsonBody = ConvertRecordsToJsonAll(bodydatas); var jsonBody = ConvertRecordsToJsonAll(bodydatas);
Ext.Msg.wait('正在保存数据, 请稍侯..'); Ext.Msg.wait('正在保存数据, 请稍侯..');

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

@ -2418,6 +2418,8 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
var PGid = this.formEdit.getForm().findField('PGid'); var PGid = this.formEdit.getForm().findField('PGid');
PGid.setValue(this.selectPGID); PGid.setValue(this.selectPGID);
if (this.editRecord != NaN && this.editRecord != null) { if (this.editRecord != NaN && this.editRecord != null) {
this.formEdit.getForm().findField('CUSTNO').setValue(this.editRecord.get('CUSTNO'));
this.formEdit.getForm().findField('TruckSpec').setValue(this.editRecord.get('TruckSpec'));
this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName')); this.formEdit.getForm().findField('CustomerName').setValue(this.editRecord.get('CustomerName'));
this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName')); this.formEdit.getForm().findField('SalesName').setValue(this.editRecord.get('SalesName'));
this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName')); this.formEdit.getForm().findField('DdName').setValue(this.editRecord.get('DdName'));
@ -3448,18 +3450,18 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!' Ext.Msg.show({ title: '警告', msg: '主提单号不能为空!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'主提单号不能为空!'
return; return;
} }
if (this.storeBodyList.getCount() != 0) { //if (this.storeBodyList.getCount() != 0) {
Ext.Msg.show({ title: '警告', msg: '已存在集装箱信息不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!' // Ext.Msg.show({ title: '警告', msg: '已存在集装箱信息不允许引入!', icon: Ext.Msg.WARNING, buttons: Ext.Msg.OK });//'场站不能为空!'
return; // return;
//Ext.MessageBox.confirm('提示', '已存在集装箱信息确认要引入吗？', // //Ext.MessageBox.confirm('提示', '已存在集装箱信息确认要引入吗？',
// function (btn) { // // function (btn) {
// if (btn != 'yes') { // // if (btn != 'yes') {
// return; // // return;
// } // // }
// }); // // });
} //}
var BSNO = this.formEdit.getForm().findField('gId').getValue(); var BSNO = this.formEdit.getForm().findField('gId').getValue();

2
JobAutoCreateFee/JobBankData.cs
Unescape Escape View File

@ -38,7 +38,7 @@ namespace JobCreateFee
var JsonGetBankData = new GetBankData(); var JsonGetBankData = new GetBankData();
JsonGetBankData.AccountName = companyName; JsonGetBankData.AccountName = companyName;
JsonGetBankData.AccountKey = CustId; JsonGetBankData.AccountKey = CustId;
JsonGetBankData.BeginDate = DateTime.Now.AddDays(-1).ToString("yyyyMMdd"); JsonGetBankData.BeginDate = DateTime.Now.AddDays(-2).ToString("yyyyMMdd");
JsonGetBankData.EndDate = DateTime.Now.ToString("yyyyMMdd"); JsonGetBankData.EndDate = DateTime.Now.ToString("yyyyMMdd");
var PCNO = DateTime.Now.ToString("yyyyMMddhhmmss"); var PCNO = DateTime.Now.ToString("yyyyMMddhhmmss");

Write Preview
Loading…
Cancel
Save