陆晔 2 years ago
parent
commit
b57fb126cf
  1. 1
      ICSSoft.FromERP/ICSSoft.FromERP/ICSInventory.cs
  2. 6
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs
  3. 4
      ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
  4. 5
      KanBan/NFine.Application/SRM/WatchPanelApp.cs
  5. 13
      KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml
  6. 53
      WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
  7. 4
      WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

1
ICSSoft.FromERP/ICSSoft.FromERP/ICSInventory.cs

@ -102,6 +102,7 @@ namespace ICSSoft.FromERP
line.MTIME = DateTime.Now;
line.DrawingNo = item.TEST1;//图号
line.Version = item.TEST2;//版本
line.LotEnable = true;
if (isNew == true)
{
db.ICSInventory.InsertOnSubmit(line);

6
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs

@ -517,9 +517,11 @@ namespace ICSSoft.DataProject
#endregion
#region 领料后料架解绑或搬运至空料架区
string chksql = @" select A.ContainerCode,A.EATTRIBUTE5,B.Desks from ICSContainerReceiptsNumber A
string chksql = @" select A.ContainerCode,A.EATTRIBUTE5,C.Desks from ICSContainerReceiptsNumber A
INNER JOIN ICSMOApply B ON B.ApplyCode=A.TransCode
where ContainerCode=(
INNER JOIN (SELECT TOP 1 EATTRIBUTE3 AS Desks,ContainerCode from ICSAGVTaskLog WHERE EATTRIBUTE2='' Order By MTIME DESC) C ON
C.ContainerCode=A.ContainerCode
where A.ContainerCode=(
select top 1 ContainerCode from ICSContainerReceiptsNumber
where TransCode='{0}')";
chksql = string.Format(chksql, TransCode);

4
ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@ -7608,9 +7608,9 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
{
if (JsonData.taskCode.Contains("CK"))
{
logsql = @"update ICSAGVTaskLog set MTIME=GETDATE(),EATTRIBUTE2='已完成'
logsql = @"update ICSAGVTaskLog set MTIME=GETDATE(),EATTRIBUTE2='已完成',EATTRIBUTE3='{1}'
WHERE TaskCode='{0}'";
logsql = string.Format(logsql, JsonData.taskCode);
logsql = string.Format(logsql, JsonData.taskCode, JsonData.taskCode);
DBHelper.ExecuteNonQuery(connString, CommandType.Text, logsql);
}
else

5
KanBan/NFine.Application/SRM/WatchPanelApp.cs

@ -226,7 +226,7 @@ and CreatedOn>CAST(CAST(GETDATE() as date) as varchar(10)) + ' 00:00:00' and st
string SqlText = $@" SELECT
a.ApplyCode,
A.Sequence,
a.SAPSequence,
--a.SAPSequence,
a.InvCode,
c.LotNo,
c.Quantity,
@ -236,7 +236,8 @@ and CreatedOn>CAST(CAST(GETDATE() as date) as varchar(10)) + ' 00:00:00' and st
FROM
ICSMOApply a
-- INNER JOIN ICSContainerReceiptsNumber b ON a.ApplyCode= b.TransCode
INNER JOIN ICSWareHouseLotInfoLog c ON a.ApplyCode= c.TransCode AND
INNER JOIN ICSWareHouseLotInfoLog c ON a.ApplyCode= c.TransCode
AND
c.BusinessCode= '15'
AND a.Sequence= c.TransSequence
INNER JOIN ( SELECT DISTINCT e.StartLocation,e.EndLocation FROM

13
KanBan/NFine.Web/Areas/WMS/Views/WatchPanel/PanelWIP2.cshtml

@ -204,10 +204,15 @@
// <span class="span1">子件项数</span> <span class="span1">完成项数</span>
var html = "<ul>";
for (var i = 0; i < data.length; i++) {
html += ' <li> <span>' + data[i].ApplyCode + '</span> <span class="span2">' + data[i].Sequence + '</span> <span class="span2">' + data[i].SAPSequence + '</span>';
html += ' <span class="span1">' + data[i].InvCode + '</span> <span class="span1">' + data[i].LotNo + '</span> <span class="span1">' + data[i].Quantity + '</span>';
html += ' <span class="span1">' + data[i].FromLocationCode + '</span> <span class="span1">' + data[i].LocationCode + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>';
//html += ' <span>' + data[i].完成项数 + '</span>';
//html += ' <li> <span>' + data[i].ApplyCode + '</span> <span class="span2">' + data[i].Sequence;// + '</span> <span class="span2">' + data[i].SAPSequence + '</span>';
//html += ' <span class="span1">' + data[i].InvCode + '</span> <span class="span1">' + data[i].LotNo + '</span> <span class="span1">' + data[i].Quantity + '</span>';
//html += ' <span class="span1">' + data[i].StartLocation + '</span> <span class="span1">' + data[i].EndLocation + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>';
////html += ' <span>' + data[i].完成项数 + '</span>';
html += ' <li> <span>' + data[i].ApplyCode + '</span> <span class="span2">' + data[i].Sequence + '</span> <span class="span2">' + data[i].InvCode + '</span>';
html += '<span class="span1">' + data[i].LotNo + '</span> <span class="span1">' + data[i].Quantity + '</span>';
html += '<span class="span1">' + data[i].StartLocation + '</span> <span class="span1">' + data[i].EndLocation + '</span>';//<span class="span4">' + data[i].TaskCode + '</span>';
}
html += "</ul>";
$("#WIPRCV").html(html);

53
WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@ -1924,18 +1924,22 @@ left join (select distinct TransCode,TransType,WorkPoint from dbo.ICSWareHouseLo
{
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量大于单据需求数量,请尝试重新拣料。");
}
if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty && (Type == "2" || Type == "5" || Type == "12"))
//if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty && (Type == "2" || Type == "5" || Type == "12"))
//{
// chksql = @" select B.F_Define2 from ICSInventoryDetail A
// INNER JOIN Sys_SRM_ItemsDetail B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint
// where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}'";
// chksql = string.Format(chksql, chkdr["InvCode"].ToString(), chkdr["WHCode"].ToString(), WorkPoint);
// var chkds = Repository().FindDataSetBySql(chksql);
// DataTable chkdt = chkds.Tables[0];
// if (chkdt.Rows.Count != 0)
// {
// throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,货柜单据必须整单拣料,请先核对库存。");
// }
//}
if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty)
{
chksql = @" select B.F_Define2 from ICSInventoryDetail A
INNER JOIN Sys_SRM_ItemsDetail B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint
where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}'";
chksql = string.Format(chksql, chkdr["InvCode"].ToString(), chkdr["WHCode"].ToString(), WorkPoint);
var chkds = Repository().FindDataSetBySql(chksql);
DataTable chkdt = chkds.Tables[0];
if (chkdt.Rows.Count != 0)
{
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,货柜单据必须整单拣料,请先核对库存。");
}
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,货柜单据必须整单拣料,请先核对库存。");
}
}
#endregion
@ -2517,18 +2521,23 @@ a.Sequence,
{
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量大于单据需求数量,请尝试重新拣料。");
}
if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty && (Type == "2" || Type == "5" || Type == "12"))
//if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty && (Type == "2" || Type == "5" || Type == "12"))
//{
// chksql = @" select B.F_Define2 from ICSInventoryDetail A
// INNER JOIN Sys_SRM_ItemsDetail B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint
// where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}'";
// chksql = string.Format(chksql, chkdr["InvCode"].ToString(), chkdr["WHCode"].ToString(), WorkPoint);
// var chkds = Repository().FindDataSetBySql(chksql);
// DataTable chkdt = chkds.Tables[0];
// if (chkdt.Rows.Count != 0)
// {
// throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,货柜单据必须整单拣料,请先核对库存。");
// }
//}
if (Convert.ToDecimal(chkdr["Quantity"]) > ZLQty)
{
chksql = @" select B.F_Define2 from ICSInventoryDetail A
INNER JOIN Sys_SRM_ItemsDetail B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint
where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}'";
chksql = string.Format(chksql, chkdr["InvCode"].ToString(), chkdr["WHCode"].ToString(), WorkPoint);
var chkds = Repository().FindDataSetBySql(chksql);
DataTable chkdt = chkds.Tables[0];
if (chkdt.Rows.Count != 0)
{
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,货柜单据必须整单拣料,请先核对库存。");
}
throw new Exception("物料:" + chkdr["InvCode"].ToString() + "实际拣料数量小于单据需求数量,单据必须整单拣料,请先核对库存。");
}
}
#endregion

4
WMS-BS/NFine.Web/Areas/WMS/Views/PickMaterial/ICSMOPickMerge.cshtml

@ -362,8 +362,8 @@
//},
rowNum: 20,
autoScroll: true,
sortname: 'Code',
sortorder: "desc",
sortname: 'MTIME',
sortorder: "asc",
viewrecords: true,
multiselect: true,
pager: "#gridPager",

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