Browse Source

解决冲突

master
陆晔 2 years ago
parent
commit
9fdfe200c4
  1. 16
      WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs
  2. 106
      WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml
  3. 3
      WMS-BS/NFine.Web/Configs/database.config
  4. BIN
      WMS-BS/NFine.Web/Content/img/nwlogo2.png
  5. 9
      WMS-BS/NFine.Web/Views/Home/Index.cshtml
  6. 20
      WMS-BS/NFine.Web/Views/Login/Index.cshtml

16
WMS-BS/NFine.Application/WMS/WMSCreateItemLotApp.cs

@ -991,7 +991,7 @@ where a.Status='2'";
object Figure = GetDecimalDigits();
#region [SQL]
string sql = @"select a.ID, '' as 'POCode',-- d.POCode,d.Sequence as POSequence,
'' as POSequence,a.ModificationDate,a.TrackingNumber,a.NonconformingForm,
'' as POSequence,a.ModificationDate,a.TrackingNumber,a.NonconformingForm,a.POID,
a.DNCode,a.Sequence,a.VenCode,a.DepCode AS VenName,a.WHCode,a.InvCode,a.DNID,a.DNDetailID,a.WorkPoint,a.InspectionType,a.InvoDescribe,a.Unity,a.StockIndicator, b.InvName,b.InvStd,b.InvDesc,b.InvUnit, b.DrawingNo,
b.Version AS Version1, detail.LocationCode AS Area,
CAST(a.Quantity AS DECIMAL(18,{0})) as Quantity ,CAST(a.Amount AS DECIMAL(18,{0})) as Amount,CAST(a.RCVQuantity AS DECIMAL(18,{0})) as RCVQuantity,CAST(a.UnitPrice AS DECIMAL(18,{0})) as UnitPrice,a.Currency,a.CreatePerson,a.CreateDateTime,CAST(c.LOTQTY AS DECIMAL(18,{0})) as LOTQTY
@ -1062,6 +1062,10 @@ where a.DNType='1' and a.Status='2' and a.ASNCode is null
sql += " and (a.RCVQuantity<a.Quantity Or a.Quantity<=0) ";
}
}
if (!string.IsNullOrWhiteSpace(queryParam["DNID"].ToString()))
{
sql += " and a.DNID like '%" + queryParam["DNID"].ToString() + "%' ";
}
}
if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin")
{
@ -1608,7 +1612,7 @@ WHERE
DateTime MTime = DateTime.Now;
string sql = $@"SELECT * FROM ICSDeliveryNotice WHERE ID in({ids}) AND DNCode NOT IN(SELECT TransCode From ICSInventoryLotDetail) ";
var dataset = Repository().FindDataSetBySql(sql);
if (dataset.Tables.Count == 0)
if (dataset.Tables.Count <= 0)
return 0;
DataTable table = dataset.Tables[0];
StringBuilder sqlString = new StringBuilder();
@ -1661,6 +1665,10 @@ WHERE
newid(),'{LotNo}','{invCode}','{MTime}','2999-12-31','{quantity}','{extensionID}','7','{MUSER}','{MUSERNAME}', getdate(),'{workPoint}','{amount}');");
}
if (sqlString.IsEmpty())
{
return 0;
}
int count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString());
return count;
}
@ -1868,6 +1876,10 @@ WHERE
newid(),'{LotNo}','{invCode}','{MTime}','2999-12-31','{quantity}','{extensionID}','9','{MUSER}','{MUSERNAME}', getdate(),'{workPoint}','{amount}');");
}
if (sqlString.IsEmpty())
{
return 0;
}
int count = SqlHelper.CmdExecuteNonQueryLi(sqlString.ToString());
return count;
}

106
WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/CreateItemLot.cshtml

@ -18,6 +18,10 @@
if (Type != '9') {
$(".Workorder").css('display', 'none');
}
if (Type != '7')
{
$(".txt_DNID1").css('display', 'none');
}
if (Type == '1') {
gridList();
@ -81,12 +85,14 @@
})
//显示的列内容
function SetCols() {
$.ajax({
url: "/Print/SelectColumnName?" + Math.random(),
dataType: "json",
async: false,
success: function (data) {
var cols = new Array();
if (Type == '1') {
var collast = { label: "主键", name: "ID", hidden: true, key: true };
@ -368,6 +374,10 @@
cols.push(collast);
var collast = { label: '行号', name: 'Sequence', width: 50, align: 'left' };
cols.push(collast);
var collast = { label: '采购订单号', name: 'DNID', width: 120, align: 'left' };
cols.push(collast);
var collast = { label: '采购订单行号', name: 'DNDetailID', width: 120, align: 'left' };
cols.push(collast);
var collast = { label: '料品编码', name: 'InvCode', width: 120, align: 'left' };
cols.push(collast);
var collast = { label: '物料描述', name: 'InvoDescribe', width: 120, align: 'left' };
@ -387,10 +397,7 @@
var collast = { label: '供应商名称', name: 'VenName', width: 120, align: 'left' };
cols.push(collast);
//新增字段
var collast = { label: '采购凭证号', name: 'DNID', width: 120, align: 'left' };
cols.push(collast);
var collast = { label: '采购凭证的项目', name: 'DNDetailID', width: 120, align: 'left' };
cols.push(collast);
var collast = { label: '站点', name: 'WorkPoint', width: 50, align: 'left' };
cols.push(collast);
var collast = { label: '检验类型', name: 'InspectionType', width: 50, align: 'left' };
@ -1585,6 +1592,7 @@
InvName: $("#txt_InvName").val(),
BatchCode: $("#txt_BatchCode").val(),
Container: $("#txt_Container :checked").val(),
DNID: $("#txt_DNID").val()
}
$gridList.dataGrid({
url: "/WMS/WMSCreateItemLot/GetGridJsonSHDH" + "?" + Math.random(),
@ -1652,6 +1660,7 @@
InvName: $("#txt_InvName").val(),
BatchCode: $("#txt_BatchCode").val(),
Container: $("#txt_Container :checked").val(),
DNID: $("#txt_DNID").val()
}
$gridList.jqGrid('setGridParam', {
postData: { queryJson: JSON.stringify(queryJson) },
@ -3190,8 +3199,7 @@
$("#PickID").val('');
var sign = '';
var objID = '';
var arr = [];
var status = '';
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
if (objList.length <= 0) {
$.modalAlert("请先选择单据!", "warning");
@ -3219,9 +3227,14 @@
param: {
keyValue: JSON.stringify(objID)
},
success: function () {
//sign = data.count;
success: function (data) {
if (data.state == "success") {
$.modalMsg(data.message, data.state);
} else {
$.modalAlert(data.message, data.state);
}
$.currentWindow().$("#gridList").trigger("reloadGrid");
;
}
});
}
@ -3236,63 +3249,23 @@
keyValue: JSON.stringify(objID)
},
success: function (data) {
sign = data.count;
if (data.state == "success") {
$.modalMsg(data.message, data.state);
} else {
$.modalAlert(data.message, data.state);
}
$.currentWindow().$("#gridList").trigger("reloadGrid");
}
});
}
//if (sign > 0) {
// $.modalAlert("操作成功");
// return;
//}
}
function btnBatchCreateCP() {
debugger;
$("#PickID").val('');
var sign = '';
var objID = '';
var arr = [];
var objList = $("#gridList").jqGrid('getGridParam', 'selarrrow');
if (objList.length <= 0) {
$.modalAlert("请先选择单据!", "warning");
return;
}
for (var i = 0; i < objList.length; i++) {
if (objList[i] != undefined) {
objID += "'" + objList[i] + "',";
}
//objArr = "" + objArr + "|";
//arr.push(objArr);
}
objID = objID.substring(0, objID.length - 1);
$.ajax({
url: "/WMS/WMSCreateItemLot/SubmitKLCPRK?ids=" + objID,
dataType: "json",
type: "post",
async: false,
param: {
keyValue: JSON.stringify(objID)
},
success: function (data) {
sign = data.count;
}
});
if (sign>0) {
$.modalAlert("操作成功");
if (sign != '') {
$.modalAlertNew('',sign,);
return;
}
}
</script>
@ -3388,6 +3361,13 @@
</div>
</td>
<td style="text-align:right;"class=" txt_DNID1"><label class="lglabel" for="txt_DNID">&nbsp;&nbsp;&nbsp;&nbsp;采购订单号</label>:</td>
<td class=" txt_DNID1">
<div class="input-group">
<input id="txt_DNID" type="text" class="form-control" style="width: 100px;">
</div>
</td>
<td class="HideItems" style="text-align:right;"><label class="lglabel HideItems" for="txt_VenCode">&nbsp;&nbsp;&nbsp;&nbsp;供应商代码</label>:</td>
<td class="HideItems">
<div class="input-group HideItems">
@ -3417,11 +3397,11 @@
</td>
@*<td class="Workorder" style="text-align:right;"><label class="lglabel " for="txt_Area9">&nbsp;&nbsp;&nbsp;&nbsp;存储区域</label>:</td>
<td class="Workorder" >
<div class="input-group ">
<input id="txt_Area9" type="text" class="form-control " style="width: 100px;">
</div>
</td>*@
<td class="Workorder" >
<div class="input-group ">
<input id="txt_Area9" type="text" class="form-control " style="width: 100px;">
</div>
</td>*@
</tr>
<tr>

3
WMS-BS/NFine.Web/Configs/database.config

@ -6,8 +6,9 @@
<!--<add name="connstr" connectionString="JZjXxiMt8L2hkBlLUD8PBo2VxWR5j1mbj0xyJuwPqY46ywhO56rsfUcuYrySELpMcIISP9ZsoeoRM35Azqruwa16sHbPpvUnLjcXO9dQBsCb0fkixsVZhA==" providerName="System.Data.SqlClient" />-->
<!--本地-->
<!--<add name="connstr" connectionString="terx6nSzhBu3PkkAnpCSyozL3WzAB9fHjBxO0NVXmpe6eOA9kowv/TJOuTy7IT8nOsne+r4F4sCVTYdtU25qsA==" providerName="System.Data.SqlClient" />-->
<add name="connstr" connectionString="rtGBmI26Iovnlhi1pmCU283HlJT7oPnYCzpoKCGyI+c3h86ku+Ux2F7djfwb8dhNZ9BY1kXXzWEL3Ggv1Ma0FLtNl8NdZVmT" providerName="System.Data.SqlClient" />
<!--正式-->
<add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />
<!--<add name="connstr" connectionString="rtGBmI26IovLyEon0NvnkIdIGtERsck4MvG2wvfMHc6XnoqSx8xp4zCTtW6J8SL4+zTBRPXBbFQ4AEnn281E5TY7A1IZOMIr" providerName="System.Data.SqlClient" />-->
<add name="ERPconnstr" connectionString="Server=192.168.1.218;Initial Catalog=ICS_WMS_NW;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
<add name="ATVERPconnstr" connectionString="Server=10.29.2.71;Initial Catalog=ATW-0717;User ID=sa;Password=atw.erp" providerName="System.Data.SqlClient" />
<add name="MailOpen" connectionString="true" />

BIN
WMS-BS/NFine.Web/Content/img/nwlogo2.png

Binary file not shown.

After

Width: 1281  |  Height: 236  |  Size: 89 KiB

9
WMS-BS/NFine.Web/Views/Home/Index.cshtml

@ -30,6 +30,15 @@
</li>
</ul>
</div>
<div class="nav-no-collapse navbar-left pull-left hidden-sm hidden-xs">
<ul class="nav navbar-nav pull-left">
<li>
<img src="~/Content/img/nwlogo2.png"
style="position: inherit; top: 0; left: 0; right: 0; bottom: 0; height: 25px; margin-top: 13px; margin-left: 20px; " />
</li>
</ul>
</div>
<div class="nav-no-collapse pull-right" id="header-nav">
@*<a class="navbar-brand" href="~/ReportFile/系统操作手册.docx" style="font-size:15px;text-decoration:underline">系统操作手册</a>*@
<a id="DownPrintControl" class="navbar-brand" href="~/PrintActivex.exe" style="font-size:15px;text-decoration:underline;width:auto;">下载打印组件</a>

20
WMS-BS/NFine.Web/Views/Login/Index.cshtml

@ -42,12 +42,20 @@
</script>
</head>
<body>
<h1 style="text-align:left; color:white;padding:10px;font-size:50px;font-family:黑体">&nbsp;&nbsp; WMS智慧仓储管理系统</h1>
<h1 style="text-align:left; color:white;padding:10px;font-size:50px;font-family:黑体">&nbsp;&nbsp; WMS智慧仓储管理系统</h1>
@*<div style="position: absolute; z-index: 999; top: 20px; left: 20px; color: #fff; font-size: 13px; line-height: 22px;">
在线体验,基于阿里巴巴云主机,采用独立运行环境,提供持续稳定安全服务,24小时均可以访问<br>
用户名 admin 或 guest,密码 0000,请勿在系统内发表不文明信息
</div>*@
@*<div class="title">
<ul>
<li>
<img src="~/Content/img/nwlogo.png"
style="position: inherit; top: 0; left: 0; right: 0; bottom: 0; height: 70px; margin-top: 13px; margin-left: 200px; " />
</li>
</ul>
</div>*@
<div class="login_box">
<div class="title">
<span>WMS智慧仓储管理系统</span>
@ -55,6 +63,12 @@
<div class="content">
<div class="login_form">
<div class="LoginTile" style="text-align:center;font-size:25px;font-weight:bold">
<img src="~/Content/img/nwlogo.png"
style="position: absolute; top: 0; left: 0; right: 0; bottom: 0; height: 40px; margin-top: 15px; margin-left: 0px; " />
<span style="">登 录</span>
</div>
<dl>
@ -162,7 +176,7 @@
$(".container").css("margin-top", ($(window).height() - $(".container").height()) / 2 - 50);
});
$("#switchCode").click(function () {
$("#imgcode").attr("src", "/Login/GetAuthCode?time=" + Math.random());
$("#imgcode").attr("src", "/Login/GetAuthCode?time=" + Math.random());
});
var login_error = top.$.cookie('nfine_login_error');
if (login_error != null) {

|||||||
100:0
Loading…
Cancel
Save