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

20241203；pil小窗，消除一些问题。

Browse Source 
同步bc数据算法修改，接收到数据后，如果没有找到业务，也保存这条bc数据，但bsno与此条数据gid相同。获取业务的bc数据时，条件由bsno相同改为bsno或TRANSNO相同。业务中的TRANSNO需手动维护
ShenZhenCHJY
dengyu 2 weeks ago
parent 26777a9de5
commit e7c0adcbe6
6 changed files with 237 additions and 135 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb.Common/DB/Comm.cs
Unescape Escape View File

@ -3560,6 +3560,9 @@ namespace DSWeb.Common.DB
{ {
GID = Guid.NewGuid().ToString(); GID = Guid.NewGuid().ToString();
this.BSNO = BSNO; this.BSNO = BSNO;
if (string.IsNullOrWhiteSpace(this.BSNO)) {
this.BSNO = GID;
}
CREATETIME = DateTime.Now; CREATETIME = DateTime.Now;
USED = false; USED = false;
} }

7
DSWeb/Areas/CommMng/DAL/PubSysDAL.cs
Unescape Escape View File

@ -433,6 +433,13 @@ namespace DSWeb.Areas.CommMng.DAL
//新增业务 //新增业务
//var ctnlist = head.GetCtnList("*"); //var ctnlist = head.GetCtnList("*");
if (head.SyncType == "BC") {
head.SetField(ref newhead);
}
//newhead.BSNO = "topseae" + Guid.NewGuid().ToString(); //newhead.BSNO = "topseae" + Guid.NewGuid().ToString();
//var _r = DSWeb.MvcShipping.DAL.MsOpSeaeDAL.MsOpSeaeDAL.DoSave( //var _r = DSWeb.MvcShipping.DAL.MsOpSeaeDAL.MsOpSeaeDAL.DoSave(

4
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -13692,7 +13692,9 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) }; return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
} }
var dataList = MsOpSeaeDAL.GetSyncBCList(BSNO); var head = MsOpSeaeDAL.GetData(" BSNO = '" + BSNO + "'");
var dataList = MsOpSeaeDAL.GetSyncBCList(head.BSNO,head.TRANSNO);
int count = dataList.Count(); int count = dataList.Count();
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList}); var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList});
return new ContentResult() { Content = json }; return new ContentResult() { Content = json };

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

@ -7876,14 +7876,23 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
static public List<DJY_SYNC_BC_md> GetSyncBCList(string BSNO) static public List<DJY_SYNC_BC_md> GetSyncBCList(string BSNO,string TRANSNO="")
{ {
var cdc = new CommonDataContext(); var cdc = new CommonDataContext();
var result = cdc.DJY_SYNC_BC.Where(x => x.BSNO == BSNO && x.USED==false).ToList(); if (string.IsNullOrWhiteSpace(TRANSNO))
{
var result = cdc.DJY_SYNC_BC.Where(x => (x.BSNO == BSNO ) && x.USED == false).ToList();
return result; return result;
} }
else {
var result = cdc.DJY_SYNC_BC.Where(x => (x.BSNO == BSNO || x.TRANSNO==TRANSNO) && x.USED == false).ToList();
return result;
}
}
} }
@ -9866,7 +9875,8 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
SetHeadField("LANE", OpseaeDjyOrderHead.LANE); SetHeadField("LANE", OpseaeDjyOrderHead.LANE);
SetHeadField("ETD", ((DateTime)OpseaeDjyOrderHead.ETD).ToString("yyyy-MM-dd")); SetHeadField("ETD", ((DateTime)OpseaeDjyOrderHead.ETD).ToString("yyyy-MM-dd"));
SetHeadField("ORDERNO", OpseaeHead.ORDNO);//彩虹的 BC号 。大简云的订单号 //SetHeadField("ORDERNO", OpseaeHead.ORDNO);//彩虹的 BC号 。大简云的订单号
SetHeadField("ORDERNO", OpseaeHead.CUSTNO);//20241203 应衣国豪要求 ，改用东胜业务的CUSTNO
var cdc = new CommonDataContext(); var cdc = new CommonDataContext();

154
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/formDjyOrder_PIL.js
Unescape Escape View File

@ -14,7 +14,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
EditRecord: null, EditRecord: null,
Editdata: null, Editdata: null,
MainEditRecord: null, MainEditRecord: null,
seaeHeadData:null, seaeHeadData: null,
initUIComponents: function () { initUIComponents: function () {
@ -493,11 +493,11 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxCargoid2 = Ext.create('DsExt.ux.RefTableCombox', { this.comboxCargoid2 = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreCargoid, store: this.StoreCargoid,
labelWidth:60, labelWidth: 60,
fieldLabel: "<a><font color='#000000'>货物类型</font></a>", fieldLabel: "<a><font color='#000000'>货物类型</font></a>",
forceSelection: true, forceSelection: true,
allowBlank: true, allowBlank: true,
flex:0.70, flex: 0.70,
//width: 1200, //width: 1200,
name: 'CARGOID', name: 'CARGOID',
valueField: 'EnumValueId', valueField: 'EnumValueId',
@ -585,7 +585,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxPLACERECEIPTID = Ext.create('DsExt.ux.RefTableCombox', { this.comboxPLACERECEIPTID = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: "收货地", //'装货港', fieldLabel: "收货地", //'装货港',
hidden:true, hidden: true,
labelWidth: 60, labelWidth: 60,
store: this.storeCodeLoadport_Order2, store: this.storeCodeLoadport_Order2,
name: 'PLACERECEIPTID', name: 'PLACERECEIPTID',
@ -1065,7 +1065,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxPAYABLEAT = Ext.create('DsExt.ux.RefTableCombox', { this.comboxPAYABLEAT = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.PAYABLEAT, //'到付地点', fieldLabel: Zi.LAN.PAYABLEAT, //'到付地点',
store: this.storeCodeDisport6, store: this.storeCodeDisport6,
id:"comboxPAYABLEAT", id: "comboxPAYABLEAT",
queryMode: 'remote', queryMode: 'remote',
minChars: 2, minChars: 2,
queryParam: 'PORT', queryParam: 'PORT',
@ -1176,6 +1176,78 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
}); });
this.storeISSUETYPE = Ext.create('DsExt.ux.RefTableStore', {
model: 'CODE_BLTYPE',
proxy: { url: '/CommMng/BasicDataRef/GetCodeBLTYPEList' }
});
this.storeISSUETYPE.load({ params: { condition: "" } });
this.comboxISSUETYPE = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.ISSUETYPE, //'签单方式',
store: this.storeISSUETYPE,
forceSelection: true,
name: 'ISSUETYPE',
id: 'ISSUETYPE',
valueField: 'BLTYPE',
displayField: 'BLTYPE',
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
if (records[0].data.NOBILL != '') {
this.formEdit.getForm().findField('NOBILL').setValue(records[0].data.NOBILL);
this.formEdit.getForm().findField('COPYNOBILL').setValue(records[0].data.COPYNOBILL);
} else {
if (combo.value == "正本") {
this.formEdit.getForm().findField('NOBILL').setValue('THREE');
this.formEdit.getForm().findField('COPYNOBILL').setValue('ONE');
} else if (combo.value == "电放") {
this.formEdit.getForm().findField('NOBILL').setValue('ONE');
}
}
}
}
}
});
this.storeCodeGoodsList = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CodeGoodsModel',
proxy: { url: '/CommMng/BasicDataRef/GetCodeGoodsList' }
});
this.storeCodeGoodsList.load();
this.comboxGOODSNAME = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: "中文品名",
store: this.storeCodeGoodsList,
labelWidth: 60,
// forceSelection: true,
name: 'GOODSNAME',
valueField: 'GOODNAME',
displayField: 'CodeAndName'
});
this.comboxGOODCODE = Ext.create('DsExt.ux.RefTableCombox', {
store: this.storeCodeGoodsList,
name: 'HSCODE',
fieldLabel: Zi.LAN.HSCODE, //'HS编码',
labelWidth: 45,
valueField: 'GOODCODE',
displayField: 'GOODCODE',
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
if (records.length > 0) {
var hscode = combo.value;
if (hscode.length > 6) {
hscode = hscode.substring(0, 6);
this.formEdit.getForm().findField('HSCODE').setValue(hscode);
}
}
}
}
});
////////////////////// //////////////////////
this.formDjyOrder = Ext.widget('form', { this.formDjyOrder = Ext.widget('form', {
@ -1226,7 +1298,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
, { , {
xtype: 'container', xtype: 'container',
id: 'formDjyOrder_3', id: 'formDjyOrder_3',
hidden:false, hidden: false,
layout: 'hbox', layout: 'hbox',
defaultType: 'textfield', defaultType: 'textfield',
labelWidth: 60, labelWidth: 60,
@ -1238,7 +1310,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
readOnly: true, readOnly: true,
name: 'CARRIER' name: 'CARRIER'
},{ }, {
xtype: 'datefield', xtype: 'datefield',
format: 'Y-m-d', format: 'Y-m-d',
@ -1268,7 +1340,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
labelWidth: 60, labelWidth: 60,
items: [ items: [
this.comboxPLACERECEIPTID this.comboxPLACERECEIPTID
,this.comboxPORTLOAD2 , this.comboxPORTLOAD2
, this.comboxPORTDISCHARGE2 , this.comboxPORTDISCHARGE2
, this.comboxDESTINATION2 , this.comboxDESTINATION2
@ -1282,23 +1354,26 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
defaultType: 'textfield', defaultType: 'textfield',
labelWidth: 60, labelWidth: 60,
items: [ items: [
{ //{
flex: 1, // flex: 1,
xtype: 'label', // xtype: 'label',
html: '提单类型' // html: '签单方式'
}, //},
{ this.comboxISSUETYPE,
flex: 1, //{
xtype: 'label', // flex: 1,
html: '中文品名' // xtype: 'label',
}, // html: '中文品名'
{ //},
flex: 1, this.comboxGOODSNAME,
xtype: 'label', //{
html: 'HSCODE' // flex: 1,
}, // xtype: 'label',
this.comboxSERVICE // html: 'HSCODE'
, this.comboxMBLFRT //},
this.comboxGOODCODE,
this.comboxSERVICE,
this.comboxMBLFRT
] ]
} }
@ -1617,7 +1692,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
var grid_VesselVoyno = Ext.create('Ext.grid.Panel', { var grid_VesselVoyno = Ext.create('Ext.grid.Panel', {
region: "center", region: "center",
autoWidth:false, autoWidth: false,
store: _this.storeVesselVoyno, store: _this.storeVesselVoyno,
plugins: [{ plugins: [{
ptype: 'rowexpander', ptype: 'rowexpander',
@ -1691,7 +1766,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
}, this); }, this);
grid_VesselVoyno.view.on('expandBody', function (rowNode, record, expandRow, eOpts) { grid_VesselVoyno.view.on('expandBody', function (rowNode, record, expandRow, eOpts) {
_this.displayInnerGrid(record.get('ID') ); _this.displayInnerGrid(record.get('ID'));
}); });
grid_VesselVoyno.view.on('collapsebody', function (rowNode, record, expandRow, eOpts) { grid_VesselVoyno.view.on('collapsebody', function (rowNode, record, expandRow, eOpts) {
@ -1759,8 +1834,8 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.formDjyOrder this.formDjyOrder
,this.panel_DjyOrderBody , this.panel_DjyOrderBody
,this.panelBtn , this.panelBtn
///////// /////////
//,this.gridList_OrderCtn //,this.gridList_OrderCtn
//, this.gridDocList //, this.gridDocList
@ -1770,6 +1845,15 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
//#endregion //#endregion
//装货港
this.storeCodeLoadport_Order.add({ EDICODE: this.seaeHeadData.PORTLOADID, CodeAndName: this.seaeHeadData.PORTLOAD });
//卸货港
this.storeCodeDisport_Order.add({ EDICODE: this.seaeHeadData.PORTDISCHARGEID, CodeAndName: this.seaeHeadData.PORTDISCHARGE });
//目的地
this.storeCodeDisport_Order2.add({ EDICODE: this.seaeHeadData.DESTINATIONID, CodeAndName: this.seaeHeadData.DESTINATION });
this.formDjyOrder.getForm().setValues(this.seaeHeadData); this.formDjyOrder.getForm().setValues(this.seaeHeadData);
this.LoadData(); this.LoadData();
@ -1921,8 +2005,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
, ,
DoSendDjyOrder() DoSendDjyOrder() {
{
me = this; me = this;
var BSNO = this.seaeHeadData.BSNO; var BSNO = this.seaeHeadData.BSNO;
@ -1998,8 +2081,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
{ {
me.storeDocList.remove(selectedRecords[i]); me.storeDocList.remove(selectedRecords[i]);
} }
else else {
{
var feeGId = "" + rec.data.GID + ""; var feeGId = "" + rec.data.GID + "";
if (feeGidSql == '') { if (feeGidSql == '') {
feeGidSql = feeGId; feeGidSql = feeGId;
@ -2255,12 +2337,10 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
// checked: false // checked: false
//} //}
if (this.carrier == "PIL") if (this.carrier == "PIL") {
{
carriervalue = 'PABV'; carriervalue = 'PABV';
} }
if (this.carrier == "ZIM") if (this.carrier == "ZIM") {
{
carriervalue = 'ZIMU'; carriervalue = 'ZIMU';
} }
this.ParentWin.LeYuDingCangSwap(data, bodydatas, FILETYPE, FILEROLE, carriervalue); this.ParentWin.LeYuDingCangSwap(data, bodydatas, FILETYPE, FILEROLE, carriervalue);

8
DSWeb/Web.config
Unescape Escape View File

@ -131,14 +131,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
--> -->
<!-- 深圳彩虹捷运 正式库 rainbow admin admin --> <!-- 深圳彩虹捷运 正式库 rainbow admin admin
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=ShippingWeb_CHJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳彩虹捷运 测试库 CHJY admin 123456 <!-- 深圳彩虹捷运 测试库 CHJY admin 123456 -->
<add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="sydevzsh" connectionString="Server=119.23.249.201,12356;Database=1107;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 深圳泛亚捷运 正式库 SZFYJY admin 123456 <!-- 深圳泛亚捷运 正式库 SZFYJY admin 123456
<add name="DongShengDB" connectionString="Server=39.108.7.69,62356;Database=ShippingWeb_SZFYJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" /> <add name="DongShengDB" connectionString="Server=39.108.7.69,62356;Database=ShippingWeb_SZFYJY;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

Write Preview
Loading…
Cancel
Save