From 1293aeec722e06dc11b657455941abbc1c274090 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期日, 16 二月 2025 11:23:46 +0800
Subject: [PATCH] 修改与小车接口
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 1495 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 1,378 insertions(+), 117 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index ea55e4a..b38fcf2 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -17,6 +17,14 @@
using Model.ModelDto.PdaDto;
using Dm;
using Model.InterFaceModel;
+using WMS.Entity.BllQualityEntity;
+using Newtonsoft.Json;
+using Utility.Tools;
+using System.Reflection;
+using System.IO;
+using System.Security.Cryptography.X509Certificates;
+using System.Net.WebSockets;
+using WMS.BLL.SysServer;
namespace WMS.BLL.BllPdaServer
{
@@ -24,15 +32,132 @@
{
private static readonly SqlSugarScope Db = DataContext.Db;
+ #region 淇敼鎵樼洏缁戝畾鏃跺叆搴撳崟鍘婚櫎鍙樹负鐗╂枡+鏁伴噺
+
+ /// <summary>
+ /// 鑾峰彇鍗曟嵁鏄庣粏鏄剧ず鐨勭墿鏂�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public List<ArrivalNoticeDetailDto> GetArrivalNoticesInfo(ArrivalNoticeVm model)
+ {
+ try
+ {
+ //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<ArrivalNoticeDetailDto>();
+ if (model.Type.Contains("0"))//0璐存爣
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && data.Contains(m.ASNNo) && !string.IsNullOrWhiteSpace(m.PackagNo)).Select(m => new ArrivalNoticeDetailDto()).ToList();
+ }
+ else if (model.Type.Contains("1"))//1涓嶈创鏍�
+ {
+ list = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && data.Contains(m.ASNNo) && string.IsNullOrWhiteSpace(m.PackagNo)).Select(m=>new ArrivalNoticeDetailDto()).ToList();
+ }
+ else
+ {
+ throw new Exception("椤电绫诲瀷鍙傛暟閿欒");
+ }
+
+ List<ArrivalNoticeDetailDto> noticeList = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in list)
+ {
+ if (string.IsNullOrEmpty(item.LotNo))
+ {
+ noticeList.Add(item);
+ }
+ else
+ {
+ string[] LotNoList = item.LotNo.Split(';');
+ foreach (var item2 in LotNoList)
+ {
+ ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
+ {
+ Id = item.Id,
+ ASNNo = item.ASNNo,
+ CompleteQty = item.CompleteQty,
+ CompleteTime = item.CompleteTime,
+ CreateTime = item.CreateTime,
+ Qty = item.Qty,
+ FactQty = item.FactQty,
+ LotNo = item2,
+ Money = item.Money,
+ PackagNo = item.PackagNo,
+ PackagName = item.PackagName,
+ Status = item.Status,
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ };
+
+
+ noticeList.Add(entry);
+ }
+ }
+ }
+ //List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+ //foreach (var item in noticeList)
+ //{
+ // string str = BySkuNoGetPackInfo(item.SkuNo);
+ // if (str == "瀛樺湪")
+ // {
+ // list.Add(item);
+ // }
+ //}
+
+ return noticeList;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ #endregion
+
// 鑾峰彇鍗曟嵁鍒楄〃
- 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);
+
+ //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.Contains("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.Contains("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)
+ {
+ throw ex;
+ }
+ }
+
+ //鏍规嵁鍏ュ簱鍗曞彿鑾峰彇鍏ュ簱鎬诲崟淇℃伅
+ public List<BllArrivalNotice> GetArrivalNotice(ArrivalNoticeVm model)
+ {
+ string sqlString = string.Empty;
+ try
+ {
+ sqlString = $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isdel='0' ";
+ var modelList = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString);
return modelList;
}
@@ -51,7 +176,17 @@
sqlString = $"select * from BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' and isdel='0' order by CreateTime;";
var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
- return modelList;
+ List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in modelList)
+ {
+ string str = BySkuNoGetPackInfo(item.SkuNo);
+ if (str == "涓嶅瓨鍦�")
+ {
+ list.Add(item);
+ }
+ }
+
+ return list;
}
catch (Exception ex)
{
@@ -75,6 +210,8 @@
if (modelList.Count > 0)
{
+ var notice = Db.Queryable<BllArrivalNotice>().First(m=>m.IsDel == "0" && m.ASNNo == modelList[0].ASNNo);
+ modelList[0].UDF5 = notice.Demo;
return modelList[0];
}
@@ -197,6 +334,7 @@
public string BindNullPallet(PalletBindVm model)
{
string strMsg = "";
+ string type = model.BindType == "0" ? "PDA" : "鍙犳墭鏈�";
try
{
var datetime = Db.GetDate();
@@ -304,7 +442,7 @@
LotText = "",
SupplierLot = "",
InspectStatus = "1",
- Origin = "PDA",
+ Origin = type,
BoxNo = "",
BoxNo2 = "",
BoxNo3 = "",
@@ -335,6 +473,120 @@
}
}
+ // 鍙犳墭鏈虹粦瀹氱┖鎵樼洏
+ public string BindNullPallets(PalletsBind model)
+ {
+ string strMsg = "";
+ string type = model.BindType == "0" ? "PDA" : "鍙犳墭鏈�";
+ try
+ {
+ var datetime = Db.GetDate();
+
+ //鑾峰彇鎵樼洏缁戝畾淇℃伅
+ string str = "select * from BllPalletBind where IsDel = '0' and PalletNo = @palletno and Status = '0' ";
+ List<PalletBindVm> list = Db.Ado.SqlQuery<PalletBindVm>(str, new
+ {
+ palletno = model.PalletNo //鎵樼洏鍙�
+ });
+ //鍒ゆ柇鏄惁宸茬粦瀹氳鎵樼洏
+ if (list.Count > 0)
+ {
+ strMsg = "-1:璇ユ墭鐩樺凡琚粦瀹�!";
+ return strMsg;
+ }
+ if (string.IsNullOrEmpty(model.PalletNo))
+ {
+ strMsg = "-1:鎵樼洏鍙蜂笉鍙负绌�!";
+ return strMsg;
+ }
+ if (model.Qty == null || model.Qty == 0)
+ {
+ strMsg = "-1:绌烘墭鐩樻暟閲忎笉鍙负绌�!";
+ return strMsg;
+ }
+ //鑾峰彇鎵樼洏淇℃伅
+ var pallet = Db.Queryable<SysPallets>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo);
+
+ if (pallet == null)
+ {
+ strMsg = "-1:鎵樼洏淇℃伅涓虹┖!";
+ return strMsg;
+ }
+ if (pallet.Status != "0")
+ {
+ strMsg = "-1:璇ユ墭鐩樻鍦ㄤ娇鐢�!";
+ return strMsg;
+ }
+
+ Db.BeginTran();
+
+ // 鎻掑叆鎵樼洏缁戝畾琛�
+ var modelpb = new BllPalletBind
+ {
+ ASNNo = "",
+ ASNDetailNo = 0,
+ TaskNo = "", //浠诲姟鍙�
+ PalletNo = model.PalletNo,
+ Qty = (int)model.Qty,
+ Status = "0", //绛夊緟鎵ц
+ Type = "1", //0 鐗╂枡鎵� 1 绌烘墭
+ LotNo = "",
+ LotText = "",
+ SupplierLot = "",
+ InspectMark = "0", //0 鍚� 1 鏄�
+ BitPalletMark = "0",
+ IsBale = "0",
+ IsBelt = "0",
+ CreateTime = Db.GetDate()
+ };
+ var id = Db.Insertable(modelpb).ExecuteReturnIdentity();
+
+ var modelbb = new BllBoxInfo
+ {
+ ASNNo = "",
+ ASNDetailNo = null,
+ BindNo = id,
+ PalletNo = model.PalletNo,
+ Status = "1",
+ CompleteTime = DateTime.Now,
+ Qty = (int)model.Qty,
+ FullQty = null,
+ SkuNo = "100099",
+ SkuName = "鎵樼洏",
+ LotNo = "",
+ LotText = "",
+ SupplierLot = "",
+ InspectStatus = "1",
+ Origin = type,
+ BoxNo = "",
+ BoxNo2 = "",
+ BoxNo3 = "",
+ InspectMark = "",
+ BitBoxMark = "0",
+
+ CreateTime = datetime
+ };
+ Db.Insertable(modelbb).ExecuteCommand();
+
+
+ // 鏇存敼鎵樼洏浣跨敤鐘舵��
+ string sqlStr = string.Empty;
+ sqlStr = $"update SysPallets set Status = '1' where PalletNo = '{model.PalletNo}';";
+ Db.Ado.ExecuteCommand(sqlStr);
+ Db.CommitTran();
+
+ // 鎻掑叆鎿嶄綔鏃ュ織
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "绌烘墭鍏ュ簱", model.PalletNo, "娣诲姞", $"鍦≒DA涓婃坊鍔犱簡绌烘墭鐩樿泛", 1);
+
+ return strMsg;
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ throw ex;
+ }
+ }
+
/// <summary>
/// 瑙ｇ粦绌烘墭鐩�
/// </summary>
@@ -349,12 +601,12 @@
{
//鑾峰彇浠诲姟淇℃伅
var logtask = Db.Queryable<LogTask>().First(a => a.PalletNo == upBindPalletNo && a.IsDel == "0" && a.Status == "1");
- if (logtask == null)
+ if (logtask != null)
{
strMsg = "璇ユ墭鐩樹换鍔″凡瀹屾垚 鎴栨湭鎴愬姛鍒涘缓浠诲姟 璇锋牳瀹烇紒";
return strMsg;
}
- string bindstr = "select * from BllPalletBind Where IsDel = @isdel and PalletNo = @palletno and ASNDetailNo = 0 and ASNNo = ''";
+ string bindstr = "select * from BllPalletBind Where IsDel = @isdel and PalletNo = @palletno and ASNDetailNo = 0 and ASNNo = '' ";
//鑾峰彇缁戝畾鎵樼洏琛ㄤ俊鎭�
List<PalletBindVm> bindVms = Db.Ado.SqlQuery<PalletBindVm>(bindstr, new
{
@@ -370,10 +622,13 @@
return strMsg;
}
//鍒犻櫎缁戝畾鎵樼洏琛ㄤ俊鎭�
- string delstr = "delete from BllPalletBind Where PalletNo = @palletno";
+ string delstr = "update BllPalletBind set IsDel = 1,UpdateUser = @UpdateUser,UpdateTime = @UpdateTime Where PalletNo = @palletno and Id =@Id ";
int i = Db.Ado.ExecuteCommand(delstr, new
{
- palletno = upBindPalletNo
+ UpdateUser = createUser,
+ UpdateTime = DateTime.Now,
+ palletno = upBindPalletNo,
+ Id = bindVms[0].Id
});
//淇敼鎵樼洏鐘舵��
Db.BeginTran();
@@ -384,7 +639,7 @@
UpbindPalletNo = upBindPalletNo,
PalletNo2 = bindVms[0].PalletNo2,
PalletNo3 = bindVms[0].PalletNo3,
- Qty = (int)bindVms[0].Qty,
+ Qty = bindVms[0].Qty,
LotNo = bindVms[0].LotNo,
LotText = bindVms[0].LotText,
SupplierLot = bindVms[0].SupplierLot,
@@ -400,12 +655,12 @@
box.IsDel = "1";
Db.Updateable(box).ExecuteCommand();
- //淇敼浠诲姟鐘舵��
- logtask.IsDel = "1";
- logtask.Status = "4"; //3 宸插彇娑�
- logtask.UpdateUser = createUser; //鍙栨秷浜�
- logtask.UpdateTime = DateTime.Now; //鍙栨秷鏃堕棿
- Db.Updateable(logtask).ExecuteCommand();
+ ////淇敼浠诲姟鐘舵��
+ //logtask.IsDel = "1";
+ //logtask.Status = "4"; //3 宸插彇娑�
+ //logtask.UpdateUser = createUser; //鍙栨秷浜�
+ //logtask.UpdateTime = DateTime.Now; //鍙栨秷鏃堕棿
+ //Db.Updateable(logtask).ExecuteCommand();
//鏇存敼搴撳瓨鏁伴噺
//string str = $"update DataStock set Qty = Qty - {(int)bindVms[0].Qty} Where SkuNo = '100099'";
// 鏇存敼鎵樼洏浣跨敤鐘舵��
@@ -543,7 +798,7 @@
if (!string.IsNullOrWhiteSpace(bind.LocatNo))
{
isNullLocat = 1;
- locat = Db.Queryable<SysStorageLocat>().First(a=>a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
+ locat = Db.Queryable<SysStorageLocat>().First(a => a.IsDel == "0" && a.WareHouseNo == bind.WareHouseNo && a.RoadwayNo == bind.RoadwayNo && a.LocatNo == bind.LocatNo);
//鍒ゆ柇鍌ㄤ綅鍦板潃鏄惁涓烘鍦ㄥ叆搴�
if (locat.Status != "2")
{
@@ -770,7 +1025,7 @@
return strMsg;
}
#endregion
- var pallQty = 0;//鎵樼洏涓婃暟閲�
+ decimal pallQty = 0;//鎵樼洏涓婃暟閲�
var boxinfo2 = boxinfo.Where(w => w.SkuNo == noticeItem.SkuNo && w.LotNo == noticeItem.LotNo && w.PalletNo == model.PalletNo).ToList();
if (boxinfo2.Count <= 0)
{
@@ -1089,9 +1344,9 @@
#endregion
#endregion
- }
+ }
storageLocat.Status = "1";
- storageLocat.UpdateTime= serverTime; //淇敼鏃堕棿
+ storageLocat.UpdateTime = serverTime; //淇敼鏃堕棿
storageLocat.UpdateUser = model.CreateUser; //淇敼浜�
//淇敼鍌ㄤ綅鐘舵��
Db.Updateable(storageLocat).ExecuteCommand();
@@ -1281,6 +1536,30 @@
}
}
+ /// <summary>
+ /// 楠岃瘉鍌ㄤ綅鍦板潃(鍦扮爜)鏄惁鍙敤
+ /// </summary>
+ /// <param name="locatNo">鍌ㄤ綅缂栫爜</param>
+ /// <returns></returns>
+ public string CheckLocatNo(string locatNo)
+ {
+ try
+ {
+ string strMsg = "";
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo && w.Status == "0" && w.WareHouseNo == "W02");
+ if (storageLocat == null)
+ {
+ throw new Exception("-1:鍦扮爜(鍌ㄤ綅淇℃伅)涓嶅瓨鍦ㄦ垨闈炵┖闂茬姸鎬侊紝璇锋牳鏌�!");
+ }
+
+ return strMsg;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
+
//鏍规嵁绠辩爜鑾峰彇鐗╂枡銆佹壒娆°�佹暟閲忕瓑淇℃伅
public PdaPalletNoCheckDto GetBoxInfoByBoxNo(string boxNo)
{
@@ -1347,7 +1626,7 @@
{
throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
}
- var bNum = 0;//鏁伴噺
+ decimal bNum = 0;//鏁伴噺
//楠岃瘉绠辩爜鏄惁宸茬粦瀹氭墭鐩�
foreach (var item in boxinfo)
{
@@ -1483,8 +1762,8 @@
SupplierLot = "",
InspectMark = "0",
BitPalletMark = "1",
- IsBale = "0",
- IsBelt = "0",
+ IsBale = arrivalnotice.IsBale,
+ IsBelt = arrivalnotice.IsBelt,
CreateUser = userId
};
// 鎻掑叆鎵樼洏缁戝畾琛�
@@ -1557,8 +1836,8 @@
BitPalletMark = "1",
InspectStatus = sku.IsInspect,// 缁勭洏鐨勬椂鍊欏氨瑕侀粯璁よ瀹氬ソ鏄惁鍚堟牸
PackagNo = sku.PackagNo,
- IsBale = null,
- IsBelt = null,
+ IsBale = arrivalnotice.IsBale,
+ IsBelt = arrivalnotice.IsBelt,
CreateUser = userId,
CreateTime = serverTime
};
@@ -1630,18 +1909,198 @@
}
#region 浜у搧缁勬墭
+
+ public void GetBoxInfoByFuMa(string boxNo,string url,string fuMaTokenUrl,string levelType)
+ {
+ try
+ {
+ var list = new List<BllBoxInfo>();
+
+ 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 token = new Token().GetFuMaToken(fuMaTokenUrl);
+ var getParentVal = levelType == "1" ? "true" : "false";
+ var getChildrenVal = levelType == "3" ? "true" : "false";
+ Dictionary<string, string> paramDic = new Dictionary<string, string>
+ {
+ { "Token", token }, //鍒嗛厤鐨勪护鐗岋紙鍙橀噺锛�
+ { "Barcode", boxNo },//瑕佹煡璇㈢殑鏉＄爜
+ { "getParent", getParentVal },//鏄惁鏌ヨ鐖剁爜
+ { "getChildren", getChildrenVal } //鏄惁鏌ヨ瀛愮爜
+ };
+
+ //绋嬪簭姝ｅ紡鍙戝竷鍚庢斁寮�
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ var response = HttpHelper.DoGet(url, "璧嬬爜", "鑾峰彇绠辩爜淇℃伅", paramDic);
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+
+ //瑙ｆ瀽杩斿洖鏁版嵁
+ var fuMaModel = JsonConvert.DeserializeObject<FuMaGetBoxModel>(response);
+ if (fuMaModel.IsSuccess)
+ {
+ //璧嬬爜杩斿洖淇℃伅鎴愬姛鐘舵��
+ if (fuMaModel.Product == null || fuMaModel.Barcodes.Count == 0)
+ {
+ throw new Exception("浜у搧淇℃伅鎴栫鏀俊鎭负绌�");
+ }
+
+ foreach (var item in fuMaModel.Barcodes)
+ {
+ if (item.Barcode != boxNo)
+ {
+ throw new Exception("鑾峰彇淇℃伅涓嶄竴鑷�");
+ }
+
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == fuMaModel.Product.ProductCode);
+ if (sku == null)
+ {
+ throw new Exception("鏈煡璇㈠埌绠辩爜涓殑鐗╂枡淇℃伅");
+ }
+ var boxInfo = new BllBoxInfo()
+ {
+ ASNNo = "",
+ //ASNDetailNo = 0,
+ OrderCode = "",
+ //BindNo = 0,
+ BoxNo = item.Barcode,
+ BoxNo2 = item.Barcode,
+ BoxNo3 = item.Barcode,
+ PalletNo = "",
+ Qty = item.BoxItemQty,
+ FullQty = fuMaModel.BoxItemQty,
+ Status = "0",
+ SkuNo = sku.SkuNo,
+ SkuName = sku.SkuName,
+ LotNo = item.BatchNo,
+ //LotText = "",
+ //SupplierLot = item.SupplierLot,
+ ProductionTime = DateTime.Parse(item.ProductionDate),
+ ExpirationTime = DateTime.Parse(item.ExpirationDate),
+ //CompleteTime = comTime,
+ InspectMark = "0",
+ BitBoxMark = item.Status == "闆剁"? "1":"0",
+ InspectStatus = "0",
+ Origin = "璧嬬爜",
+ Standard = fuMaModel.Product.Spec,
+ PackageStandard = fuMaModel.Product.PackageSpec,
+ //StoreTime = item.StoreTime,
+ //QtyOrd = item.QtyOrd,
+ //QtyCount = item.QtyCount,
+ CreateUser = 0,
+ CreateTime = comTime,
+ };
+ list.Add(boxInfo);
+ }
+ Db.Insertable(list).ExecuteCommand();
+ }
+ else
+ {
+ //璧嬬爜杩斿洖淇℃伅澶辫触鐘舵��
+ throw new Exception($"璧嬬爜绯荤粺杩斿洖鐘舵�佸紓甯革細{fuMaModel.Message}");
+ }
+ #endregion
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
/// <summary>
/// 鏍规嵁绠辩爜鑾峰彇鏍囩绠辩爜淇℃伅
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
+ public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model, string url, string fuMaTokenUrl)
{
try
{
if (string.IsNullOrEmpty(model.BoxNo))
{
throw new Exception("璇锋壂鎻忓绠辨潯鐮�!");
+ }
+ if (!string.IsNullOrWhiteSpace(model.ASNNo))
+ {
+ var detailId = model.ASNNo.Split("-")[0];
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m=>m.IsDel =="0" && m.Id == int.Parse(detailId));
+ if (detail != null)
+ {
+ var asnData = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == detail.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, url, fuMaTokenUrl,"1"); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ }
+ }
+ }
+
+
}
string sqlString = $@"SELECT
ASNNo,
@@ -1656,7 +2115,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("绠辩爜淇℃伅涓嶅瓨鍦�!");
}
@@ -1668,42 +2127,339 @@
}
}
+ /// <summary>
+ /// 鏍规嵁绠辩爜鑾峰彇鏍囩鏈�灏忚拷婧爜淇℃伅
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public List<BoxInfoDto> GetBindBoxInfo2s(BoxInfoVm model, string url, string fuMaTokenUrl)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(model.BoxNo3))
+ {
+ throw new Exception("璇锋壂鎻忔渶灏忚拷婧潯鐮�!");
+ }
+ if (!string.IsNullOrWhiteSpace(model.ASNNo))
+ {
+ var detailId = model.ASNNo.Split("-")[0];
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == int.Parse(detailId));
+ if (detail != null)
+ {
+ var asnData = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo);
+ if (asnData != null)
+ {
+ if (asnData.Type != "3")
+ {
+ throw new Exception("鍗曟嵁璇烽�夋嫨閫�璐у叆搴撳崟!");
+ }
+ var count = Db.Queryable<BllBoxInfo>().Count(m => m.IsDel == "0" && m.Status == "0" && m.BoxNo3 == model.BoxNo3);
+ if (count == 0)
+ {
+ //浼樺厛WMS鏌ユ壘
+
+ var comDetail = Db.Queryable<BllBoxInfo>().First(m=>m.BoxNo3 == model.BoxNo3 && m.IsDel =="0" && m.Status =="2");
+ if (comDetail!= null)
+ {
+ var boxInfo = new BllBoxInfo()
+ {
+ ASNNo = "",
+ //ASNDetailNo = 0,
+ OrderCode = "",
+ //BindNo = 0,
+ BoxNo = comDetail.BoxNo,
+ BoxNo2 = comDetail.BoxNo2,
+ BoxNo3 = comDetail.BoxNo3,
+ PalletNo = "",
+ Qty = comDetail.Qty,
+ FullQty = comDetail.FullQty,
+ Status = "0",
+ SkuNo = comDetail.SkuNo,
+ SkuName = comDetail.SkuName,
+ LotNo = comDetail.LotNo,
+ LotText = comDetail.LotText,
+ SupplierLot = comDetail.SupplierLot,
+ ProductionTime = comDetail.ProductionTime,
+ ExpirationTime = comDetail.ExpirationTime,
+ //CompleteTime = comTime,
+ InspectMark = comDetail.InspectMark,
+ BitBoxMark = "1",
+ InspectStatus = comDetail.InspectStatus,
+ Origin = "璧嬬爜",
+ Standard = comDetail.Standard,
+ PackageStandard = comDetail.PackageStandard,
+ StoreTime = comDetail.StoreTime,
+ QtyOrd = comDetail.QtyOrd,
+ QtyCount = comDetail.QtyCount,
+ CreateUser = 0,
+ CreateTime = DateTime.Now,
+ };
+ Db.Insertable(boxInfo).ExecuteCommand();
+ }
+ else
+ {
+ GetBoxInfoByFuMa(model.BoxNo3, url, fuMaTokenUrl,"3"); //浠庤祴鐮佺郴缁熻幏鍙栫鐮佷俊鎭�
+ }
+ }
+ }
+ }
+
+ }
+ string sqlString = $@"SELECT
+ ASNNo,
+ BoxNo,
+ SkuNo,
+ SkuName,
+ LotNo,
+ SUM(Qty) as Qty
+ FROM BllBoxInfo
+ WHERE IsDel = '0'
+ AND Status='0'
+ AND BoxNo3 = '{model.BoxNo3}'
+ GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo; ";
+ var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
+ if (models.Count == 0)
+ {
+ throw new Exception("鏈�灏忚拷婧爜淇℃伅涓嶅瓨鍦�!");
+ }
+ return models;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ // 鏍规嵁鍗曟嵁鍙疯幏鍙栧崟鎹槑缁嗗垪琛�
+ public List<ArrivalNoticeDetailDto> GetBindArrivalNoticeDetails(ArrivalNoticeVm model)
+ {
+ string sqlString = string.Empty;
+ try
+ {
+ sqlString = $"select * from BllArrivalNoticeDetail where ASNNo = '{model.ASNNo}' and isdel='0' order by CreateTime;";
+ var modelList = Db.Ado.SqlQuery<ArrivalNoticeDetailDto>(sqlString);
+ List<ArrivalNoticeDetailDto> noticeList = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in modelList)
+ {
+ if (string.IsNullOrEmpty(item.LotNo))
+ {
+ noticeList.Add(item);
+ }
+ else
+ {
+ string[] LotNoList = item.LotNo.Split(';');
+ foreach (var item2 in LotNoList)
+ {
+ ArrivalNoticeDetailDto entry = new ArrivalNoticeDetailDto()
+ {
+ Id = item.Id,
+ ASNNo = item.ASNNo,
+ CompleteQty = item.CompleteQty,
+ CompleteTime = item.CompleteTime,
+ CreateTime = item.CreateTime,
+ Qty = item.Qty,
+ FactQty = item.FactQty,
+ LotNo = item2,
+ Money = item.Money,
+ PackagNo = item.PackagNo,
+ PackagName = item.PackagName,
+ Status = item.Status,
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ };
+
+
+ noticeList.Add(entry);
+ }
+ }
+ }
+ List<ArrivalNoticeDetailDto> list = new List<ArrivalNoticeDetailDto>();
+ foreach (var item in noticeList)
+ {
+ string str = BySkuNoGetPackInfo(item.SkuNo);
+ if (str == "瀛樺湪")
+ {
+ list.Add(item);
+ }
+ }
+
+ return list;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ //鏍规嵁鐗╂枡鑾峰彇鏄惁瀛樺湪鍖呰淇℃伅
+ public string BySkuNoGetPackInfo(string skuNo)
+ {
+ try
+ {
+ //鑾峰彇鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(a => a.IsDel == "0" && a.SkuNo == skuNo);
+ //鍒ゆ柇鐗╂枡淇℃伅鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(sku.PackagNo))
+ {
+ return "瀛樺湪";
+ }
+ else
+ {
+ return "涓嶅瓨鍦�";
+ }
+ }
+ catch (Exception ex)
+ {
+ return ex.Message;
+ }
+ }
+
+ /// <summary>
+ /// 缁戝畾鎵樼洏
+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="userId"></param>
+ /// <param name="origin"></param>
public void BindPallet(PdaPalletBindVm model, int userId, string origin)
{
try
{
#region 鍒ゆ柇
+ //0锛氭垚鍝佸叆搴� 1锛氶噰璐叆搴� 2锛氫腑闂村搧鍏ュ簱 3锛氶��璐у叆搴� 4锛氳溅闂翠綑鏂欏叆搴� 5锛氬叾瀹冨叆搴� 6锛氫唬鍌ㄥ叆搴� 7锛氬瘎瀛樺叆搴�
+ var TypeLot = "1, 2, 5, 6, 7";
+
if (string.IsNullOrEmpty(model.AsnNo))
{
- throw new Exception("-1:鍗曟嵁鍙蜂笉鍙负绌�!");
+ throw new Exception("-1:鐗╂枡鏄庣粏涓嶅彲涓虹┖!");
}
- if (model.AsnDetailId == null || model.AsnDetailId == 0)
- {
- throw new Exception("-1:鐗╂枡涓嶅彲涓虹┖!");
- }
+ //if (model.AsnDetailId == null || model.AsnDetailId == 0)
+ //{
+ // throw new Exception("-1:鐗╂枡鏄庣粏涓嶅彲涓虹┖!");
+ //}
if (string.IsNullOrEmpty(model.PalletNo))
{
throw new Exception("-1:鎵樼洏鍙蜂笉鍙负绌�!");
}
- //鍒ゆ柇鐗╂枡鏁伴噺鏄惁涓�0 涓�0鍒ゆ柇绠辩爜淇℃伅 涓嶄负0缁х画
- if (model.SkuQty == 0)
+ var detailId = model.AsnNo.Split("-");
+ model.AsnDetailId = int.Parse(detailId[0]);
+ // 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
+ var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId);
+ if (detail == null)
{
- if (string.IsNullOrEmpty(model.BoxNo))
+ throw new Exception("-1:褰撳墠鐗╂枡鏈煡璇㈠埌鍗曟嵁锛岃鏍稿疄!");
+ }
+ model.AsnNo = detail.ASNNo;
+ //鏍规嵁鍗曟嵁鍙疯幏鍙栧叆搴撳崟鎬诲崟
+ var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.ASNNo == detail.ASNNo);
+ if (notice.Status != "0" && notice.Status != "1" && notice.Status != "2")
+ {
+ throw new Exception("-1:璇ュ崟鎹凡鍏冲崟!");
+ }
+ if (string.IsNullOrEmpty(model.LotNo))
+ {
+ //鍒ゆ柇鏄惁涓轰笉闄愬埗鎵规鍗曟嵁
+ if (!TypeLot.Contains(notice.Type))
{
- throw new Exception("-1:绠辩爜淇℃伅涓嶅彲涓虹┖!");
+ throw new Exception("-1:鐗╂枡鎵规涓嶅彲涓虹┖!");
}
- if (model.IsContinue == "1")
+ }
+ else
+ {
+ //浠庣墿鏂欏悕绉�-鎵规涓彇鍑烘壒娆�
+ var indexOfDash = model.LotNo.Split("-");
+ var len = indexOfDash.Length;
+ if (len == 3)
{
- if (string.IsNullOrWhiteSpace(model.TailBoxNo))
- {
- throw new Exception("-1:寮�鍚繛缁粍鎵樻椂锛屽熬绠辩爜淇℃伅涓嶅彲涓虹┖!");
- }
-
+ model.LotNo =indexOfDash[len-1];
+ }
+ else
+ {
+ model.LotNo = "";
}
}
+ //鍒ゆ柇鐗╂枡鏁伴噺鏄惁涓�0 涓�0鍒ゆ柇绠辩爜淇℃伅 涓嶄负0缁х画
+ if (model.TableType == 0)
+ {
+ if (notice.Type != "3")
+ {
+ if (string.IsNullOrEmpty(model.BoxNo))
+ {
+ throw new Exception("-1:绠辩爜淇℃伅涓嶅彲涓虹┖!");
+ }
+ if (model.IsContinue == "1")
+ {
+ if (string.IsNullOrWhiteSpace(model.TailBoxNo))
+ {
+ throw new Exception("-1:寮�鍚繛缁粍鎵樻椂锛屽熬绠辩爜淇℃伅涓嶅彲涓虹┖!");
+ }
+
+ }
+ }
+ else
+ {
+ if (string.IsNullOrEmpty(model.BoxNo01))
+ {
+ throw new Exception("-1:杩芥函鐮佷俊鎭笉鍙负绌�!");
+ }
+ if (model.IsContinue == "1")
+ {
+ throw new Exception("-1:杩芥函鐮佷笉鍙繛缁粍鎵橈紒");
+ }
+ }
+
+
+
+ }
+ int isTextTable = model.TableType;
+ int isDeposit = 0;
+ //鍒ゆ柇鎬诲崟鍗曟嵁鏄惁涓哄瘎瀛樺崟鎹�
+ if (notice.Type == "7")
+ {
+ isDeposit = 1;
+ }
+ if (isDeposit == 1)
+ {
+ //鍒ゆ柇鎬诲崟澶囨敞鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(notice.Demo))
+ {
+ //鍒嗗壊鎬诲崟澶囨敞鍙婃墭鐩樺娉�
+ var noticeDemo = notice.Demo.Split('銆�'); //鎬诲崟澶囨敞
+ var palletDemo = model.Demo.Split('銆�'); //鎵樼洏澶囨敞
+
+ //寰幆鎵樼洏澶囨敞
+ foreach (var itemPallet in palletDemo)
+ {
+ int isDemo = 0;
+ //寰幆鎬诲崟澶囨敞
+ foreach (var itemNotice in noticeDemo)
+ {
+ //鍒ゆ柇鏄惁鏈夌浉鍚屽娉�
+ if (itemPallet == itemNotice)
+ {
+ isDemo = 1;
+ break;
+ }
+ }
+ if (isDemo == 0)
+ {
+ throw new Exception("-1:鎬诲崟澶囨敞涓庢墭鐩樺娉ㄤ笉绗︼紝璇锋牳瀹炲悗閲嶆柊缁戝畾!");
+ }
+ }
+ }
+ else if (string.IsNullOrWhiteSpace(notice.Demo))
+ {
+ //鍒ゆ柇鎵樼洏澶囨敞鏄惁涓虹┖
+ if (!string.IsNullOrWhiteSpace(model.Demo))
+ {
+ throw new Exception("-1:璇锋坊鍔犳�诲崟澶囨敞鍚庤緭鍏ユ墭鐩樺娉�!");
+ }
+ }
+ }
+
+
#endregion
Db.BeginTran();
@@ -1714,50 +2470,57 @@
{
throw new Exception("鏈煡璇㈠埌鎵樼洏淇℃伅锛岃鏍稿疄锛�");
}
- // 楠岃瘉鍏ュ簱鍗曟槑缁嗘槸鍚﹀瓨鍦�
- var detail = Db.Queryable<BllArrivalNoticeDetail>().First(m => m.IsDel == "0" && m.Id == model.AsnDetailId && m.ASNNo == model.AsnNo);
- if (detail == null)
+ //鍒ゆ柇鎵樼洏鏄惁鍦ㄥ簱澶�
+ var stockDetail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == model.PalletNo);
+ if (stockDetail != null)// && !string.IsNullOrEmpty(stockDetail.WareHouseNo)
{
- throw new Exception("-1:褰撳墠鐗╂枡鍙婃壒娆′笌鍗曟嵁鏃犲叧鑱旓紝璇锋牳瀹�!");
+ throw new Exception("璇ユ墭鐩樺湪搴撳瓨宸叉湁淇℃伅锛岃鏍稿疄锛�");
}
+
#region 鍖呰
var package = Db.Queryable<SysPackag>().Where(m => m.IsDel == "0");
var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == detail.SkuNo);
var pack = package.First(m => m.IsDel == "0" && m.PackagNo == sku.PackagNo);
- if (pack == null)
- {
- throw new Exception("-1:鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
- }
+
var pNum = 0;//鎵樼洏鐗╁搧鏁伴噺
var bNum = 0;//绠辩爜鐗╁搧鏁伴噺
- if (pack.L5Num.HasValue)
+
+ //鍒ゆ柇鏄惁涓哄瘎瀛樼墿鏂�
+ if (isDeposit == 0 && isTextTable == 0)
{
- pNum = (int)pack.L5Num;
- bNum = (int)pack.L4Num;
- }
- else if (pack.L4Num.HasValue)
- {
- pNum = (int)pack.L4Num;
- bNum = (int)pack.L3Num;
- }
- else if (pack.L3Num.HasValue)
- {
- pNum = (int)pack.L3Num;
- bNum = (int)pack.L2Num;
- }
- else if (pack.L2Num.HasValue)
- {
- pNum = (int)pack.L2Num;
- bNum = (int)pack.L1Num;
- }
- else if (pack.L1Num.HasValue)
- {
- pNum = (int)pack.L1Num;
- bNum = (int)pack.L1Num;
- }
- if (pNum == 0 || bNum == 0)
- {
- throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ if (pack == null)
+ {
+ throw new Exception("-1:鑾峰彇鐗╂枡鍖呰澶辫触锛岃鏍稿疄!");
+ }
+ if (pack.L5Num.HasValue)
+ {
+ pNum = (int)pack.L5Num;
+ bNum = (int)pack.L4Num;
+ }
+ else if (pack.L4Num.HasValue)
+ {
+ pNum = (int)pack.L4Num;
+ bNum = (int)pack.L3Num;
+ }
+ else if (pack.L3Num.HasValue)
+ {
+ pNum = (int)pack.L3Num;
+ bNum = (int)pack.L2Num;
+ }
+ else if (pack.L2Num.HasValue)
+ {
+ pNum = (int)pack.L2Num;
+ bNum = (int)pack.L1Num;
+ }
+ else if (pack.L1Num.HasValue)
+ {
+ pNum = (int)pack.L1Num;
+ bNum = (int)pack.L1Num;
+ }
+ if (pNum == 0 || bNum == 0)
+ {
+ throw new Exception($"缁戝畾澶辫触锛寋detail.SkuNo}鐗╁搧鍖呰鏈壘鍒帮紒");
+ }
}
#endregion
@@ -1776,10 +2539,25 @@
}
}
#endregion
- var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo);
+ var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == model.AsnDetailId && m.PalletNo == model.PalletNo && m.Status != "2");
var bindId = 0;
if (bind == null)
{
+
+ DateTime proTime;
+ DateTime expTime;
+ var bl1 = DateTime.TryParse(detail.Lot1, out proTime);
+ var bl2 = DateTime.TryParse(detail.Lot2, out expTime);
+
+ if (!bl1 && !string.IsNullOrWhiteSpace(detail.Lot1))
+ {
+ throw new Exception("鐢熶骇鏃ユ湡杞崲澶辫触");
+ }
+
+ if (!bl2 && !string.IsNullOrWhiteSpace(detail.Lot2))
+ {
+ throw new Exception("鏈夋晥鏈熻浆鎹㈠け璐�");
+ }
bind = new BllPalletBind
{
ASNNo = model.AsnNo,
@@ -1791,15 +2569,30 @@
FullQty = pNum,
Status = "0",
Type = "0",
- LotNo = detail.LotNo,
+ LotNo = model.LotNo,
LotText = detail.LotText,
- SupplierLot = "",
+ SupplierLot = detail.SupplierLot,
InspectMark = "0",
BitPalletMark = "1",
- IsBale = "0",
- IsBelt = "0",
- CreateUser = userId
+ IsBale = detail.IsBale,
+ IsBelt = detail.IsBelt,
+ CreateUser = userId,
+ Demo = model.Demo,
+
};
+
+ if (bl1)
+ {
+ bind.ProductionTime = proTime;
+ }
+ if (bl2)
+ {
+ bind.ExpirationTime = expTime;
+ }
+ //if (model.TableType == 0 && isDeposit == 0 && isTextTable == 0) 涓嶅お鐞嗚В杩欐浠ｇ爜鐨勫惈涔�
+ //{
+ // throw new Exception($"缁戝畾澶辫触锛寋model.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+ //}
// 鎻掑叆鎵樼洏缁戝畾琛�
bindId = Db.Insertable(bind).ExecuteReturnIdentity();
}
@@ -1810,6 +2603,7 @@
throw new Exception("-1:褰撳墠鎵樼洏姝ｅ湪鎵ц涓紝缁戝畾澶辫触锛岃鏍稿疄!");
}
bindId = bind.Id;
+ bind.Qty += model.SkuQty;
}
#region 绠辩爜淇℃伅
@@ -1817,39 +2611,53 @@
var boxInfoList = new List<BllBoxInfo>();
if (model.SkuQty == 0)
{
- //棣栫
- var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Status == "0").ToList();
- if (boxInfo.Count == 0)
+ if (notice.Type == "3")
{
- throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
- }
- boxInfoList.AddRange(boxInfo);
- //鏄惁杩炵画缁勬墭
- if (model.IsContinue == "1")
- {
- //灏剧
- var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.Status == "0").ToList();
- if (boxInfo2.Count == 0)
+ //棣栫
+ var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo3 == model.BoxNo01 && m.Status == "0").ToList();
+ if (boxInfo.Count == 0)
{
- throw new Exception("-1:灏剧鐮佷俊鎭笉瀛樺湪!");
+ throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
}
- boxInfoList.AddRange(boxInfo2);
- var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
- var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
- boxInfoList.AddRange(list);
- msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
+ boxInfoList.AddRange(boxInfo);
+ }
+ else
+ {
+ //棣栫
+ var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Status == "0").ToList();
+ if (boxInfo.Count == 0)
+ {
+ throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
+ }
+ boxInfoList.AddRange(boxInfo);
+ //鏄惁杩炵画缁勬墭
+ if (model.IsContinue == "1")
+ {
+ //灏剧
+ var boxInfo2 = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.Status == "0").ToList();
+ if (boxInfo2.Count == 0)
+ {
+ throw new Exception("-1:灏剧鐮佷俊鎭笉瀛樺湪!");
+ }
+ boxInfoList.AddRange(boxInfo2);
+ var sql = $"select * from BllBoxInfo where IsDel = '0' and Status = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}'; ";
+ var list = Db.Ado.SqlQuery<BllBoxInfo>(sql);
+ boxInfoList.AddRange(list);
+ msgStr += $"灏剧鍙蜂负{model.TailBoxNo}";
+ }
}
}
#endregion
// 鏇存敼绠辨敮鍏崇郴琛�
decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
- if (model.SkuQty == 0)
+ //鎴愬搧缁勬墭
+ if (isTextTable == 0)
{
var boxGroup = boxInfoList.GroupBy(m => m.BoxNo).ToList();
foreach (var g in boxGroup)
{
- var boxFullQty = 0;//绠卞唴鎬绘暟閲�
+ decimal boxFullQty = 0;//绠卞唴鎬绘暟閲�
foreach (var box in g)
{
if (box.BindNo != null && box.BindNo != 0)
@@ -1857,7 +2665,7 @@
continue;
}
//绠卞唴鐗╂枡鎵规涓庡崟鎹槑缁嗕笉绗﹀悎
- if (box.SkuNo != detail.SkuNo || box.LotNo != detail.LotNo)
+ if (box.SkuNo != detail.SkuNo || box.LotNo != model.LotNo)
{
throw new Exception($"-1:{box.BoxNo}绠卞唴鐗╂枡鍙婃壒娆′笌鍗曟嵁涓嶄竴鑷达紝璇锋牳瀹�!");
}
@@ -1874,32 +2682,36 @@
factQty += box.Qty;
boxFullQty += box.Qty;
}
- if (boxFullQty > bNum)
- {
- throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
- }
+ //if (boxFullQty > bNum)
+ //{
+ // throw new Exception($"缁戝畾澶辫触锛寋g.Key}绠辩爜缁戝畾鏁伴噺澶т簬璇ョ墿鍝佸寘瑁呮暟閲忥紒");
+ //}
}
Db.Updateable(boxInfoList).ExecuteCommand();
// 鏇存柊鎵樼洏缁戝畾琛�
bind.Qty += factQty;
}
- if (bind.FullQty < bind.Qty)
- {
- throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
- }
+ //if (bind.FullQty < bind.Qty && isDeposit == 0 && isTextTable == 0)
+ //{
+ // throw new Exception("鎵樼洏缁戝畾鏁伴噺宸茶秴鍑鸿鐗╂枡鍖呰鏁伴噺");
+ //}
- if (bind.FullQty == bind.Qty)
+ if (bind.FullQty <= bind.Qty)
{
bind.BitPalletMark = "0";
}
+ //if (bind.Qty > pNum && isDeposit == 0 && isTextTable == 0)
+ //{
+ // throw new Exception($"缁戝畾澶辫触锛寋bind.PalletNo}鎵樼洏缁戝畾鏁伴噺澶т簬璇ョ墿鍝佹墭鐩樺寘瑁呮暟閲忥紒");
+ //}
Db.Updateable(bind).Where(m => m.Id == bindId).ExecuteCommand();
// 鏇存敼鍏ュ簱鍗曟槑缁嗗凡缁勬暟閲�
var sqlString = string.Empty;
if (factQty == 0)
{
- sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{bind.Qty}' where id = '{model.AsnDetailId}';";
+ sqlString += $"update BllArrivalNoticeDetail set FactQty = FactQty + '{model.SkuQty}' where id = '{model.AsnDetailId}';";
}
else
{
@@ -1912,8 +2724,15 @@
if (detail.Status == "0")
{
var sqlString2 = string.Empty;
- sqlString2 += $"update BllArrivalNotice set Status = '1',CompleteTime= getDate() where ASNNo = '{model.AsnNo}' and Status ='0';";
- sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',CompleteTime= getDate() where id = '{model.AsnDetailId}' and Status ='0';";
+ sqlString2 += $"update BllArrivalNotice set Status = '1',UpdateTime= getDate(),UpdateUser = {userId} where ASNNo = '{model.AsnNo}' and Status ='0';";
+ sqlString2 += $"update BllArrivalNoticeDetail set Status = '1',UpdateTime= getDate(),UpdateUser = {userId} where id = '{model.AsnDetailId}' and Status ='0';";
+ Db.Ado.ExecuteCommand(sqlString2);
+ }
+ else if (detail.Status == "1")
+ {
+ var sqlString2 = string.Empty;
+ sqlString2 += $"update BllArrivalNotice set UpdateTime= getDate(),UpdateUser = {userId} where ASNNo = '{model.AsnNo}' and Status ='1';";
+ sqlString2 += $"update BllArrivalNoticeDetail set UpdateTime= getDate(),UpdateUser = {userId} where id = '{model.AsnDetailId}' and Status ='1';";
Db.Ado.ExecuteCommand(sqlString2);
}
@@ -1922,7 +2741,7 @@
//娣诲姞鎵樼洏璁板綍琛ㄦ暟鎹�
sqlStr += $"insert into LogPalletTrack values('{model.PalletNo}','{model.AsnNo}','缁勭洏','0',getDate(),{userId},NULL,NULL);";
Db.Ado.ExecuteCommand(sqlStr);
- new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾1", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "鎵樼洏缁戝畾", model.AsnNo, "娣诲姞", $"娣诲姞浜嗘墭鐩樼爜涓猴細{model.PalletNo}銆亄msgStr}鐨勭粍鐩樹俊鎭�", userId);
Db.CommitTran();
}
@@ -1933,5 +2752,447 @@
}
}
#endregion
+
+ #region 骞冲簱鍏ュ簱
+ /// <summary>
+ /// 骞冲簱纭鍏ュ簱
+ /// </summary>
+ /// <param name="model"></param>
+ public void ConfirmInStock(PalletBindVm model)
+ {
+ try
+ {
+ #region 楠岃瘉淇℃伅
+ //if (string.IsNullOrEmpty(model.ASNNo))
+ //{
+ // throw new Exception("鍏ュ簱鍗曚笉鑳戒负绌�!");
+ //}
+ if (string.IsNullOrEmpty(model.PalletNo))
+ {
+ throw new Exception("鎵樼洏鏉＄爜涓嶈兘涓虹┖!");
+ }
+ if (string.IsNullOrEmpty(model.LocatNo))
+ {
+ throw new Exception("鍌ㄤ綅鍦板潃涓嶈兘涓虹┖!");
+ }
+ #endregion
+ //鑾峰彇褰撳墠鏃堕棿
+ DateTime serverTime = Db.Ado.GetDateTime("select GETDATE();");
+
+ #region 鏄惁鍥炴祦鍏ュ簱
+ int iscount = 0;
+ //搴撳瓨鏄庣粏淇℃伅
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(a => a.IsDel == "0" && a.PalletNo == model.PalletNo).ToList();
+ //楠岃瘉搴撳瓨鏄惁鎷ユ湁璇ユ墭淇℃伅
+ if (stockDetail != null && stockDetail.Count > 0)
+ {
+ foreach (var item in stockDetail)
+ {
+ if (!string.IsNullOrEmpty(item.WareHouseNo))
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
+ }
+ }
+ iscount = 1; //鍥炴祦鍏ュ簱
+ }
+ #endregion
+
+ #region 鎵樼洏缁戝畾淇℃伅
+ var bindInfo = Db.Queryable<BllPalletBind>().First(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.PalletNo == model.PalletNo && w.Status != "2");
+ if (iscount == 0)
+ {
+ if (bindInfo == null)
+ {
+ throw new Exception("鎵樼洏缁戝畾淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ if (!string.IsNullOrEmpty(bindInfo.WareHouseNo))
+ {
+ throw new Exception("璇ユ墭鐩樻湭鍦ㄥ簱澶栵紝璇锋牳鏌�!");
+ }
+ }
+
+ #endregion
+
+ #region 鍦扮爜淇℃伅(鍌ㄤ綅淇℃伅)
+ var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == model.LocatNo && w.Status == "0" && w.WareHouseNo == "W02");
+ if (storageLocat == null)
+ {
+ throw new Exception("鍌ㄤ綅淇℃伅涓嶅瓨鍦ㄦ垨闈炵┖闂茬姸鎬侊紝璇锋牳鏌�!");
+ }
+ #endregion
+
+ Db.BeginTran();//寮�鍚簨鍔�
+ if (iscount == 0)//姝ｅ父鍏ュ簱
+ {
+ #region 鍏ュ簱鎬诲崟淇℃伅
+ var notice = Db.Queryable<BllArrivalNotice>().First(a => a.IsDel == "0" && a.Status != "3" && a.ASNNo == model.ASNNo);
+ //楠岃瘉鍏ュ簱鍗曟�诲崟鏄惁鍏抽棴
+ if (notice == null)
+ {
+ throw new Exception("鍏ュ簱鍗曟�诲崟淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ //鍒ゆ柇鍏ュ簱鍗曟�诲崟鏄惁涓哄凡鍏抽棴
+ if (notice.Status == "3")
+ {
+ throw new Exception("鍏ュ簱鍗曟�诲崟宸插叧闂紝璇锋牳鏌�!");
+ }
+ #endregion
+
+ #region 绠辩爜淇℃伅
+ var boxInfoList = Db.Queryable<BllBoxInfo>().Where(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.PalletNo == model.PalletNo).ToList();
+ // type 0:鎴愬搧鍏ュ簱 1:閲囪喘鍏ュ簱 2:涓棿鍝佸叆搴� 3:閫�璐у叆搴� 4:杞﹂棿浣欐枡閫�鍥炲叆搴� 5:鍏跺畠鍏ュ簱 6:浠ｅ偍鍏ュ簱 7:瀵勫瓨鍏ュ簱
+ if (notice.Type == "2" || notice.Type == "6" || notice.Type == "7")
+ {
+ // 涓嶈创鐮佺墿鏂� 鏃犻渶楠岃瘉绠辩爜淇℃伅
+ }
+ else
+ {
+ //楠岃瘉绠辩爜淇℃伅鏄惁瀛樺湪
+ if (boxInfoList.Count <= 0)
+ {
+ throw new Exception("绠辩爜淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ foreach (var item in boxInfoList)
+ {
+ item.Status = "2"; // 鏀瑰彉绠辨敮鍏崇郴琛ㄧ姸鎬侊細宸插叆搴�
+ item.UpdateTime = serverTime;
+ item.UpdateUser = model.CreateUser;
+ }
+ Db.Updateable(boxInfoList).ExecuteCommand();
+ }
+ #endregion
+
+ bool isFinsh = true;//鏄惁鍏ㄩ儴鍏ュ簱瀹屾垚
+ #region 鍏ュ簱鍗曟槑缁�
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(w => w.IsDel == "0" && w.ASNNo == model.ASNNo && w.Id == bindInfo.ASNDetailNo);
+ if (noticeDetail == null)
+ {
+ throw new Exception("鍏ュ簱鍗曟槑缁嗕俊鎭笉瀛樺湪锛岃鏍告煡!");
+ }
+ noticeDetail.CompleteQty += bindInfo.Qty;//澧炲姞鍏ュ簱鏁伴噺
+ //鍒ゆ柇鍏ュ簱鏁伴噺澧炲姞鍚庢槸鍚﹀ぇ浜庣瓑浜庡崟鎹暟閲�
+ if (noticeDetail.CompleteQty >= noticeDetail.Qty)
+ {
+ noticeDetail.Status = "2";//鎵ц瀹屾垚
+ noticeDetail.CompleteTime = serverTime;
+ }
+ else
+ {
+ noticeDetail.Status = "1";//姝ｅ湪鎵ц
+
+ isFinsh = false;
+ }
+ noticeDetail.UpdateUser = model.CreateUser;
+ noticeDetail.UpdateTime = serverTime;
+ Db.Updateable(noticeDetail).ExecuteCommand();
+ #endregion
+
+ #region 鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(s => s.SkuNo == noticeDetail.SkuNo && s.IsDel == "0" && s.SkuName == noticeDetail.SkuName);
+ //鍒ゆ柇鐗╂枡淇℃伅鏄惁涓虹┖
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡淇℃伅涓嶅瓨鍦紝璇锋牳鏌�!");
+ }
+ #endregion
+
+ #region 搴撳瓨鎬昏〃
+ // 鍒ゆ柇褰撳墠鐗╂枡搴撳瓨琛ㄦ槸鍚﹀凡瀛樺湪
+ var stockModel = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == noticeDetail.SkuNo && w.LotNo == bindInfo.LotNo && w.Standard == noticeDetail.Standard);
+ if (stockModel == null || stockModel.Id == 0)
+ {
+ stockModel = new DataStock
+ {
+ LotNo = bindInfo.LotNo,
+ LotText = bindInfo.LotText,
+ SupplierLot = bindInfo.SupplierLot,
+ SkuNo = noticeDetail.SkuNo,
+ SkuName = noticeDetail.SkuName,
+ Qty = bindInfo.Qty,
+ Standard = noticeDetail.Standard,
+ CreateUser = (int)model.CreateUser,
+ CreateTime = serverTime
+ };
+ //缁存姢搴撳瓨璐т富淇℃伅
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ stockModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ stockModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
+ //鏂板搴撳瓨鎬讳俊鎭�
+ Db.Insertable<DataStock>(stockModel).ExecuteCommand();
+ }
+ else
+ {
+ stockModel.Qty += bindInfo.Qty;
+ stockModel.UpdateUser = (int)model.CreateUser;
+ stockModel.UpdateTime = serverTime;
+ //淇敼搴撳瓨鎬讳俊鎭�
+ Db.Updateable(stockModel).ExecuteCommand();
+ }
+ #endregion
+
+ #region 搴撳瓨鏄庣粏琛�
+ // 鍒ゆ柇褰撳墠鎵樼洏鏄惁宸插瓨鍦紙鎷ｈ揣鍥炲簱鎵樼洏锛�
+ var detailModel = Db.Queryable<DataStockDetail>().First(it => it.PalletNo == bindInfo.PalletNo && it.LotNo == bindInfo.LotNo && it.SkuNo == noticeDetail.SkuNo
+ && it.Standard == noticeDetail.Standard && it.IsDel == "0");
+ var stId = 0;
+ if (detailModel == null || detailModel.Id == 0)
+ {
+ // 娣诲姞搴撳瓨鏄庣粏琛�
+ detailModel = new DataStockDetail()
+ {
+ LotNo = bindInfo.LotNo,
+ LotText = bindInfo.LotText,
+ SupplierLot = noticeDetail.SupplierLot,
+ SkuNo = noticeDetail.SkuNo,
+ SkuName = noticeDetail.SkuName,
+ Standard = noticeDetail.Standard,
+ Qty = bindInfo.Qty,
+ LockQty = 0,
+ FrozenQty = 0,
+ InspectQty = bindInfo.Qty,
+ ASNNo = noticeDetail.ASNNo,
+ ASNDetailNo = (int)bindInfo.ASNDetailNo,
+ WareHouseNo = "W02",
+ RoadwayNo = "",
+ AreaNo = storageLocat.AreaNo,
+ LocatNo = model.LocatNo,
+ PalletNo = model.PalletNo,
+ PalletNo2 = bindInfo.PalletNo2,
+ PalletNo3 = bindInfo.PalletNo3,
+ CompleteTime = serverTime,
+ ProductionTime = bindInfo.ProductionTime,
+ ExpirationTime = bindInfo.ExpirationTime,
+ Status = "0",
+ InspectMark = bindInfo.InspectMark,
+ BitPalletMark = bindInfo.BitPalletMark,
+ InspectStatus = sku.IsInspect,// 缁勭洏鐨勬椂鍊欏氨瑕侀粯璁よ瀹氬ソ鏄惁鍚堟牸
+ PackagNo = sku.PackagNo,
+ IsBale = bindInfo.IsBale,
+ IsBelt = bindInfo.IsBelt,
+ Demo = bindInfo.Demo,
+ CreateUser = (int)model.CreateUser,
+ CreateTime = serverTime
+ };
+ //缁存姢搴撳瓨鏄庣粏璐т富/渚涘簲鍟嗕俊鎭�
+ if (notice.Type == "0" || notice.Type == "2" || notice.Type == "4" || notice.Type == "6" || notice.Type == "7")//0:鎴愬搧鍏ュ簱锛�2:涓棿鍝佸叆搴�,4:杞﹂棿浣欐枡鍏ュ簱,6:浠ｅ偍鍏ュ簱,7:瀵勫瓨鍏ュ簱
+ {
+ detailModel.OwnerNo = notice.CustomerNo;//璐т富缂栫爜
+ detailModel.OwnerName = notice.CustomerName;//璐т富鍚嶇О
+ }
+ else if (notice.Type == "1" || notice.Type == "5")//1:閲囪喘鍏ュ簱,2:鍏跺畠鍏ュ簱
+ {
+ detailModel.SupplierNo = notice.CustomerNo;//渚涘簲鍟嗙紪鐮�
+ 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)
+ {
+ //淇敼鍚堟牸涓嶅悎鏍兼暟閲�
+ if (quality.IsQualified == "1") //鍚堟牸
+ {
+ //澧炲姞鍚堟牸鏁伴噺
+ quality.PassQty += detailModel.Qty;
+ detailModel.InspectStatus = "1";
+ }
+ else if (quality.IsQualified == "0") //涓嶅悎鏍�
+ {
+ //澧炲姞涓嶅悎鏍兼暟閲�
+ quality.FailQty += detailModel.Qty;
+ detailModel.InspectStatus = "2";
+ }
+ Db.Updateable(quality).ExecuteCommand(); //淇敼璐ㄦ淇℃伅
+ }
+ #endregion
+ stId = Db.Insertable<DataStockDetail>(detailModel).ExecuteReturnIdentity();
+ }
+ else
+ {
+ stId = detailModel.Id;
+ detailModel.LocatNo = model.LocatNo;
+ detailModel.AreaNo = storageLocat.AreaNo;
+ detailModel.UpdateTime = serverTime;
+ detailModel.UpdateUser = (int)model.CreateUser;
+ // 鍙樻洿鍌ㄤ綅鍦板潃
+ Db.Updateable<DataStockDetail>(detailModel).UpdateColumns(it => new { it.LocatNo, it.UpdateTime, it.UpdateUser }).ExecuteCommand();
+ }
+ #endregion
+
+ #region 浠诲姟鍙婄粍鎵樹俊鎭�
+ //鍒涘缓浠诲姟淇℃伅
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "PDA",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = serverTime, //鍙戦�佹椂闂�
+ BackDate = serverTime, //杩斿洖鏃堕棿
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = model.LocatNo,//鐩爣浣嶇疆
+ PalletNo = bindInfo.PalletNo,//鎵樼洏鐮�
+ IsSend = 0,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 0,//鏄惁鍙彇娑�
+ IsFinish = 0,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍔涜骞冲簱鐨勫叆搴撲换鍔�",
+ };
+ Db.Insertable(exTask).ExecuteCommand();
+
+ //淇敼缁勬墭鐘舵��
+ bindInfo.Status = "2"; //2 鍏ュ簱瀹屾垚
+ bindInfo.WareHouseNo = "W02";//鎵�灞炰粨搴�
+ bindInfo.LocatNo = model.LocatNo;//鍌ㄤ綅鍦板潃
+ bindInfo.UpdateTime = serverTime;
+ bindInfo.UpdateUser = model.CreateUser;
+ bindInfo.CompleteTime = serverTime; //瀹屾垚鏃堕棿
+ bindInfo.TaskNo = taskNo; //浠诲姟鍙�
+ Db.Updateable(bindInfo).ExecuteCommand();
+ #endregion
+
+ #region 搴撳瓨绠辨敮鏄庣粏琛�
+ // 鎻掑叆鏂扮粍鐨勭鏀俊鎭�
+ var comTime = DateTime.Now;
+ foreach (var item in boxInfoList)
+ {
+ var info = new DataBoxInfo()
+ {
+ StockDetailId = stId,
+ BindNo = bindInfo.Id,
+ BoxNo = item.BoxNo,
+ BoxNo2 = item.BoxNo2,
+ BoxNo3 = item.BoxNo3,
+ PalletNo = item.PalletNo,
+ PalletNo2 = item.PalletNo2,
+ PalletNo3 = item.PalletNo3,
+ Qty = item.Qty,
+ FullQty = item.FullQty,
+ Status = "2",
+ LotNo = item.LotNo,
+ LotText = item.LotText,
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ Standard = sku.Standard,
+ ProductionTime = item.ProductionTime,
+ ExpirationTime = item.ExpirationTime,
+ SupplierLot = item.SupplierLot,
+ InspectMark = item.InspectMark,
+ BitBoxMark = item.BitBoxMark,
+ InspectStatus = item.InspectStatus,
+ UDF1 = item.StoreTime == null? "":((DateTime)item.StoreTime).ToString("yyyy-MM-dd"),
+ //InspectTime = item.StoreTime,
+
+ IsDel = "0",
+ CreateUser = 0,
+ CreateTime = comTime
+ };
+ Db.Insertable(info).ExecuteCommand();
+ }
+ #endregion
+
+ var entryList = Db.Queryable<BllArrivalNoticeDetail>().Where(w => w.IsDel == "0" && w.ASNNo == notice.ASNNo && w.Id != noticeDetail.Id && w.Status != "2").ToList();
+ if (isFinsh && entryList.Count <= 0)//鍏ュ簱鍗曟槑缁嗗叏閮ㄥ畬鎴�
+ {
+ //淇敼鍏ュ簱鍗曟�诲崟淇℃伅
+ notice.Status = "2";
+ notice.UpdateUser = model.CreateUser;
+ notice.UpdateTime = serverTime;
+ Db.Updateable(notice).ExecuteCommand();
+ }
+ else
+ {
+ //鍒ゆ柇鎬诲崟鐘舵�佹槸鍚︿负姝ｅ湪鎵ц
+ if (notice.Status == "0")
+ {
+ //淇敼鍏ュ簱鍗曟�诲崟淇℃伅
+ notice.Status = "1";
+ notice.UpdateUser = model.CreateUser;
+ notice.UpdateTime = serverTime;
+ Db.Updateable(notice).ExecuteCommand();
+ }
+ }
+ }
+ else
+ {
+ //淇敼搴撳瓨鏄庣粏淇℃伅
+ foreach (var item in stockDetail)
+ {
+ item.Status = "0"; //鐘舵�佹洿鏀逛负寰呭垎閰�
+ item.WareHouseNo = "W02"; //鎵�灞炰粨搴�
+ item.LocatNo = model.LocatNo;//鍌ㄤ綅鍦板潃
+ item.UpdateTime = serverTime; //淇敼鏃堕棿
+ item.UpdateUser = model.CreateUser; //淇敼浜�
+ //淇敼搴撳瓨鏄庣粏淇℃伅
+ Db.Updateable(item).ExecuteCommand();
+ }
+ //鑾峰彇鎷ｈ揣淇℃伅
+ var alotr = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo && a.Status == "4");
+ if (alotr != null)
+ {
+ alotr.Status = "5"; //5 宸插畬鎴�
+ alotr.UpdateUser = model.CreateUser; //淇敼浜�
+ alotr.UpdateTime = serverTime; //淇敼鏃堕棿
+ //淇敼鎷ｈ揣淇℃伅
+ Db.Updateable(alotr).ExecuteCommand();
+ }
+ #region 浠诲姟鍙婄粍鎵樹俊鎭�
+ //鍒涘缓浠诲姟淇℃伅
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "PDA",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = model.LocatNo,//鐩爣浣嶇疆
+ PalletNo = model.PalletNo,//鎵樼洏鐮�
+ IsSend = 0,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 0,//鏄惁鍙彇娑�
+ IsFinish = 0,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "2",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍔涜骞冲簱鐨勫洖搴撲换鍔�",
+ };
+ Db.Insertable(exTask).ExecuteCommand();
+ #endregion
+ }
+ storageLocat.Status = "1";//鐘舵�佸凡浣跨敤
+ storageLocat.UpdateTime = serverTime; //淇敼鏃堕棿
+ storageLocat.UpdateUser = model.CreateUser; //淇敼浜�
+ //淇敼鍌ㄤ綅淇℃伅
+ Db.Updateable(storageLocat).ExecuteCommand();
+
+ if (iscount == 1)
+ {
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愭墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳洖娴佸叆搴撴搷浣�", (int)model.CreateUser);
+ }
+ else
+ {
+ new OperationASNServer().AddLogOperationAsn("PDA妯″潡", "骞冲簱鍏ュ簱", model.PalletNo, "瀹屾垚", $"鍦≒DA涓婂畬鎴愬崟鎹彿涓猴細{model.ASNNo}鐨勬墭鐩樼爜涓猴細{model.PalletNo}鐨勫钩搴撳叆搴撴搷浣�", (int)model.CreateUser);
+ }
+ Db.CommitTran();
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw ex;
+ }
+ }
+ #endregion
}
}
--
Gitblit v1.8.0