Jjie
/
OMAY_WMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

看板及生成条码

master
Juj 8 months ago
parent
47a768eb18
commit
17d10bfe20
2 changed files with 47 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      KanBan/NFine.Application/SRM/WatchPanelApp.cs
  2. 17
      WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml

38
KanBan/NFine.Application/SRM/WatchPanelApp.cs
View File

@ -1390,7 +1390,7 @@ where DNType='1' and a.Quantity-a.RCVQuantity>0";
string SqlText = "";
SqlText = @"
select f.DepName as '产线',e.InvName as '存货编码',sum(c.Quantity) as '数量',
select f.DepName as '产线',e.InvName as '存货编码',sum(case when e.AmountEnable='1' then c.Quantity/isnull(e.EATTRIBUTE1,1) else c.Quantity end ) as '数量' ,
CASE
WHEN DATEDIFF(MINUTE, c.ProductDate, GETDATE()) < 60 THEN CAST(DATEDIFF(MINUTE, c.ProductDate, GETDATE()) AS VARCHAR) + '分钟'
WHEN DATEDIFF(HOUR, c.ProductDate, GETDATE()) < 24 THEN CAST(DATEDIFF(HOUR, c.ProductDate, GETDATE()) AS VARCHAR) + '小时 ' + CAST((DATEDIFF(MINUTE, c.ProductDate, GETDATE()) % 60) AS VARCHAR) + '分钟'
@ -1427,7 +1427,18 @@ order by f.DepName desc ";
string SqlText = "";
SqlText = @"
select OOCode as '委外订单号','' as '状态','' as '出库单号',PlanArriveDate as '发单时间' from ICSOutsourcingOrder";
SELECT
A.OOCode AS '委外订单号','' as '状态','' as '出库单号',MOS.dStartDate as '发单时间'
FROM ICSOutsourcingOrder a
--主表
left join [UFDATA_001_2021].dbo.OM_MOMain MO on MO.cCode = a.OOCode
--子表
left join [UFDATA_001_2021].dbo.OM_MODetails MOS on MOS.MOID = MO.MOID AND a.Sequence=MOS.iVouchRowNo
--子件表
left join [UFDATA_001_2021].dbo.OM_MOMaterials MOM on MOM.MoDetailsID = MOS.MoDetailsID
where MOM.iQuantity>iSendQTY and MO.cState='1'
GROUP BY A.OOCode,MOS.dStartDate
order by MOS.dStartDate desc";
DataTable dt = SqlHelper.GetDataTableBySql(SqlText) ;
@ -1487,7 +1498,7 @@ else a.仓库F end as '产线'
from dbo.ICSWareHouseLotInfoLog a
inner join dbo.ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
inner join dbo.ICSWarehouse c on a.ToWarehouseCode=c.WarehouseCode and a.WorkPoint=c.WorkPoint
where BusinessCode in ('70','47') and a.TransType in ('6','14')
where BusinessCode in ('70','47') and a.TransType in ('6','14') and format(a.MTIME , 'yyyy-MM-dd') =format(getdate() , 'yyyy-MM-dd')
and (a.FromWarehouseCode in('021','022','023','024','025','026','027')or a.ToWarehouseCode in('021','022','023','024','025','026','027'))
)a
group by a.调拨时间 ,a.存货编码,a.存货名称,a.仓库F,a.仓库T
@ -1556,7 +1567,8 @@ where DNType='1' and a.Quantity-a.RCVQuantity>0
)b
select count(*) as CPWRK into #Temp3 from (select f.DepName as '产线',e.InvName as '存货编码',sum(c.Quantity) as '数量',
select count(*) as CPWRK into #Temp3 from (
select f.DepName as '产线',e.InvName as '存货编码',sum(case when e.AmountEnable='1' then c.Quantity/isnull(e.EATTRIBUTE1,1) else c.Quantity end ) as '数量' ,
CASE
WHEN DATEDIFF(MINUTE, c.ProductDate, GETDATE()) < 60 THEN CAST(DATEDIFF(MINUTE, c.ProductDate, GETDATE()) AS VARCHAR) + '分钟'
WHEN DATEDIFF(HOUR, c.ProductDate, GETDATE()) < 24 THEN CAST(DATEDIFF(HOUR, c.ProductDate, GETDATE()) AS VARCHAR) + '小时 ' + CAST((DATEDIFF(MINUTE, c.ProductDate, GETDATE()) % 60) AS VARCHAR) + '分钟'
@ -1574,11 +1586,23 @@ inner join dbo.ICSInventory e on a.InvCode=e.InvCode and a.WorkPoint=e.WorkPoint
left join dbo.ICSWareHouseLotInfo d on c.LotNo=d.LotNo and a.WorkPoint=b.WorkPoint
inner join ICSDepartment f on a.DepCode=f.DepCode and a.WorkPoint=f.WorkPoint
where isnull(d.LotNo,'')=''
group by c.ProductDate,e.InvName,f.DepName)c
group by c.ProductDate,e.InvName,f.DepName
)c
select count(*) as WWJG into #Temp4 from (
select OOCode as '委外订单号','' as '状态','' as '出库单号',PlanArriveDate as '发单时间' ,'green' as Status from ICSOutsourcingOrder
SELECT
A.OOCode AS '委外订单号','' as '状态','' as '出库单号',MOS.dStartDate as '发单时间'
FROM ICSOutsourcingOrder a
--主表
left join [UFDATA_001_2021].dbo.OM_MOMain MO on MO.cCode = a.OOCode
--子表
left join [UFDATA_001_2021].dbo.OM_MODetails MOS on MOS.MOID = MO.MOID AND a.Sequence=MOS.iVouchRowNo
--子件表
left join [UFDATA_001_2021].dbo.OM_MOMaterials MOM on MOM.MoDetailsID = MOS.MoDetailsID
where MOM.iQuantity>iSendQTY and MO.cState='1'
GROUP BY A.OOCode,MOS.dStartDate
)d
@ -1605,7 +1629,7 @@ else a.仓库F end as '产线'
from dbo.ICSWareHouseLotInfoLog a
inner join dbo.ICSInventory b on a.InvCode=b.InvCode and a.WorkPoint=b.WorkPoint
inner join dbo.ICSWarehouse c on a.ToWarehouseCode=c.WarehouseCode and a.WorkPoint=c.WorkPoint
where BusinessCode in ('70','47') and a.TransType in ('6','14')
where BusinessCode in ('70','47') and a.TransType in ('6','14') and format(a.MTIME , 'yyyy-MM-dd') =format(getdate() , 'yyyy-MM-dd')
and (a.FromWarehouseCode in('021','022','023','024','025','026','027')or a.ToWarehouseCode in('021','022','023','024','025','026','027'))
)a
group by a.调拨时间 ,a.存货编码,a.存货名称,a.仓库F,a.仓库T

17
WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
View File

@ -153,8 +153,14 @@
if (data.rows[0].AmountEnable == '1') {
InvAmountEnable = true;
} else {
minPackQtyEnable = true;
}
$("#InvProportion").val(data.rows[0].EATTRIBUTE1);
//if (data.rows[0].EATTRIBUTE1=='1') {
// InvAmountEnable = false;
//}
}
});
}
@ -755,6 +761,7 @@
//最小包装量改变事件
function minPack_Change() {
debugger;
//最小+张数
if (minPackQtyEnable == true && cretePageCountEnable == true) {
minPackAndcretePageCount();
@ -785,14 +792,17 @@
if (thisCreateQtyEnable == true && cretePageCountEnable == true) {
thisCreateAndcretePageCount();
}
//张数+最小
else if (minPackQtyEnable == true && cretePageCountEnable == true)
{
debugger;
minPackAndcretePageCount();
}
//张数+辅
else
{
// thisCreateAndcretePageCount();
AmountAndcretePageCount();
}
@ -931,6 +941,7 @@
//本+张数
function thisCreateAndcretePageCount() {
debugger;
var thisCreateQty = $("#thisCreateQty").val() * 1;//本次生成数量
thisCreateQty = thisCreateQty.toFixed(6);
var cretePageCount = $("#cretePageCount").val() * 1;//张数
@ -1032,7 +1043,7 @@
// var YAmount = $("#YAmount").val() * 1;//单据辅计量数量
//校验
//var flag1 = thisCreateQty_Change();
if (Number(createPageCount)>100) {
if (Number(createPageCount)>150) {
$.modalAlert("生成张数不可超过100！", "warning");
return;
}
@ -1581,9 +1592,9 @@
</td>
</tr>
<tr>
<th class="formTitle"><span style="color: red;">*</span>剩余可生成数量</th>
<th class="formTitle"><span style="color: red;">*</span>待生成数量</th>
<td class="formValue">
<input id="SurplusCreateQty" name="SurplusCreateQty" type="text" class="form-control required" placeholder="请输入本次生成数量" disabled="disabled"/>
<input id="SurplusCreateQty" name="SurplusCreateQty" type="text" class="form-control required" placeholder="请输入待生成数量" disabled="disabled"/>
</td>
</tr>
<tr id="ZHU">

Write Preview
Loading…
Cancel
Save