hanxuntao 3 months ago
parent efe099f7dc
commit c6115cabf2

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

@ -2417,7 +2417,7 @@ SPOT spot@mail.myshipping.net
head.INVAMOUNT = head.INVAMOUNT * -1;
head.INVOICEPDFURL = "";
head.INVOICEINFOURL = "";
head.OTCURRAMOUNT = head.OTCURRAMOUNT * -1;
head.DbOperationType = DbOperationType.DbotIns;
head.ModelUIStatus = "I";
head.BILLSTATUS = 1;
@ -2452,7 +2452,7 @@ SPOT spot@mail.myshipping.net
redhead.DbOperationType = DbOperationType.DbotIns;
redhead.ModelUIStatus = "I";
redhead.BILLSTATUS = 1;
redhead.OTCURRAMOUNT = head.OTCURRAMOUNT * -1;
foreach (var detail in detailList)
{
@ -2481,7 +2481,7 @@ SPOT spot@mail.myshipping.net
redhead.DbOperationType = DbOperationType.DbotIns;
redhead.ModelUIStatus = "I";
redhead.BILLSTATUS = 1;
redhead.OTCURRAMOUNT = redhead.OTCURRAMOUNT * -1;
foreach (var detail in detailList)
{

@ -754,6 +754,12 @@ namespace DSWeb.Areas.TruckMng.Controllers
var headData = MsRptPcHeadEditDAL.GetHYRDData("GID='" + bsno + "'");
var bodyctnData = JsonConvert.Deserialize<List<MsOpSeaeDetail>>(ctnbody);
var Fenlist = MsRptPcHeadEditDAL.GetHYRDList("t.PGID='" + headData.gId + "' AND t.GID<>'" + headData.gId + "'", "","","","",null);
if (bodyctnData != null && bodyctnData.Count == 1)
{
var jsonRespose2 = new JsonResponse { Success = true, Message = "不需要生成分票!" };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
if (Fenlist!=null&& Fenlist.Count!=0)
{
var jsonRespose2 = new JsonResponse { Success = false, Message = "已生成分票,不允许引入生成!" };
@ -769,8 +775,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
DBResult result = new DBResult();
foreach (var ctn in bodyctnData) {
if (string.IsNullOrEmpty(headData.BillNo))
{
if (headData.BsType == "装箱")
{
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='陆运装箱' ", Convert.ToString(Session["COMPANYID"]));
@ -796,7 +801,7 @@ namespace DSWeb.Areas.TruckMng.Controllers
headData.BillNo = MsSysBillNoSetDAL.GetBillNo(billnoset, bsdate, DateTime.Now.ToString("yyyy-MM")); //获取合同号
}
}
headData.OrgCode = CookieConfig.GetCookie_OrgCode(Request);

@ -1725,12 +1725,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsRptPcHeadEdit
{
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where t.GID<>t.PGID AND " + strCondition);
strSql.Append(" where (t.BLTYPE='派车分票' or t.BLTYPE='派车单票') AND " + strCondition);
}
else
{
//strSql.Append(" where 1=1 " );
strSql.Append(" where t.GID<>t.PGID ");
strSql.Append(" where (t.BLTYPE='派车分票' or t.BLTYPE='派车单票') ");
}

@ -1765,7 +1765,7 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
private string _RowNumber = String.Empty;
private string _OrgCode = "";
private string _BillNo = "*"; //路单号
private string _BillNo = ""; //路单号
private string _PcBillType = "3"; //派车类型
@ -1839,7 +1839,7 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
#region Public Properties
[ModelDB(MDBType = ModelDBOprationType.All, IsPrimary = true)]
[ModelDB]
public string BillNo
{
get { return _BillNo; }
@ -1870,7 +1870,7 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
get { return _timeMark; }
set { _timeMark = value; }
}
[ModelDB]
[ModelDB(MDBType = ModelDBOprationType.All, IsPrimary = true)]
public string gId
{
get { return _gId; }

@ -40,6 +40,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{ name: 'gId', type: 'string' },
{ name: 'PGid', type: 'string' },
{ name: 'BLTYPE', type: 'string' },
{ name: 'ACCDATE', type: 'string' },
{ name: 'RowNumber', type: 'string' },
{ name: 'BillNo', type: 'string' },
{ name: 'ExpDate', type: 'string',},
@ -2751,7 +2752,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
var ONLYMASTER = form.findField('ONLYMASTER').getValue();
if (ONLYMASTER!= "1") {
if (ONLYMASTER== "") {
var fensql = "";
var ISWMS = form.findField('ISWMS').getValue();

@ -39,6 +39,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
{ name: 'gId', type: 'string' },
{ name: 'PGid', type: 'string' },
{ name: 'BLTYPE', type: 'string' },
{ name: 'ACCDATE', type: 'string' },
{ name: 'RowNumber', type: 'string' },
{ name: 'BillNo', type: 'string' },
{ name: 'ExpDate', type: 'string',},
@ -2765,7 +2766,8 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
var ONLYMASTER = form.findField('ONLYMASTER').getValue();
if (ONLYMASTER != "1") {
if (ONLYMASTER == "") {
var fensql = "";
var ISWMS = form.findField('ISWMS').getValue();
if (ISWMS == '1') {
@ -2805,7 +2807,6 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
if (ISCTN == '0') {
sql = sql + getAndConSql(sql, '111', " ISNULL(TruckNo,'')<>'' ");
}
}
//var ISCTN = form.findField('ISCTN').getValue();

@ -2221,11 +2221,11 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
return;
}
basicForm.findField('BillNo').setDisabled(false);
/* basicForm.findField('BillNo').setDisabled(false);*/
var data = basicForm.getValues();
basicForm.findField('BillNo').setDisabled(true);
/* basicForm.findField('BillNo').setDisabled(true);*/
var bodyctndatas = [];
//for (var i = 0; i < this.storeCtnList.getCount(); i += 1) {
// var member = this.storeCtnList.getAt(i);
@ -2285,7 +2285,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
}
if (type == '0') {
this.opStatus = 'edit';
basicForm.findField('BillNo').setDisabled(true);
/* basicForm.findField('BillNo').setDisabled(true);*/
//for (var i = 0; i < this.storeBodyFix.getCount(); i += 1) {
// var member = this.storeBodyFix.getAt(i);
@ -2385,6 +2385,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
var pkgsstr = '';
var tixiangshijian = '';
var fanchangshijian = '';
var ctnnum = 0;
for (var j = 0; j < storeyardctn.getCount(); j += 1) {
var member = storeyardctn.getAt(j);
var WEIGHDATE = member.data.WEIGHDATE;
@ -2405,50 +2406,56 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
var fanchangshijian = member.data.FanChangShiJian;
if (fanchangshijian != '')
fanchangshijian = Ext.util.Format.date(fanchangshijian, 'Y-m-d');
ctnnum = ctnnum + 1;
bodydatas.push(member);
};
var field = _thisPc.formEdit.getForm().findField('ContainerNo');
field.setValue(cntrnostr);
var field = _thisPc.formEdit.getForm().findField('SealNo');
field.setValue(sealnostr);
//var field = _thisPc.formEdit.getForm().findField('ContainerQty');
//field.setValue(ctnnum);
var field = _thisPc.formEdit.getForm().findField('ContainerNoSe');
if (field.getValue()=='') field.setValue(pkgsstr);
//var field = _thisPc.formEdit.getForm().findField('ContainerNoSe');
//if (field.getValue()=='') field.setValue(pkgsstr);
var field = _thisPc.formEdit.getForm().findField('ArriveDate');
field.setValue(tixiangshijian);
var field = _thisPc.formEdit.getForm().findField('ReturnDate');
field.setValue(fanchangshijian);
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
scope: this,
params: {
bsno: BSNO,
ctnbody: jsonBody
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
if (ctnnum != 1) {
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
scope: this,
params: {
bsno: BSNO,
ctnbody: jsonBody
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
});
}
//
//

@ -2854,12 +2854,12 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
return;
}
basicForm.findField('BillNo').setDisabled(false);
/* basicForm.findField('BillNo').setDisabled(false);*/
var data = basicForm.getValues();
data.BsType = '装箱';
basicForm.findField('BillNo').setDisabled(true);
/* basicForm.findField('BillNo').setDisabled(true);*/
var bodyctndatas = [];
//for (var i = 0; i < this.storeCtnList.getCount(); i += 1) {
// var member = this.storeCtnList.getAt(i);
@ -2937,7 +2937,7 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
}
if (type == '0') {
this.opStatus = 'edit';
basicForm.findField('BillNo').setDisabled(true);
/* basicForm.findField('BillNo').setDisabled(true);*/
//for (var i = 0; i < this.storeBodyFix.getCount(); i += 1) {
// var member = this.storeBodyFix.getAt(i);
@ -3471,26 +3471,26 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
}
if (member.data.PKGS != 0) {
memberbody.set("PKGS", member.data.PKGS);
}
//if (member.data.PKGS != 0) {
// memberbody.set("PKGS", member.data.PKGS);
//}
if (member.data.KGS != 0) {
memberbody.set("KGS", member.data.KGS);
}
//if (member.data.KGS != 0) {
// memberbody.set("KGS", member.data.KGS);
//}
if (member.data.CBM != 0) {
memberbody.set("CBM", member.data.CBM);
}
//if (member.data.CBM != 0) {
// memberbody.set("CBM", member.data.CBM);
//}
if (member.data.TAREWEIGHT != 0) {
memberbody.set("TAREWEIGHT", member.data.TAREWEIGHT);
}
//if (member.data.TAREWEIGHT != 0) {
// memberbody.set("TAREWEIGHT", member.data.TAREWEIGHT);
//}
if (member.data.KGS != 0 && member.data.TAREWEIGHT != 0) {
memberbody.set("WEIGHKGS", _WEIGHKGS);
memberbody.set("TTLWEIGHT", _WEIGHKGS);
}
//if (member.data.KGS != 0 && member.data.TAREWEIGHT != 0) {
// memberbody.set("WEIGHKGS", _WEIGHKGS);
// memberbody.set("TTLWEIGHT", _WEIGHKGS);
//}
memberbody.commit();
}
@ -3519,14 +3519,14 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
CTNNUM: 1,
CNTRNO: member.data.CNTRNO.trim(),
SEALNO: member.data.SEALNO.trim(),
PKGS: member.data.PKGS,
PKGS: 0,
KINDPKGS: addKINDPKGS,
KGS: member.data.KGS,
TAREWEIGHT: member.data.TAREWEIGHT,
CBM: member.data.CBM,
KGS:0 ,
TAREWEIGHT:0,
CBM: 0,
WEIGHTYPE: "累加",
TTLWEIGHT: _WEIGHKGS,
WEIGHKGS: _WEIGHKGS,
TTLWEIGHT:0,
WEIGHKGS:0,
WEIGHATTN: '',
WEIGHTEL: '',
WEIGHSIGN: '',
@ -3579,40 +3579,41 @@ Ext.extend(DsTruck.MsPcHYRDEdit, Ext.Panel, {
field.setValue(cntrnostr);
var field = _thisPc.formEdit.getForm().findField('SealNo');
field.setValue(sealnostr);
var field = _thisPc.formEdit.getForm().findField('ContainerNoSe');
if (field.getValue() == '') field.setValue(pkgsstr);
var field = _thisPc.formEdit.getForm().findField('ContainerQty');
field.setValue(ctnnum);
//var field = _thisPc.formEdit.getForm().findField('ContainerNoSe');
//if (field.getValue() == '') field.setValue(pkgsstr);
//var field = _thisPc.formEdit.getForm().findField('ContainerQty');
//field.setValue(ctnnum);
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
scope: this,
params: {
bsno: BSNO,
ctnbody: jsonBody
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
if (ctnnum != 1) {
var jsonBody = ConvertRecordsToJsonAll(bodydatas);
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/TruckMng/PcHeadEdit_WFSD/CreateHYRDFen',
scope: this,
params: {
bsno: BSNO,
ctnbody: jsonBody
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
});
}
//
Ext.Msg.hide();

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Loading…
Cancel
Save