From cabcb499a03de83b62eb8c01a734a1f4049f1dcf Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期三, 13 三月 2024 11:49:30 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 235c1e3..f2b5cc7 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -709,6 +709,8 @@
//淇敼鍑哄簱鍗曚俊鎭�
Db.Updateable(notice).ExecuteCommand();
}
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
catch (Exception e)
@@ -908,7 +910,8 @@
//淇敼鍑哄簱鍗曚俊鎭�
Db.Updateable(notice).ExecuteCommand();
-
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "鎷ｈ揣鍑哄簱", soNo, "鎷ｈ揣", $"鍦≒DA涓婂鍑哄簱鍗曞彿涓猴細{soNo}鐨勬墭鐩樼爜涓猴細{palletNo}鐨勬嫞璐ф搷浣�", userId);
Db.CommitTran();
}
catch (Exception e)
@@ -1281,6 +1284,72 @@
}
}
+ //鏍规嵁鎵樼洏鍙疯幏鍙栧彇鏍风被鍨�
+ public string GetSampleType(string palletNo)
+ {
+ try
+ {
+ var type = "";
+ var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (detail== null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
+ }
+ //鎬庝箞鍒ゆ柇褰撳墠鎵樼洏鏄簱澶栬鍙栨牱鐨勬墭鐩橈紝姝ｅ父鍑哄簱鍓╀綑鎵樼洏鐩墠杩欑鎯呭喌涔熻兘鎷ｈ揣鍟婏紝涔熸病鏈夊垎閰嶄俊鎭�
+ var allot = Db.Queryable<BllExportAllot>().First(m =>
+ m.IsDel == "0" && m.PalletNo == palletNo && m.Status != "5" && m.Status != "6");
+ if (allot!=null)
+ {
+ var soNo = Db.Queryable<BllExportNotice>()
+ .First(m => m.IsDel == "0" && m.SONo == allot.SONo);
+ if (soNo == null)
+ {
+ throw new Exception("鏈壘鍒版墭鐩樹笂鍑哄簱鍗曟嵁淇℃伅");
+ }
+ if (soNo.Type != "3")
+ {
+ throw new Exception("璇ユ墭鐩樹笉鏄彇鏍锋墭鐩�");
+ }
+ type = "0";//搴撳唴鍙栨牱
+ }
+ else
+ {
+ type = "1";//搴撳墠鍙栨牱
+ }
+ return type;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ //鏍规嵁鎵樼洏鍙疯幏鍙栧叆搴撳崟鎹�
+ public List<string> GetAsnNoByPallet(string palletNo)
+ {
+ try
+ {
+ var type = "";
+ var detail = Db.Queryable<DataStockDetail>().First(m => m.IsDel == "0" && m.PalletNo == palletNo);
+ if (detail == null)
+ {
+ throw new Exception("褰撳墠鎵樼洏鏈湪搴撳瓨涓�");
+ }
+
+ var list = new List<string>();
+ if (string.IsNullOrWhiteSpace(detail.ASNNo))
+ {
+ throw new Exception("鏈煡璇㈠埌璇ユ墭鐩樼殑鍏ュ簱鍗曚俊鎭�");
+ }
+ list.Add(detail.ASNNo);
+ return list;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
}
}
--
Gitblit v1.8.0