From b31f32fbfb25c77567e3853e05ca114dd2a00fbe Mon Sep 17 00:00:00 2001
From: chengsc <Demo@DESKTOP-CPA90BF>
Date: 星期一, 14 十月 2024 18:58:22 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 154 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 54 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index fdbe63d..c905806 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -30,16 +30,33 @@
private static readonly SqlSugarScope Db = DataContext.Db;
// 鑾峰彇鍗曟嵁鍒楄〃
- public List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model)
+ public List<string> GetArrivalNotices(ArrivalNoticeVm model)
{
string sqlString = string.Empty;
try
{
// 鏈叧鍗曠殑鍗曟嵁
- sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4' and IsDel='0' order by CreateTime;";
- var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
+ //sqlString = $"select * from BllArrivalNotice where Type in ({model.Type}) and Status != '3' and Status != '4' and IsDel='0' order by CreateTime;";
+ //var modelList = Db.Ado.SqlQuery<ArrivalNoticeDto>(sqlString);
- return modelList;
+ //model.Type锛氬崟鎹被鍨� 鍦ㄨ繖閲屼唬琛ㄥ墠绔〉绛剧被鍨嬶細鍗虫爣绛鹃〉绛撅細璐存爣鐗╂枡锛� 鏁伴噺椤电锛氫笉璐磋〃鐗╂枡锛屽師鍥狅細鎳掑緱鍔犲弬鏁�
+ var data = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.Status != "3" && m.Status != "4").Select(m=>m.ASNNo).ToList();
+ var list = new List<string>();
+ if (model.Type == "0")//0璐存爣
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m =>m.IsDel == "0" && data.Contains(m.ASNNo) && !string.IsNullOrWhiteSpace(m.PackagNo)).Select(m => m.ASNNo).Distinct().ToList();
+ }
+ else if(model.Type == "1")//1涓嶈创鏍�
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && data.Contains(m.ASNNo) && string.IsNullOrWhiteSpace(m.PackagNo)).Select(m=>m.ASNNo).Distinct().ToList();
+ }
+ else
+ {
+ throw new Exception("椤电绫诲瀷鍙傛暟閿欒");
+ }
+
+
+ return list;
}
catch (Exception ex)
{
@@ -1699,9 +1716,73 @@
var data = new { BoxNo = boxNo };
var jsonData = JsonConvert.SerializeObject(data);
+ #region 娴嬭瘯鐗堟湰
+
+ //璇诲彇json鏂囦欢锛屾坊鍔犳暟鎹�
+ var ss = AppDomain.CurrentDomain.BaseDirectory;
+ string filePath = Path.Combine(ss, "CreateBoxInfo.json");
+ string json = File.ReadAllText(filePath);
+ var person = JsonConvert.DeserializeObject<List<BllBoxInfo>>(json);
+
+ var comTime = DateTime.Now;
+ //娣诲姞绠辩爜淇℃伅琛ㄤ腑 //鏆傛椂杩欎簺鍐�--娣诲姞鏁版嵁锛屽悗缁渶瑕佸拰璧嬬爜绯荤粺瀵规帴鍚� 鏍规嵁鏄庣‘杩斿洖鐨勬暟鎹牸寮忔洿鏀�
+ foreach (var item in person)
+ {
+ if (item.BoxNo!= boxNo)
+ {
+ continue;
+ }
+
+ var sku = Db.Queryable<SysMaterials>().First(m=>m.IsDel =="0" && m.SkuNo == item.SkuNo);
+ if (sku == null)
+ {
+ continue;
+ }
+ var boxInfo = new BllBoxInfo()
+ {
+ ASNNo = "",
+ //ASNDetailNo = 0,
+ OrderCode = "",
+ //BindNo = 0,
+ BoxNo = item.BoxNo,
+ BoxNo2 = item.BoxNo2,
+ BoxNo3 = item.BoxNo3,
+ PalletNo = "",
+ Qty = item.Qty,
+ FullQty = item.FullQty,
+ Status = "0",
+ SkuNo = item.SkuNo,
+ SkuName = sku.SkuName,
+ LotNo = item.LotNo,
+ LotText = item.LotText,
+ SupplierLot = item.SupplierLot,
+ ProductionTime = item.ProductionTime,
+ ExpirationTime = item.ExpirationTime,
+ //CompleteTime = comTime,
+ InspectMark = item.InspectMark,
+ BitBoxMark = item.BitBoxMark,
+ InspectStatus = item.InspectStatus,
+ Origin = "璧嬬爜",
+ Standard = item.Standard,
+ PackageStandard = item.PackageStandard,
+ StoreTime = item.StoreTime,
+ QtyOrd = item.QtyOrd,
+ QtyCount = item.QtyCount,
+ CreateUser = 0,
+ CreateTime = comTime,
+ };
+ list.Add(boxInfo);
+ }
+ Db.Insertable(list).ExecuteCommand();
+
+ #endregion
+
+ #region 姝ｅ紡鐗堟湰
+
+
////绋嬪簭姝ｅ紡鍙戝竷鍚庢斁寮�
//var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //var response = HttpHelper.DoPost(url, jsonData,"鑾峰彇绠辩爜淇℃伅", "璧嬬爜");
+ //var response = HttpHelper.DoPost(url, jsonData, "鑾峰彇绠辩爜淇℃伅", "璧嬬爜");
//var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
////瑙ｆ瀽杩斿洖鏁版嵁
@@ -1709,55 +1790,13 @@
//if (fuMaModel.Success == 0)
//{
- var datas = Assembly.GetExecutingAssembly();
- var s = "0";
- //string filePath = "Assembly.GetExecutingAssembly()";
- //string json = File.ReadAllText(filePath);
- //var person = JsonConvert.DeserializeObject<BllBoxInfo>(json);
-
- //var comTime = DateTime.Now;
- ////娣诲姞绠辩爜淇℃伅琛ㄤ腑 //鏆傛椂杩欎簺鍐�--娣诲姞鏁版嵁锛屽悗缁渶瑕佸拰璧嬬爜绯荤粺瀵规帴鍚� 鏍规嵁鏄庣‘杩斿洖鐨勬暟鎹牸寮忔洿鏀�
- //var boxInfo = new BllBoxInfo()
- //{
- // ASNNo = "",
- // //ASNDetailNo = 0,
- // OrderCode = "",
- // //BindNo = 0,
- // BoxNo = person.BoxNo,
- // BoxNo2 = "",
- // BoxNo3 = "",
- // PalletNo = "",
- // Qty = 0,
- // FullQty = 0,
- // Status = "0",
- // SkuNo = "",
- // SkuName = "",
- // LotNo = "",
- // LotText = "",
- // SupplierLot = "",
- // ProductionTime = DateTime.Now,
- // ExpirationTime = DateTime.Now,
- // //CompleteTime = comTime,
- // InspectMark = "0",
- // BitBoxMark = "0",
- // InspectStatus = "0",
- // Origin = "璧嬬爜",
- // Standard = "box.Standard",
- // PackageStandard = "box.PackageStandard",
- // StoreTime = DateTime.Now,
- // CreateUser = 0,
- // CreateTime = comTime,
- //};
- //Db.Insertable(boxInfo).ExecuteCommand();
-
//}
//if (fuMaModel.Success == -1)
//{
// throw new Exception($"璧嬬爜绯荤粺杩斿洖鐘舵�佸紓甯革細{fuMaModel.Message}");
//}
-
+ #endregion
-
}
catch (Exception e)
{
@@ -1778,12 +1817,19 @@
{
throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
}
- var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
- if (count == 0)
+ if (!string.IsNullOrWhiteSpace(model.ASNNo))
{
- GetBoxInfoByFuMa("",""); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ var asnData = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == model.ASNNo);
+ if (asnData != null && (asnData.Type == "0" || asnData.Type == "3"))
+ {
+ var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo == model.BoxNo);
+ if (count == 0)
+ {
+ GetBoxInfoByFuMa(model.BoxNo, ""); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ }
+ }
+
}
-
string sqlString = $@"SELECT
ASNNo,
BoxNo,
@@ -1797,7 +1843,7 @@
AND BoxNo = '{model.BoxNo}'
GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo; ";
var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
- if (models == null)
+ if (models.Count == 0)
{
throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦�!");
}
@@ -2490,7 +2536,7 @@
PackagNo = sku.PackagNo,
IsBale = bindInfo.IsBale,
IsBelt = bindInfo.IsBelt,
-
+ Demo = bindInfo.Demo,
CreateUser = (int)model.CreateUser,
CreateTime = serverTime
};
--
Gitblit v1.8.0