From 17d10bfe20bd217d97ff50b9cbcdb20bfae02f8f Mon Sep 17 00:00:00 2001
From: Juj <1005539536@qq.com>
Date: Wed, 26 Jun 2024 14:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E5=8F=8A=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E6=9D=A1=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
KanBan/NFine.Application/SRM/WatchPanelApp.cs | 42 +++++++++++++++----
.../WMS/Views/WMSCreateItemLot/From.cshtml | 17 ++++++--
2 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/KanBan/NFine.Application/SRM/WatchPanelApp.cs b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
index 8a3c49d..f2bb66c 100644
--- a/KanBan/NFine.Application/SRM/WatchPanelApp.cs
+++ b/KanBan/NFine.Application/SRM/WatchPanelApp.cs
@@ -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) + '分钟'
@@ -1408,7 +1408,7 @@ 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
+group by c.ProductDate,e.InvName,f.DepName
order by f.DepName desc ";
@@ -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,16 +1586,28 @@ 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
select count(*) as DB into #Temp5 from(
- select a.存货编码,a.存货名称,a.数量,
+ select a.存货编码,a.存货名称,a.数量,
case when a.产线='021' then 'L1' when a.产线='022' then 'L2' when a.产线='023' then 'L3' when a.产线='024' then 'L4'
when a.产线='025' then 'L5' when a.产线='026' then 'L6' when a.产线='027' then 'L7' when a.产线='015' then 'C1' end as '产线'
,a.调拨时间 from (
@@ -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
diff --git a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
index 01f8f7e..24421ac 100644
--- a/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
+++ b/WMS-BS/NFine.Web/Areas/WMS/Views/WMSCreateItemLot/From.cshtml
@@ -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 @@