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
YingHang
hanxuntao 9 months ago
parent aaefc5ae99 113b763ae6
commit d012ced986
7 changed files with 376 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -102,3 +102,5 @@ DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
/JobScheduler/bin/Debug/App_Data/Logs/error.log
/UpgradeLog3.htm
/DSWeb/Areas/Account/Files
/DSWeb.DJY_RESP/packages
/DSWeb.DJY_RESP/publish

16
DSWeb/Areas/MvcShipping/Viewsjs/BookingConfirm/BookingConfirmEdit.js
Unescape Escape View File

@ -538,9 +538,18 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
defaultType: 'textfield',
items: [
{
name: 'SALE_NAME',flex:1,
name: 'SALE_NAME',
flex: 1,
fieldLabel: '指定销售'
}, { xtype: 'hiddenfield', flex: 1 }
},
{
fieldLabel: "SOC", //'是否改签',
flex: 1,
inputValue: true,
xtype: 'checkboxfield',
name: 'ISCONTAINERSOC'
}
//, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 1 }
@ -2112,6 +2121,9 @@ Ext.extend(Shipping.BookingConfirmEdit, Ext.Panel, {
this.formHead.getForm().setValues(data);
this.formEdit.getForm().reset();
this.formEdit.getForm().setValues(data);
this.LoadInit(data);
this.GetEditStatus();
} else {

18
DSWeb/Areas/OA/Controllers/Wms_StockTakeController.cs
Unescape Escape View File

@ -119,7 +119,7 @@ namespace DSWeb.Areas.OA.Controllers
data.GOODSNUM = Convert.ToString(reader["GOODSNUM"]);
data.WeiWanShui = Convert.ToString(reader["WeiWanShui"]); //需求编号：SR2017062200002
data.ISBONDEDNAME = Convert.ToString(reader["ISBONDEDNAME"]); //是否保税：SR2017062600003
if (Convert.ToString(reader["ISBONDED"]) == "0")
if (Convert.ToString(reader["ISBONDED"]) != "1")
{
data.GOODSNUM = "0";//是否保税：SR2017062600003
data.WeiWanShui = "0";//是否保税：SR2017062600003
@ -205,12 +205,12 @@ namespace DSWeb.Areas.OA.Controllers
data.STORAGENAME = Convert.ToString(reader["STORAGENAME"]);
data.GOODSNAME = Convert.ToString(reader["GOODSNAME"]);
data.GOODSMODEL = Convert.ToString(reader["GOODSMODEL"]);
//data.hj_GOODSRKSL = Convert.ToString(reader["hj_GOODSRKSL"]);
//data.hj_GOODSPFSL_OUT = Convert.ToString(reader["hj_GOODSPFSL_OUT"]);
//data.hj_GOODSSTOCK = Convert.ToString(reader["hj_GOODSSTOCK"]);
//data.hj_GOODSPACK = Convert.ToString(reader["hj_GOODSPACK"]);
//data.hj_GOODSPACKPFSL = Convert.ToString(reader["hj_GOODSPACKPFSL"]);
//data.hj_GOODSPACKSTOCK = Convert.ToString(reader["hj_GOODSPACKSTOCK"]);
data.hj_GOODSRKSL = Convert.ToString(reader["GOODSRKSL"]);//入库数量
data.hj_GOODSPFSL_OUT = Convert.ToString(reader["GOODSPFSL_OUT"]);//出库数量
data.hj_GOODSSTOCK = Convert.ToString(reader["GOODSSTOCK"]);//库存数量
data.hj_GOODSPACK = Convert.ToString(reader["GOODSPACK"]);//入库件数
data.hj_GOODSPACKPFSL = Convert.ToString(reader["GOODSPACKPFSL_OUT"]);//出库件数
data.hj_GOODSPACKSTOCK = Convert.ToString(reader["GOODSPACKSTOCK"]);//库存件数
data.GID = Convert.ToString(reader["GID"]);
data.ASSOCIATEDNO = Convert.ToString(reader["ASSOCIATEDNO"]);
data.CONTRACTNO = Convert.ToString(reader["CONTRACTNO"]);
@ -226,7 +226,7 @@ namespace DSWeb.Areas.OA.Controllers
data.GOODSNUM = Convert.ToString(reader["GOODSNUM"]);
data.WeiWanShui = Convert.ToString(reader["WeiWanShui"]); //需求编号：SR2017062200002
data.ISBONDEDNAME = Convert.ToString(reader["ISBONDEDNAME"]); //是否保税：SR2017062600003
if (Convert.ToString(reader["ISBONDED"]) == "0")
if (Convert.ToString(reader["ISBONDED"]) != "1")
{
data.GOODSNUM = "0";//是否保税：SR2017062600003
data.WeiWanShui = "0";//是否保税：SR2017062600003
@ -234,6 +234,7 @@ namespace DSWeb.Areas.OA.Controllers
data.GOODSSLICE_OUT = Convert.ToString(reader["GOODSSLICE_OUT"]);//需求编号：SR2017071100001
//data.CLEARSTOCKGAP = Convert.ToString(reader["CLEARSTOCKGAP"]);
data.AREANAME = Convert.ToString(reader["AREANAME"]);//需求编号：SR2020051900002
data.PICIHAO = Convert.ToString(reader["PICIHAO"]);
data.COUNTRYOFORIGIN = Convert.ToString(reader["COUNTRYOFORIGIN"]);
#endregion
headList.Add(data);
@ -242,7 +243,6 @@ namespace DSWeb.Areas.OA.Controllers
}
return headList;
}
#endregion

2
DSWeb/Areas/OA/Models/Wms_StockTake/Wms_StockTake.cs
Unescape Escape View File

@ -50,6 +50,8 @@ namespace DSWeb.Areas.OA.Models.Wms_StockTake
public string COUNTRYOFORIGIN { get; set; }//原产地
public string CNTRNO { get; set; }
public string PICIHAO { get; set; }
}

357
DSWeb/Areas/OA/Viewsjs/Wms_StockTake/Wms_StockTakeIndex.js
Unescape Escape View File

@ -281,9 +281,17 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
items: [{
fieldLabel: '库别',
name: 'WHS_CODE'
}, { xtype: 'hiddenfield' }
, { xtype: 'hiddenfield' }
, { xtype: 'hiddenfield' }
}, {
fieldLabel: '储位',
//hidden:true,
id:"PS_AREANAME",
name: 'AREANAME'
}, {
fieldLabel: '批次号',
//hidden: true,
id: "PS_PICIHAO",
name: 'PICIHAO'
}, { xtype: 'hiddenfield' }
, { xtype: 'hiddenfield' }
]
}]
@ -331,6 +339,7 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
{ name: 'GOODSSLICE_OUT', type: 'number' }, //需求编号：SR2017071100001
{ name: 'AREANAME', type: 'string' },//需求编号：SR2020051900002
{ name: 'WHS_CODE', type: 'string' },
{ name: 'PICIHAO', type: 'string' },
{ name: 'COUNTRYOFORIGIN', type: 'string' }
],
remoteSort: true,
@ -381,6 +390,7 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
{ name: 'ISBONDEDNAME', type: 'string' }, //是否保税：SR2017062600003
{ name: 'GOODSSLICE_OUT', type: 'number' }, //需求编号：SR2017071100001
{ name: 'AREANAME', type: 'string' },//需求编号：SR2020051900002
{ name: 'PICIHAO', type: 'string' },
{ name: 'WHS_CODE', type: 'string' },
{ name: 'COUNTRYOFORIGIN', type: 'string' }
],
@ -749,6 +759,234 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
width: 80
}];
this.WMSINcolums = [
{
sortable: true,
dataIndex: 'WMSDATE',
header: '入库日期',
width: 80
},
{
sortable: true,
dataIndex: 'COUNTRYOFORIGIN',
header: '原产国',
width: 80
},
{
sortable: true,
dataIndex: 'CUSTOMERNAME',
header: '货主',
width: 80
},
{
sortable: true,
dataIndex: 'MBLNO',
header: '提单号',
width: 100
},
{
sortable: true,
dataIndex: 'CUSTNO',
header: '委托编号',
width: 100
},
{
sortable: true,
dataIndex: 'WMSNO',
header: '入库单号',
width: 150
},
{
sortable: true,
dataIndex: 'STORAGENAME',
header: '仓库',
width: 80
}, {
sortable: true,
dataIndex: 'WHS_CODE',
header: '库别',
width: 80
},
{
sortable: true,
dataIndex: 'GOODSNAME',
header: '品名',
width: 150
},
{
sortable: true,
dataIndex: 'GOODSMODEL',
header: '单位', //品牌，需求编号：SR2017061800001-12
width: 80
},
{
sortable: true,
dataIndex: 'GOODSSTANDARD',
header: '规格',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSPACK',
header: '入库件数',
width: 80
},
{
//需求编号：SR2017062200002
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'WeiWanShui',
header: '未完税件数',
align: 'center',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'GOODSNUM',
header: '完税件数',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSPACKPFSL',
header: '出库件数',
width: 80
},
{
//需求编号：SR2017061800001-7，SR2017071100001
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'GOODSSLICE_OUT',
header: '出库包装件数',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSPACKSTOCK',
header: '库存件数',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSRKSL',
header: '入库数量',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSPFSL_OUT',
header: '出库数量',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSSTOCK',
header: '库存数量',
width: 80
},
{
sortable: true,
dataIndex: 'CLEARSTOCKGAP',
header: '清库差',
width: 80
},
{
sortable: true,
dataIndex: 'AREANAME',
header: '储位',
width: 80
},
{
sortable: true,
dataIndex: 'PICIHAO',
header: '批次号',
width: 80
},
{
sortable: true,
dataIndex: 'CUSTOMNO',
header: '报关单号/备案清单号',
width: 80
},
{
sortable: true,
dataIndex: 'CHARGEUNIT',
header: '计算单位',
width: 80
},
{
sortable: true,
dataIndex: 'CONTRACTNO',
header: '合同号',
width: 80
},
{
sortable: true,
dataIndex: 'GOODSGRADE',
header: '品名的等级',
width: 80
},
{
//是否保税：SR2017062600003
sortable: true,
dataIndex: 'ISBONDEDNAME',
header: '是否保税业务',
align: 'center',
width: 80
},
{
sortable: true,
dataIndex: 'REMARK',
header: '备注',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSPACKACTUAL',
header: '实际件数',
width: 80
},
{
sortable: true,
//summaryType: 'sum',
//summaryRenderer: Ext.util.Format.numberRenderer('00.00'),
dataIndex: 'hj_GOODSRKSLACTUAL',
header: '实际数量',
width: 80
},
{
sortable: true,
hidden: true,
dataIndex: 'GID',
header: 'GID',
width: 80
},
{
sortable: true,
hidden: true,
dataIndex: 'ASSOCIATEDNO',
header: 'BSNO',
width: 80
}];
this.initgirdDrcolums_Customer = [
{
sortable: true,
@ -950,7 +1188,6 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
width: 80
}];
this.initgirdDrcolums_CNTRNO = [
{
sortable: true,
@ -1069,6 +1306,9 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
this.column_CNTRNO = this.initgirdDrcolums_CNTRNO;
this.column_CNTRNO = DsTruck.GetGridPanel(USERID, this.formname + "_CNTRNO", this.column_CNTRNO, 0); //使用者id，表名，中间column数组，跳过一开始的几列
this.column_WMSIN = this.WMSINcolums;
this.column_WMSIN = DsTruck.GetGridPanel(USERID, this.formname + "_WMSIN", this.column_WMSIN, 0); //使用者id，表名，中间column数组，跳过一开始的几列
//#endregion
//#region gridList列表显示信息
@ -1112,7 +1352,7 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
},
stateful: false,
selModel: this.KCCBModel,
columns: this.column,
columns: this.column_WMSIN,
bbar: Ext.create('Ext.PagingToolbar', {
store: this.storeWMSINList,
displayInfo: true,
@ -1485,7 +1725,8 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
region: "center",
items: [this.page_1, this.page_2, this.page_3, this.page_4, this.page_5, this.page_6],
listeners: {
tabchange: function (tp, p) {
tabchange: function (tabPanel, newCard, oldCard, eOpts) {
_this.setSearch(newCard);
_this.onRefreshClick();
}
}
@ -1555,20 +1796,23 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
}
if (_p == "page_6") {
this.storeWMSINList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "CNTRNO" },
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "" },
waitMsg: "正在查询数据...",
scope: this
});
}
this.storeList_Sum.load({
params: { start: 0, limit: this.PageSize, condition: sql },
waitMsg: "正在查询数据...",
scope: this
});
//
},
getCondition: function () {
getCondition: function (issum) {
var form = this.formSearch.getForm();
if (!form.isValid()) {
Ext.Msg.alert('提示', '查询条件赋值错误，请检查。');
@ -1636,6 +1880,13 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
var WHS_CODE = form.findField('WHS_CODE').getValue();
if (WHS_CODE != "") { sql = sql + getAndConSql(sql, WHS_CODE, "vws.WHS_CODE = '" + WHS_CODE + "'"); }
var AREANAME = form.findField('AREANAME').getValue();
sql = sql + getAndConSql(sql, AREANAME, "vws.AREANAME like '%" + AREANAME + "%'");
var PICIHAO = form.findField('PICIHAO').getValue();
sql = sql + getAndConSql(sql, PICIHAO, "vws.PICIHAO like '%" + PICIHAO + "%'");
return sql;
},
@ -1661,24 +1912,94 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
sortstr = this.sortfield + ' ' + this.sortdire;
}
// this.gridList.filters.clearFilters();
var form = this.formSearch.getForm();
//var form = this.formSearch.getForm();
this.storeList.load({
var _p = this.MainTab.getActiveTab().id;
if (_p == "page_1") {
this.storeList.load({
params: { start: 0, limit: this.PageSize, condition: sql },
waitMsg: "正在查询数据...",
scope: this
});
}
if (_p == "page_2") {
this.storeCustomerList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "Customer" },
waitMsg: "正在查询数据...",
scope: this
});
}
if (_p == "page_3") {
this.storeCompanyList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "Company" },
waitMsg: "正在查询数据...",
scope: this
});
}
if (_p == "page_4") {
this.storeGOODSNAMEList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "GOODSNAME" },
waitMsg: "正在查询数据...",
scope: this
});
}
if (_p == "page_5") {
this.storeCNTRNOList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "CNTRNO" },
waitMsg: "正在查询数据...",
scope: this
});
}
if (_p == "page_6") {
this.storeWMSINList.load({
params: { start: 0, limit: this.PageSize, condition: sql, GROUPBY: "" },
waitMsg: "正在查询数据...",
scope: this
});
}
this.storeList_Sum.load({
params: { start: 0, limit: this.PageSize, condition: sql },
waitMsg: Zi.LAN.ZhengZaiChaXunShuJu, //"正在查询数据...",
waitMsg: "正在查询数据...",
scope: this
});
},
setSearch: function (newCard) {
if (newCard.id == "page_6")
{
//areaname = Ext.getCmp("PS_AREANAME");
//picihao = Ext.getCmp("PS_PICIHAO");
//areaname.setValue("");
//picihao.setValue("");
//areaname.hidden = false;
//picihao.hidden = false;
} else
{
//areaname = Ext.getCmp("PS_AREANAME");
//picihao = Ext.getCmp("PS_PICIHAO");
//areaname.setValue("");
//picihao.setValue("");
//areaname.hidden = true;
//picihao.hidden = true;
}
},
//#endregion
//#region 保存列表样式
onSaveClick: function (button, event) {
var sql = this.getCondition();
var _p = this.MainTab.getActiveTab().id;
if (_p == "page_1" || _p == "page_6") {
if (_p == "page_1" ) {
this.columns = DsTruck.SaveGridPanel(USERID, this.formname, this.gridList.columns, this.column, 0, true); //使用者id，表名，中间column数组，跳过一开始的几列
}
if (_p == "page_6") {
this.columns = DsTruck.SaveGridPanel(USERID, this.formname + "_WMSIN", this.gridList_WMSIN.columns, this.column_WMSIN, 0, true); //使用者id，表名，中间column数组，跳过一开始的几列
}
if (_p == "page_2") {
this.column_Customer = DsTruck.SaveGridPanel(USERID, this.formname + "_Customer", this.gridList_Customer.columns, this.column_Customer, 0, true); //使用者id，表名，中间column数组，跳过一开始的几列
}
@ -1737,11 +2058,17 @@ Ext.extend(DsTruck.Wms_StockTakeIndex, Ext.Panel, {
if (_p == "page_3") {
GridExportExcelPage(this.gridList_Company);
}
if (_p == "page_4") {
if (_p == "page_4")
{
GridExportExcelPage(this.gridList_GOODSNAME);
} if (_p == "page_5") {
}
if (_p == "page_5")
{
GridExportExcelPage(this.gridList_CNTRNO);
}
if (_p == "page_6") {
GridExportExcelPage(this.gridList_WMSIN);
}
}
//#endregion

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>E:\DS7_dev\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />

9
DSWeb/Global.asax.cs
Unescape Escape View File

@ -117,7 +117,10 @@ namespace DSWeb
var ReceiveDjydc = ConfigurationManager.AppSettings["ReceiveDjydc"];
if (ReceiveDjydc != null && ReceiveDjydc.ToString() != "")
{
DoReceiveDjydc();
if (ReceiveDjydc == "true")
{
DoReceiveDjydc();
}
}
InitMapper();
@ -333,9 +336,9 @@ namespace DSWeb
var strBodyZip = Encoding.UTF8.GetString(body.ToArray());
//logger.Debug($"收到大简云订舱输出压缩数据：{strBodyZip}");
//var strBody = Areas.CommMng.DAL.BasicDataRefDAL.Decompress(strBodyZip);
var strBody = Areas.CommMng.DAL.BasicDataRefDAL.Decompress(strBodyZip);
//测试数据不需解压缩
var strBody = strBodyZip;
//var strBody = strBodyZip;
//logger.Debug($"收到大简云订舱输出数据：{strBody}");
//导出到东胜6

Write Preview
Loading…
Cancel
Save