From 98671d2b1473b1e3e55abbdd3304fc3cd8c33959 Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期三, 16 十月 2024 18:14:38 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 33 ++++++++++
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 15 +++-
Wms/Wms/CreateBoxInfo.json | 84 ++++++++++++++--------------
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 5 +
4 files changed, 90 insertions(+), 47 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index faa19db..a64eb06 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2552,8 +2552,13 @@
detailModel.SupplierName = notice.CustomerName;//渚涘簲鍟嗗悕绉�
}
#region 缁存姢璐ㄦ缁撴灉
+
//鑾峰彇璇ユ壒娆℃渶缁堣川妫�缁撴灉
var quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
+ if (notice.Type == "3")
+ {
+ quality = Db.Queryable<BllQualityInspect>().Where(a => a.LotNo == noticeDetail.LotNo && a.ASNNo == notice.ASNNo && a.IsDel == "0").OrderByDescending(a => a.CreateTime).First();
+ }
if (quality != null)
{
//淇敼鍚堟牸涓嶅悎鏍兼暟閲�
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 7ccaf70..ff2c8d6 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -539,7 +539,7 @@
{
var biaoShi = "0";//0锛氭暣绠辨嫞璐с��1锛氭暎鏀嫞璐с��2锛氭暟閲忔嫞璐�
List<DataBoxInfo> boxInfos;
- var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo);
+ var boxInfo = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == boxNo && m.StockDetailId == stockDetail.Id);
if (boxInfo.Count() == 0)
{
throw new Exception("鏈煡璇㈠埌璇ョ鐮佸強杩芥函鐮佺殑淇℃伅");
@@ -653,6 +653,7 @@
if (biaoShi != "2")
{
+ pickQty += item.Qty;
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏
Db.Deleteable(item).ExecuteCommand();
}
@@ -660,17 +661,20 @@
{
if (decimal.Parse(pickQty1) == item.Qty)
{
+ pickQty += item.Qty;
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏
Db.Deleteable(item).ExecuteCommand();
+
}
else
{
+ pickQty += decimal.Parse(pickQty1);
item.Qty -= decimal.Parse(pickQty1);
item.BitBoxMark = "1";//闆剁鏍囪瘑
Db.Updateable(item).ExecuteCommand();
}
}
- pickQty += item.Qty;
+
}
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
if (biaoShi == "1")
@@ -3230,6 +3234,7 @@
if (biaoShi != "2")
{
+ pickQty += item.Qty;
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏
Db.Deleteable(item).ExecuteCommand();
}
@@ -3237,17 +3242,19 @@
{
if (decimal.Parse(pickQty1) == item.Qty)
{
+ pickQty += item.Qty;
//鍒犻櫎搴撳瓨绠辩爜鏄庣粏
Db.Deleteable(item).ExecuteCommand();
}
else
{
+ pickQty += decimal.Parse(pickQty1);
item.Qty -= decimal.Parse(pickQty1);
item.BitBoxMark = "1";//闆剁鏍囪瘑
Db.Updateable(item).ExecuteCommand();
}
}
- pickQty += item.Qty;
+
}
//鏀瑰彉搴撳唴绠辩爜鏄惁闆剁淇℃伅
if (biaoShi == "1")
@@ -4265,7 +4272,7 @@
PalletNo3 = item.PalletNo3,
Qty = decimal.Parse(pickQty1),
FullQty = item.FullQty,
- Status = "4",
+ Status = "5",
LotNo = item.LotNo,
LotText = item.LotText,
SkuNo = item.SkuNo,
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 19e38e9..bccc202 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3239,10 +3239,41 @@
throw new Exception("鑾峰彇澶辫触锛屽嚭搴撳崟鐘舵�佷笉鍏佽!");
}
}
-
+ string inspectStatus = string.Empty;
+ switch (notice.Type)//0锛氬師鏂� 1锛氬寘鏉� 2锛氭垚鍝� 3锛氳�楁潗 4锛氬崐鎴愬搧
+ {
+ case "0"://鎴愬搧鍑哄簱
+ inspectStatus = "1";
+ break;
+ case "1"://棰嗘枡鍑哄簱
+ inspectStatus = "1";
+ break;
+ case "2"://鎶芥鍑哄簱
+ inspectStatus = "0,1,2";
+ break;
+ case "3"://鐗╂枡鍙栨牱鍑哄簱
+ inspectStatus = "0";
+ break;
+ case "4"://涓嶅悎鏍煎搧鍑哄簱
+ inspectStatus = "2";
+ break;
+ case "5"://涓棿鍝佸嚭搴�
+ inspectStatus = "1";
+ break;
+ case "6"://浠ｅ偍鍑哄簱
+ inspectStatus = "0,1,2";
+ break;
+ case "8"://瀵勫瓨鍑哄簱
+ inspectStatus = "0,1";
+ break;
+ default: //鍏跺畠鍑哄簱
+ inspectStatus = "0,1";
+ break;
+ }
#endregion
Expression<Func<DataStockDetail, bool>> item = Expressionable.Create<DataStockDetail>()
+ .AndIF(!string.IsNullOrWhiteSpace(inspectStatus), m => inspectStatus.Contains(m.InspectStatus))
.AndIF(!string.IsNullOrWhiteSpace(houseNo), m => m.WareHouseNo == houseNo)
.AndIF(!string.IsNullOrWhiteSpace(roadwayNo), m => m.RoadwayNo == roadwayNo)
.AndIF(!string.IsNullOrWhiteSpace(locateNo), m => m.LocatNo == locateNo)
diff --git a/Wms/Wms/CreateBoxInfo.json b/Wms/Wms/CreateBoxInfo.json
index 861478d..ba0a2f1 100644
--- a/Wms/Wms/CreateBoxInfo.json
+++ b/Wms/Wms/CreateBoxInfo.json
@@ -1,48 +1,48 @@
[
{
- "OrderCode": "", //明细生产单据号
- "BoxNo": "B2408190001000001", //箱号
- "BoxNo2": "", //盒号
- "BoxNo3": "Z24081900010001", //支号
- "Qty": 1, //数量
- "FullQty": 2, //满箱数量
- "SkuNo": "00001", //物料编码
- "SkuName": "测试物料1", //物料名称
- "LotNo": "CPPC240818001", //批次
- "LotText": "", //批次描述
- "SupplierLot":"GH240818001",
- "ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
- "ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
- "InspectMark": "0", //检验/抽检 标记 0否 1是
- "BitBoxMark": "0", //零箱标记 0否 代表整箱 1是 代表零箱
- "InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
- "Standard": "", //物料规格
- "PackageStandard": "", //包装规格
- "StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
- "QtyOrd": 5, //第几件
- "QtyCount": 5 //总件数
+ "OrderCode": "", //锟斤拷细锟斤拷锟斤拷锟斤拷锟捷猴拷
+ "BoxNo": "BCP24101601000002", //锟斤拷锟�
+ "BoxNo2": "HCP24101601000006", //锟叫猴拷
+ "BoxNo3": "ZCP24101601000011", //支锟斤拷
+ "Qty": 1, //锟斤拷锟斤拷
+ "FullQty": 10, //锟斤拷锟斤拷锟斤拷锟斤拷
+ "SkuNo": "CP00201", //锟斤拷锟较憋拷锟斤拷
+ "SkuName": "杈炬牸鍒楀噣浜岀敳鍙岃儘缂撻噴鐗�", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "LotNo": "CP24101601", //锟斤拷锟斤拷
+ "LotText": "", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "SupplierLot":"",
+ "ProductionTime": "2024-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "ExpirationTime": "2025-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "InspectMark": "0", //锟斤拷锟斤拷/锟斤拷锟� 锟斤拷锟� 0锟斤拷 1锟斤拷
+ "BitBoxMark": "1", //锟斤拷锟斤拷锟斤拷 0锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷 1锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷
+ "InspectStatus": "0", //锟绞硷拷状态 0锟斤拷锟斤拷锟斤拷 1锟较革拷 2锟斤拷锟较革拷 3锟斤拷锟斤拷锟斤拷
+ "Standard": "", //锟斤拷锟较癸拷锟�
+ "PackageStandard": "", //锟斤拷装锟斤拷锟�
+ "StoreTime": "2025-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "QtyOrd": 0, //锟节硷拷锟斤拷
+ "QtyCount": 0 //锟杰硷拷锟斤拷
},
{
- "OrderCode": "", //明细生产单据号
- "BoxNo": "B2408190001000001", //箱号
- "BoxNo2": "", //盒号
- "BoxNo3": "Z24081900010002", //支号
- "Qty": 1, //数量
- "FullQty": 2, //满箱数量
- "SkuNo": "00001", //物料编码
- "SkuName": "测试物料1", //物料名称
- "LotNo": "CPPC240818001", //批次
- "LotText": "", //批次描述
- "SupplierLot":"GH240818001",
- "ProductionTime": "2024-08-19T02:16:45.301Z", //生产日期
- "ExpirationTime": "2025-08-19T02:16:45.301Z", //过期日期
- "InspectMark": "0", //检验/抽检 标记 0否 1是
- "BitBoxMark": "0", //零箱标记 0否 代表整箱 1是 代表零箱
- "InspectStatus": "0", //质检状态 0待检验 1合格 2不合格 3放置期
- "Standard": "", //物料规格
- "PackageStandard": "", //包装规格
- "StoreTime": "2025-08-19T02:16:45.301Z", //储存期至
- "QtyOrd": 5, //第几件
- "QtyCount": 5 //总件数
+ "OrderCode": "", //锟斤拷细锟斤拷锟斤拷锟斤拷锟捷猴拷
+ "BoxNo": "BCP24101601000002", //锟斤拷锟�
+ "BoxNo2": "HCP24101601000006", //锟叫猴拷
+ "BoxNo3": "ZCP24101601000012", //支锟斤拷
+ "Qty": 1, //锟斤拷锟斤拷
+ "FullQty": 10, //锟斤拷锟斤拷锟斤拷锟斤拷
+ "SkuNo": "CP00201", //锟斤拷锟较憋拷锟斤拷
+ "SkuName": "杈炬牸鍒楀噣浜岀敳鍙岃儘缂撻噴鐗�", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "LotNo": "CP24101601", //锟斤拷锟斤拷
+ "LotText": "", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "SupplierLot":"",
+ "ProductionTime": "2024-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "ExpirationTime": "2025-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "InspectMark": "0", //锟斤拷锟斤拷/锟斤拷锟� 锟斤拷锟� 0锟斤拷 1锟斤拷
+ "BitBoxMark": "1", //锟斤拷锟斤拷锟斤拷 0锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷 1锟斤拷 锟斤拷锟斤拷锟斤拷锟斤拷
+ "InspectStatus": "0", //锟绞硷拷状态 0锟斤拷锟斤拷锟斤拷 1锟较革拷 2锟斤拷锟较革拷 3锟斤拷锟斤拷锟斤拷
+ "Standard": "", //锟斤拷锟较癸拷锟�
+ "PackageStandard": "", //锟斤拷装锟斤拷锟�
+ "StoreTime": "2025-10-16T02:16:45.301Z", //锟斤拷锟斤拷锟斤拷锟斤拷
+ "QtyOrd": 0, //锟节硷拷锟斤拷
+ "QtyCount": 0 //锟杰硷拷锟斤拷
}
]
--
Gitblit v1.8.0