From e9ef6afe836784d7fbd3e3ca6ad813e86866a6a8 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 25 十二月 2024 17:52:27 +0800
Subject: [PATCH] 生成补料和生成超领
---
Controllers/Wom/MesWorkProdController.cs | 146 +++++++++++++++++-------
service/Warehouse/MesItemBlManager.cs | 127 +++++++++++---------
service/Warehouse/MesItemTblManager.cs | 15 +-
Dto/service/WarehouseQuery.cs | 3
Controllers/Warehouse/MesItemBlController.cs | 24 ++++
5 files changed, 206 insertions(+), 109 deletions(-)
diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index 99306e6..998066a 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.cs
@@ -371,5 +371,29 @@
}
}
+
+ [HttpPost("PrintBarcodeForOverPicking")]
+ public ResponseResult PrintForOverPicking(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var (success, pendingList) =
+ _manager.PrintBarcodeForOverPicking(query);
+ resultInfos.success = success;
+ resultInfos.pendingList = pendingList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
#endregion
}
\ No newline at end of file
diff --git a/Controllers/Wom/MesWorkProdController.cs b/Controllers/Wom/MesWorkProdController.cs
index 0c571b7..d10af04 100644
--- a/Controllers/Wom/MesWorkProdController.cs
+++ b/Controllers/Wom/MesWorkProdController.cs
@@ -1,31 +1,34 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.Wom;
-[ApiController]
+/// <summary>
+/// 鐢熶骇鎶ュ伐鐩稿叧鎺ュ彛
+/// </summary>
[Route("api/[controller]")]
+[ApiController]
public class MesWorkProdController : ControllerBase
{
- private readonly MesWorkProdManager m = new();
+ private readonly MesWorkProdManager _manager = new();
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+ #region 鍩虹CRUD
/// <summary>
- /// 鑾峰彇鎵�鏈�
+ /// 鑾峰彇鎵�鏈�
/// </summary>
- /// <returns></returns>
+ /// <returns>鎶ュ伐鍗曞垪琛�</returns>
[HttpPost("GetList")]
public ResponseResult GetList()
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
+ resultInfos.tbBillList = _manager.GetList();
return new ResponseResult
{
status = 0,
@@ -39,18 +42,17 @@
}
}
-
/// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
+ /// 鏍规嵁涓婚敭鑾峰彇
/// </summary>
- /// <returns></returns>
+ /// <returns>鎶ュ伐鍗曚俊鎭�</returns>
[HttpPost("GetById")]
public ResponseResult GetById(int id)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
+ resultInfos.tbBillList = _manager.GetById(id);
return new ResponseResult
{
status = 0,
@@ -65,16 +67,16 @@
}
/// <summary>
- /// 鏍规嵁涓婚敭鍒犻櫎
+ /// 鏍规嵁涓婚敭鍒犻櫎
/// </summary>
- /// <returns></returns>
+ /// <returns>鍒犻櫎缁撴灉</returns>
[HttpPost("DeleteByIds")]
public ResponseResult DeleteByIds([FromBody] object[] ids)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeleteByIds(ids);
+ resultInfos.tbBillList = _manager.DeleteByIds(ids);
return new ResponseResult
{
status = 0,
@@ -89,16 +91,16 @@
}
/// <summary>
- /// 娣诲姞
+ /// 娣诲姞
/// </summary>
- /// <returns></returns>
+ /// <returns>娣诲姞缁撴灉</returns>
[HttpPost("Insert")]
public ResponseResult Add([FromBody] MesWorkProd data)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
+ resultInfos.tbBillList = _manager.Insert(data);
return new ResponseResult
{
status = 0,
@@ -113,40 +115,16 @@
}
/// <summary>
- /// 娣诲姞杩斿洖鑷
+ /// 淇敼
/// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesWorkProd data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
+ /// <returns>淇敼缁撴灉</returns>
[HttpPost("Update")]
public ResponseResult Update([FromBody] MesWorkProd data)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
+ resultInfos.tbBillList = _manager.Update(data);
return new ResponseResult
{
status = 0,
@@ -159,4 +137,84 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ #endregion
+
+ #region 鐢熶骇鎶ュ伐
+
+ /// <summary>
+ /// PDA鎵弿鐢熶骇鎶ュ伐
+ /// </summary>
+ /// <param name="request">鎶ュ伐璇锋眰鍙傛暟</param>
+ /// <returns>鎶ュ伐缁撴灉</returns>
+ /// <remarks>
+ /// 璇锋眰绀轰緥:
+ ///
+ /// POST /api/MesWorkProd/ScanWork
+ /// {
+ /// "staffNo": "ST001",
+ /// "itemBarcode": "BC001",
+ /// "userNo": "admin"
+ /// }
+ /// </remarks>
+ /// <response code="200">鎵弿鎴愬姛</response>
+ /// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
+ [HttpPost("ScanWork")]
+ public ResponseResult ScanWork([FromBody] ScanWorkRequest request)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.result = _manager.ScanWorkAsync(request);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// PDA鎵弿鐢熶骇鎶ュ伐(甯︽暟閲�)
+ /// </summary>
+ /// <param name="request">鎶ュ伐璇锋眰鍙傛暟</param>
+ /// <returns>鎶ュ伐缁撴灉</returns>
+ /// <remarks>
+ /// 璇锋眰绀轰緥:
+ ///
+ /// POST /api/MesWorkProd/ScanWorkProd
+ /// {
+ /// "itemBarcode": "BC001",
+ /// "quantity": 10,
+ /// "userNo": "admin"
+ /// }
+ /// </remarks>
+ /// <response code="200">鎵弿鎴愬姛</response>
+ /// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
+ [HttpPost("ScanWorkProd")]
+ public ResponseResult ScanWorkProd([FromBody] ScanWorkRequest request)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.success = _manager.ScanWorkProdAsync(request);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ #endregion
}
\ No newline at end of file
diff --git a/Dto/service/WarehouseQuery.cs b/Dto/service/WarehouseQuery.cs
index 103d606..2245af7 100644
--- a/Dto/service/WarehouseQuery.cs
+++ b/Dto/service/WarehouseQuery.cs
@@ -26,4 +26,7 @@
public string? daa001 { get; set; }
public decimal? Num { get; set; }
+ public decimal? Fum { get; set; }
+
+ public string? itemNo { get; set; }
}
\ No newline at end of file
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index 690c1d7..46d86b9 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -30,8 +30,9 @@
/// </summary>
/// <param name="billNo">琛ユ枡鍗曞彿</param>
/// <returns>琛ユ枡鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailByBillNo(
- WarehouseQuery query)
+ public (string bl001, List<MesItemBlDetail> item)
+ GetMesItemBlDetailByBillNo(
+ WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
@@ -63,7 +64,7 @@
})
.ToList();
- return blDetails;
+ return (mesItemBl.Bl001, blDetails);
}
/// <summary>
@@ -78,11 +79,10 @@
/// - userName: 鐢ㄦ埛鍚�
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SctlScanBarcode(
- WarehouseQuery query)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
+ SctlScanBarcode(
+ WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
@@ -95,7 +95,6 @@
if (string.IsNullOrEmpty(query.blNo))
throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -164,17 +163,22 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 寮�鍚簨鍔″鐞�
@@ -235,6 +239,7 @@
.Count();
if (itemCount > 0)
+ {
// 鏇存柊宸插瓨鍦ㄧ殑鐗╂枡鏄庣粏鏁伴噺
db.Updateable<MesInvItemOutItems>()
.SetColumns(i =>
@@ -242,7 +247,9 @@
.Where(i =>
i.ItemOutId == outId && i.ItemId == stockBarcode.ItemId)
.ExecuteCommand();
+ }
else
+ {
// 鎻掑叆鏂扮殑鐗╂枡鏄庣粏璁板綍
db.Insertable(new MesInvItemOutItems
{
@@ -268,7 +275,8 @@
// Unit = blDetail.Bld009,
// DepotId = (int)stockBarcode.DepotsId
}).IgnoreColumns(true).ExecuteCommand();
-
+ }
+
// 鎻掑叆鍑哄簱鍗曟潯鐮佹槑缁�
db.Insertable(new MesInvItemOutCDetails
{
@@ -400,17 +408,18 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
@@ -426,11 +435,9 @@
/// - Num: 鍙戞枡鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// - blNo: 琛ユ枡鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList) SplitBarcode(
+ public (bool success, List<MesItemBlDetail> pendingList) SplitBarcode(
WarehouseQuery query)
{
- #region 鍙傛暟鏍￠獙
-
if (string.IsNullOrEmpty(query.userName))
throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
@@ -446,7 +453,6 @@
if (string.IsNullOrEmpty(query.blNo))
throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
- #endregion
// 妫�楠屾槸鍚﹂噸澶嶆壂鎻�
var exists = Db.Queryable<MesInvItemOutCDetails>()
@@ -871,13 +877,14 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
@@ -904,7 +911,7 @@
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鐢熶骇瓒呴鍗曟槑缁嗗垪琛�</returns>
- public List<MesItemBlDetail> GetMesItemBlDetailBySccBillNo(
+ public (string bl001,List<MesItemBlDetail> item) GetMesItemBlDetailBySccBillNo(
WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.billNo))
@@ -952,7 +959,7 @@
})
.ToList();
- return pendingDetails;
+ return (mesItemBl.Bl001,pendingDetails);
}
/// <summary>
@@ -967,7 +974,7 @@
/// - userName: 鐢ㄦ埛鍚�(蹇呭～)
/// - blNo: 瓒呴鍗曞彿(蹇呭～)
/// </remarks>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (WarehouseQuery item, List<MesItemBlDetail> pendingList)
ScanBarcodeForOverPicking(
WarehouseQuery query)
{
@@ -1071,17 +1078,21 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (false, pendingList);
+ query.Num = stockBarcode.Quantity;
+ query.Fum = quantity;
+
+ return (query, pendingList);
}
// 鎵ц鏁版嵁搴撲簨鍔�
@@ -1282,17 +1293,18 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
- return (true, finalPendingList);
+ return (query, finalPendingList);
}
/// <summary>
@@ -1300,7 +1312,7 @@
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
- public (bool success, List<PendingMaterialDto> pendingList)
+ public (bool success, List<MesItemBlDetail> pendingList)
PrintBarcodeForOverPicking(WarehouseQuery query)
{
UseTransaction(db =>
@@ -1687,13 +1699,14 @@
new JoinQueryInfos(JoinType.Left, a.Id == b.Mid))
.Where((a, b) => a.BlNo == query.blNo
&& (b.Bld007 ?? 0) - (b.Bld008 ?? 0) > 0)
- .Select((a, b) => new PendingMaterialDto
+ .Select((a, b) => new MesItemBlDetail
{
- SectionCode = b.Bld012.ToString(),
- ItemNo = b.Bld002,
- ItemName = b.Bld003,
- ItemSpec = b.Bld004,
- PendingQty = (b.Bld007 ?? 0) - (b.Bld008 ?? 0)
+ Bld012 = b.Bld012,
+ Bld002 = b.Bld002,
+ Bld003 = b.Bld003,
+ Bld004 = b.Bld004,
+ Bld007 = b.Bld007,
+ Bld008 = b.Bld008
})
.ToList();
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 9560243..75ee6e3 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -35,8 +35,8 @@
BillNo = a.BillNo,
Tlid = b.Tlid,
Tlmid = b.Tlmid,
- Tld005 = b.Tld005,
- Tld006 = b.Tld006,
+ Tld005 = b.Tld005 ?? 0,
+ Tld006 = b.Tld006 ?? 0,
Tld009 = b.Tld009,
ItemNo = c.ItemNo,
ItemName = c.ItemName,
@@ -70,7 +70,7 @@
return warehouseQuery;
}
- public bool SctlScanBarcode(WarehouseQuery query)
+ public WarehouseQuery SctlScanBarcode(WarehouseQuery query)
{
var p_item_barcode = query.barcode;
var p_bill_no = query.billNo;
@@ -406,10 +406,9 @@
return totalResult;
});
-
- // 璁剧疆杩斿洖缁撴灉
- // c_result = $"001[,{c_mes_inv_item_barcodes.ItemNo},{c_quantity},鎵爜鎴愬姛锛�,鍙傝�冨簱浣岪鐗╂枡@寰呴��鏁伴噺{c_in_field_valT}";
-
- return true;
+
+ query.itemNo = c_mes_inv_item_barcodes.ItemNo;
+ query.Num = c_quantity.Value;
+ return query;
}
}
\ No newline at end of file
--
Gitblit v1.9.3