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 1 week 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();
this.BSNO = BSNO;
if (string.IsNullOrWhiteSpace(this.BSNO)) {
this.BSNO = GID;
}
CREATETIME = DateTime.Now;
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("*");
if (head.SyncType == "BC") {
head.SetField(ref newhead);
}
//newhead.BSNO = "topseae" + Guid.NewGuid().ToString();
//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) };
}
var dataList = MsOpSeaeDAL.GetSyncBCList(BSNO);
var head = MsOpSeaeDAL.GetData(" BSNO = '" + BSNO + "'");
var dataList = MsOpSeaeDAL.GetSyncBCList(head.BSNO,head.TRANSNO);
int count = dataList.Count();
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = count, data = dataList});
return new ContentResult() { Content = json };

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

@ -7876,13 +7876,22 @@ 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 result = cdc.DJY_SYNC_BC.Where(x => x.BSNO == BSNO && x.USED==false).ToList();
if (string.IsNullOrWhiteSpace(TRANSNO))
{
return result;
var result = cdc.DJY_SYNC_BC.Where(x => (x.BSNO == BSNO ) && x.USED == false).ToList();
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("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();

332
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,
Editdata: null,
MainEditRecord: null,
seaeHeadData:null,
seaeHeadData: null,
initUIComponents: function () {
@ -189,64 +189,64 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
clicksToEdit: 1
});
this.ctncolumns_Order =
[{
sortable: true,
dataIndex: 'CTN_ID',
header: Zi.LAN.CTN_ID, //'编号',
hidden: true,
width: 0
}, {
sortable: true,
dataIndex: 'BSNO',
header: Zi.LAN.BSNO2, //'业务编号',
hidden: true,
width: 0
}, {
dataIndex: 'CTNALL',
header: Zi.LAN.CTNALL, //'箱型',
width: 100
}, {
dataIndex: 'CTNNUM',
header: Zi.LAN.CTNNUM, //'箱量',
width: 60,
editor: {
xtype: 'numberfield',
allowBlank: false,
selectOnFocus: true
}
}, {
sortable: true,
dataIndex: 'PKGS',
header: Zi.LAN.PKGS, //'件数',
width: 80,
editor: {
xtype: 'numberfield',
allowBlank: false,
selectOnFocus: true
}
}, {
dataIndex: 'KINDPKGS',
header: Zi.LAN.KINDPKGS, //'包装',
width: 70,
editor: this.comboxKINDPKGS_CTN
}, {
dataIndex: 'KGS',
header: Zi.LAN.KGS3, //'重量',
width: 80,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}, {
dataIndex: 'CBM',
header: Zi.LAN.CBM2, //'尺码',
width: 80,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}];
this.ctncolumns_Order =
[{
sortable: true,
dataIndex: 'CTN_ID',
header: Zi.LAN.CTN_ID, //'编号',
hidden: true,
width: 0
}, {
sortable: true,
dataIndex: 'BSNO',
header: Zi.LAN.BSNO2, //'业务编号',
hidden: true,
width: 0
}, {
dataIndex: 'CTNALL',
header: Zi.LAN.CTNALL, //'箱型',
width: 100
}, {
dataIndex: 'CTNNUM',
header: Zi.LAN.CTNNUM, //'箱量',
width: 60,
editor: {
xtype: 'numberfield',
allowBlank: false,
selectOnFocus: true
}
}, {
sortable: true,
dataIndex: 'PKGS',
header: Zi.LAN.PKGS, //'件数',
width: 80,
editor: {
xtype: 'numberfield',
allowBlank: false,
selectOnFocus: true
}
}, {
dataIndex: 'KINDPKGS',
header: Zi.LAN.KINDPKGS, //'包装',
width: 70,
editor: this.comboxKINDPKGS_CTN
}, {
dataIndex: 'KGS',
header: Zi.LAN.KGS3, //'重量',
width: 80,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}, {
dataIndex: 'CBM',
header: Zi.LAN.CBM2, //'尺码',
width: 80,
editor: {
xtype: 'textfield',
selectOnFocus: true
}
}];
this.storeBodyList = Ext.create('Ext.data.Store', {
model: 'MsOpSeaeDetail',
@ -493,11 +493,11 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxCargoid2 = Ext.create('DsExt.ux.RefTableCombox', {
store: this.StoreCargoid,
labelWidth:60,
labelWidth: 60,
fieldLabel: "<a><font color='#000000'>货物类型</font></a>",
forceSelection: true,
allowBlank: true,
flex:0.70,
flex: 0.70,
//width: 1200,
name: 'CARGOID',
valueField: 'EnumValueId',
@ -585,7 +585,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxPLACERECEIPTID = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: "收货地", //'装货港',
hidden:true,
hidden: true,
labelWidth: 60,
store: this.storeCodeLoadport_Order2,
name: 'PLACERECEIPTID',
@ -922,7 +922,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
listeners: {
scope: this,
'select': function (combo, records, eOpts) {
}
}
});
@ -1065,7 +1065,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.comboxPAYABLEAT = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: Zi.LAN.PAYABLEAT, //'到付地点',
store: this.storeCodeDisport6,
id:"comboxPAYABLEAT",
id: "comboxPAYABLEAT",
queryMode: 'remote',
minChars: 2,
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', {
@ -1226,7 +1298,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
, {
xtype: 'container',
id: 'formDjyOrder_3',
hidden:false,
hidden: false,
layout: 'hbox',
defaultType: 'textfield',
labelWidth: 60,
@ -1238,9 +1310,9 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
readOnly: true,
name: 'CARRIER'
},{
}, {
xtype: 'datefield',
format: 'Y-m-d',
allowBlank: false,
fieldLabel: 'ETD',
@ -1268,10 +1340,10 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
labelWidth: 60,
items: [
this.comboxPLACERECEIPTID
,this.comboxPORTLOAD2
, this.comboxPORTLOAD2
, this.comboxPORTDISCHARGE2
, this.comboxDESTINATION2
, this.comboxPREPARDAT
, this.comboxPAYABLEAT
, this.comboxISSUEPLACE
@ -1282,23 +1354,26 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
defaultType: 'textfield',
labelWidth: 60,
items: [
{
flex: 1,
xtype: 'label',
html: '提单类型'
},
{
flex: 1,
xtype: 'label',
html: '中文品名'
},
{
flex: 1,
xtype: 'label',
html: 'HSCODE'
},
this.comboxSERVICE
, this.comboxMBLFRT
//{
// flex: 1,
// xtype: 'label',
// html: '签单方式'
//},
this.comboxISSUETYPE,
//{
// flex: 1,
// xtype: 'label',
// html: '中文品名'
//},
this.comboxGOODSNAME,
//{
// flex: 1,
// xtype: 'label',
// html: 'HSCODE'
//},
this.comboxGOODCODE,
this.comboxSERVICE,
this.comboxMBLFRT
]
}
@ -1371,7 +1446,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
]
}
, {
xtype: 'container',
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
@ -1406,7 +1481,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
]
}
, {
xtype: 'container',
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
@ -1463,7 +1538,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
}]
}
, { xtype: "hiddenfield" }
]
}
@ -1472,7 +1547,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
@ -1489,7 +1564,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
@ -1497,7 +1572,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
@ -1505,7 +1580,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
@ -1513,7 +1588,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
@ -1522,7 +1597,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
@ -1530,8 +1605,8 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textfield',
items: [
]
}
, {
@ -1539,8 +1614,8 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
layout: 'hbox',
defaultType: 'textarea',
items: [
]
}
//, {
@ -1617,7 +1692,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
var grid_VesselVoyno = Ext.create('Ext.grid.Panel', {
region: "center",
autoWidth:false,
autoWidth: false,
store: _this.storeVesselVoyno,
plugins: [{
ptype: 'rowexpander',
@ -1632,17 +1707,17 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
columns: [
{
dataIndex: 'ID',
header: "顺序",
header: "顺序",
width: 0
},
{
dataIndex: 'originName',
header: "起运港",
header: "起运港",
width: 140
},
{
dataIndex: 'cutOffLocalDate',
header: "截单日期",
header: "截单日期",
width: 80
}, {
dataIndex: 'departureDate',
@ -1653,16 +1728,16 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
header: "航线",
width: 80
}, {
dataIndex: 'vesselName_ALL',
header: '船名航次',
dataIndex: 'vesselName_ALL',
header: '船名航次',
width: 230
}, {
dataIndex: 'nextServiceCode',
header: "下段航线",
header: "下段航线",
width: 80
}, {
dataIndex: 'estimatedTransitTimeInDays',
header: "航程",
header: "航程",
width: 60
}
],
@ -1674,7 +1749,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
grid_VesselVoyno.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
//双击时 将船名航次写入 并关闭win_VesselVoyno
Ext.getCmp("DJYORDER_VESSEL").setValue(record.data.vesselName);
Ext.getCmp("DJYORDER_VOYNO").setValue(record.data.voyageNumber);
@ -1686,12 +1761,12 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
Ext.getCmp("DJYORDER_PodPortName").setValue(record.data.destinationName);
this.win_VesselVoyno.close();
}, this);
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) {
@ -1727,7 +1802,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
this.panelBtn = new Ext.Panel({
region: "south",
height: 35,
buttonAlign: 'center',
buttonAlign: 'center',
buttons: [
{
@ -1757,10 +1832,10 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
Ext.apply(this, {
items: [
this.formDjyOrder
,this.panel_DjyOrderBody
,this.panelBtn
, this.panel_DjyOrderBody
, this.panelBtn
/////////
//,this.gridList_OrderCtn
//, this.gridDocList
@ -1770,6 +1845,15 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
//#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.LoadData();
@ -1921,8 +2005,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
,
DoSendDjyOrder()
{
DoSendDjyOrder() {
me = this;
var BSNO = this.seaeHeadData.BSNO;
@ -1998,8 +2081,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
{
me.storeDocList.remove(selectedRecords[i]);
}
else
{
else {
var feeGId = "" + rec.data.GID + "";
if (feeGidSql == '') {
feeGidSql = feeGId;
@ -2033,7 +2115,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
if (resultData.Message == "船名航次错误") {
_this.storeVesselVoyno.removeAll();
_this.storeVesselVoyno_detail.removeAll();
for (var i = 0; i < resultData.Data.length; i += 1) {
var rec = resultData.Data[i];
@ -2052,7 +2134,7 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
}
}
_this.storeVesselVoyno.add(rec);
}
@ -2255,12 +2337,10 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
// checked: false
//}
if (this.carrier == "PIL")
{
if (this.carrier == "PIL") {
carriervalue = 'PABV';
}
if (this.carrier == "ZIM")
{
if (this.carrier == "ZIM") {
carriervalue = 'ZIMU';
}
this.ParentWin.LeYuDingCangSwap(data, bodydatas, FILETYPE, FILEROLE, carriervalue);
@ -2275,9 +2355,9 @@ Ext.extend(Shipping.formDjyOrder_PIL, Ext.Panel, {
//columns_Voyno_detail =
var detailstore = Ext.create('DsExt.ux.RefTableStore', {
var detailstore = Ext.create('DsExt.ux.RefTableStore', {
model: 'VesselVoyno_Emc_Detail_md',
proxy: { url: '' }
});

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="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="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="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
<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