From f21570315d6c60c4e7b4c0227a8593ac2a24cfc0 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 12 五月 2025 13:56:51 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.WMS/Common/Preparation.cs | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/Tiger.Business.WMS/Common/Preparation.cs b/Tiger.Business.WMS/Common/Preparation.cs
index c201669..f0010dd 100644
--- a/Tiger.Business.WMS/Common/Preparation.cs
+++ b/Tiger.Business.WMS/Common/Preparation.cs
@@ -45,33 +45,33 @@
/// <returns></returns>
public ApiAction<ScanOutput> AddOrder(BIZ_WMS_PREP.BIZ_TYPEs bizType, string orderNo)
{
- lock(AddOrderLock)
+ lock (AddOrderLock)
{
- var action = new ApiAction<ScanOutput>(new ScanOutput());
-
- // 鏌ヨ鏄惁宸插瓨鍦ㄥ鏂欎换鍔�
- var src = MainDB.Queryable<BIZ_WMS_PREP_SRC>().Where(q => q.SOURCE_ORDER == orderNo &&
- SqlFunc.Subqueryable<BIZ_WMS_PREP>().Where(p => p.STATUS < BIZ_WMS_PREP.STATUSs.Sended.GetValue()).Any()).First();
- if (Order.IsNullOrEmpty())
- {
- if (!src.IsNullOrEmpty())
- {
- Order = MainDB.Queryable<BIZ_WMS_PREP>().Where(q => q.ORDER_NO == src.ORDER_NO).IncludesAllFirstLayer().First();
+ var action = new ApiAction<ScanOutput>(new ScanOutput());
+
+ // 鏌ヨ鏄惁宸插瓨鍦ㄥ鏂欎换鍔�
+ var src = MainDB.Queryable<BIZ_WMS_PREP_SRC>().Where(q => q.SOURCE_ORDER == orderNo &&
+ SqlFunc.Subqueryable<BIZ_WMS_PREP>().Where(p => p.STATUS < BIZ_WMS_PREP.STATUSs.Sended.GetValue()).Any()).First();
+ if (Order.IsNullOrEmpty())
+ {
+ if (!src.IsNullOrEmpty())
+ {
+ Order = MainDB.Queryable<BIZ_WMS_PREP>().Where(q => q.ORDER_NO == src.ORDER_NO).IncludesAllFirstLayer().First();
//action.LocaleMsg = Biz.L("澶囨枡浠诲姟[{0}娣诲姞]鍗曟嵁[{1}]鎴愬姛锛岃閫夋嫨澶囨枡鐨勭墿鏂欒");
action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.LoadSuccess", Order?.ORDER_NO, orderNo);
return action;
- }
- else
- {
- Order = new BIZ_WMS_PREP()
- {
+ }
+ else
+ {
+ Order = new BIZ_WMS_PREP()
+ {
AUTH_ORG = OrgCode,
ORDER_NO = $"MP{DateTime.Now:yyMMdd}{(DateTime.Now - DateTime.Today).TotalSeconds:00000}",
- BIZ_TYPE = bizType.GetValue(),
- STATUS = BIZ_WMS_PREP.STATUSs.Init.GetValue(),
- };
- }
- }
+ BIZ_TYPE = bizType.GetValue(),
+ STATUS = BIZ_WMS_PREP.STATUSs.Init.GetValue(),
+ };
+ }
+ }
//鍚堝苟鍙戞枡鍙�傜敤浜庡寘瑁呰溅闂村伐鍗曞彂鏂欙紝闆呰揪鍖呰杞﹂棿缂栫爜锛�1002310010030758
else if (Order.WS_CODE != "1002310010030758")
{
@@ -81,23 +81,23 @@
return action;
}
- if (!src.IsNullOrEmpty() && src.ORDER_NO != Order.ORDER_NO)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]宸插睘浜庡鏂欎换鍔{1}]锛屾棤娉曟坊鍔犲埌褰撳墠澶囨枡浠诲姟[{2}]涓紝濡傞渶鍒囨崲澶囨枡涓氬姟锛岃閫�鍑哄悗閲嶆柊閫夋嫨");
- action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoFound", orderNo, src.ORDER_NO, Order.ORDER_NO);
- return action;
- }
+ if (!src.IsNullOrEmpty() && src.ORDER_NO != Order.ORDER_NO)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]宸插睘浜庡鏂欎换鍔{1}]锛屾棤娉曟坊鍔犲埌褰撳墠澶囨枡浠诲姟[{2}]涓紝濡傞渶鍒囨崲澶囨枡涓氬姟锛岃閫�鍑哄悗閲嶆柊閫夋嫨");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoFound", orderNo, src.ORDER_NO, Order.ORDER_NO);
+ return action;
+ }
// 鏌ヨ鍗曟嵁鏄庣粏锛屽苟鍚堝苟鍒板鏂欏崟鐨勫鏂欐槑缁嗕腑
var srcDtls = bizType.GetPickList(orderNo);
- if (srcDtls.Sum(q => q.QTY_ACT_REQ) <= 0)
- {
- action.IsSuccessed = false;
- //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]鏈壘鍒伴渶瑕佸鏂欑殑琛屾槑缁嗭紝璇锋壂鎻忔纭殑鍗曟嵁");
- action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoNeedPrep", orderNo);
- return action;
- }
+ if (srcDtls.Sum(q => q.QTY_ACT_REQ) <= 0)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = Biz.L("鍗曟嵁[{0}]鏈壘鍒伴渶瑕佸鏂欑殑琛屾槑缁嗭紝璇锋壂鎻忔纭殑鍗曟嵁");
+ action.LocaleMsg = Biz.L("WMS.Out_BIZ_WMS_PREP.AddOrder.NoNeedPrep", orderNo);
+ return action;
+ }
//鍚堝苟鍙戞枡鍙�傜敤浜庡寘瑁呰溅闂村伐鍗曞彂鏂�
if (!src.IsNullOrEmpty() && Order.BIZ_TYPE == BIZ_WMS_PREP.BIZ_TYPEs.WorkOrder.GetValue())
{
@@ -135,11 +135,11 @@
var pdtl = Order.Details.Where(q => q.ITEM_CODE == sdtl.ITEM_CODE).FirstOrDefault();
if (pdtl.IsNullOrEmpty())
{
- pdtl = new ()
+ pdtl = new()
{
AUTH_ORG = OrgCode,
ORDER_NO = Order.ORDER_NO,
- ORDER_LINE = (Order.Details.Max(q => q.LINE_CODE.ToInt32()) + 1).ToString(),
+ ORDER_LINE = Order.Details.Count == 0 ? "1" : (Order.Details.Max(q => q.LINE_CODE.ToInt32()) + 1).ToString(),
ITEM_CODE = sdtl.ITEM_CODE,
SUBITEM_CODE = sdtl.SUBITEM_CODE,
UNIT = sdtl.UNIT,
@@ -172,7 +172,7 @@
var srcInfo = Order.SourceOrders.Select(q => new { q.SOURCE_CODE, q.SOURCE_ORDER }).DistinctBy(q => q.SOURCE_ORDER).OrderBy(q => q.SOURCE_ORDER);
Order.SOURCE_CODE = string.Join(",", srcInfo.Select(q => q.SOURCE_CODE));
Order.SOURCE_ORDER = string.Join(",", srcInfo.Select(q => q.SOURCE_ORDER));
-
+
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = Biz.Db;
var dbTran = db.UseTran(() =>
--
Gitblit v1.9.3