From 8dd9fc1a302394e1511f44ec35127e42fd20c1ea Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 07 二月 2025 08:10:38 +0800
Subject: [PATCH] 1.条码拆分
---
service/Warehouse/MesItemBlManager.cs | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 7181715..b8f5a7a 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -14,12 +14,12 @@
/// 鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
/// </summary>
/// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
- public List<string> GetSCBLBillNo()
+ public List<string> GetSCBLBillNo(WarehouseQuery query)
{
var list = Db.Queryable<MesItemBl>()
.Where(s => (s.Bl018 ?? false) == true
&& (s.Bl019 ?? false) == false
- && s.Bl008 == "鐢熶骇琛ユ枡")
+ && s.Bl008 == query.Type)
.Select(s => s.BlNo)
.ToList();
return list;
@@ -39,7 +39,7 @@
// 妫�鏌ヨˉ鏂欏崟鏄惁瀛樺湪涓斾负鐢熶骇琛ユ枡绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇琛ユ枡")
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
.First();
if (mesItemBl == null)
@@ -68,6 +68,7 @@
}
/// <summary>
+ /// 鐢熶骇宸ュ崟琛ユ枡鎵爜
/// 鎵弿鏉＄爜 prc_rf_pda_scan_zout_barcode3
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
@@ -80,7 +81,7 @@
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
- SctlScanBarcode(
+ ScblScanBarcode(
WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
@@ -114,7 +115,7 @@
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo)
.First();
if (mesItemBl == null)
@@ -505,8 +506,8 @@
// Mblnr = stockBarcode.Mblnr,
// Zeile = stockBarcode.Zeile,
// RohInId = stockBarcode.RohInId,
- // BarcodeStatus = 0,
- // OldQty = query.Num,
+ Barcodestatus = false,
+ Oldqty = query.Num as long?,
// Unit = stockBarcode.Unit,
// WeightUnit = stockBarcode.WeightUnit,
Factory = stockBarcode.Factory,
@@ -519,8 +520,9 @@
// MemoBad = stockBarcode.MemoBad,
ComeFlg = 5,
// Memo = stockBarcode.Memo,
+ SuppId = stockBarcode.SuppId,
SuppNo = stockBarcode.SuppNo,
- // InsDate = stockBarcode.InsDate, // Added InsDate
+ InsDate = stockBarcode.IndepDate, // Added InsDate
ItemId = stockBarcode.ItemId
// ItemUnit = stockBarcode.ItemUnit // Added ItemUnit
}).IgnoreColumns(true).ExecuteCommand();
@@ -891,12 +893,12 @@
#region 鐢熶骇瓒呴
- public List<string> GetSccList()
+ public List<string> GetSccList(WarehouseQuery query)
{
var list = Db.Queryable<MesItemBl>()
.Where(s => (s.Bl018 ?? false) == true
&& (s.Bl019 ?? false) == false
- && s.Bl008 == "鐢熶骇瓒呴")
+ && s.Bl008 == query.Type)
.Select(s => s.BlNo)
.ToList();
return list;
@@ -914,9 +916,9 @@
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
- // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴绫诲瀷
+ // 妫�鏌ヨ秴棰嗗崟鏄惁瀛樺湪涓斾负鐢熶骇瓒呴/濮斿瓒呴绫诲瀷
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.billNo && a.Bl008 == "鐢熶骇瓒呴")
+ .Where(a => a.BlNo == query.billNo && a.Bl008 == query.Type)
.First();
if (mesItemBl == null)
--
Gitblit v1.9.3