From 7e4085b2b97386abb8b7dc5626953dc79b1f1b45 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 08 一月 2025 08:24:48 +0800
Subject: [PATCH] 11
---
entity/MesCgthSqDetail.cs | 97 ++++
entity/MesInvItemIns.cs | 200 ++++-----
Dto/service/OutItemDto.cs | 2
entity/MesCgthSq.cs | 113 +++++
entity/MesInvItemArn.cs | 170 ++++----
service/Warehouse/MesCgthSqManager.cs | 145 +++++++
Controllers/Warehouse/MesCgthSqController.cs | 234 +++++++++++
service/Warehouse/MesItemTblManager.cs | 24
Controllers/Warehouse/MesItemBlController.cs | 47 +-
service/Warehouse/TransferOutManager.cs | 91 +--
service/Warehouse/MesInvItemInCDetailsManager.cs | 2
Controllers/Warehouse/TransferOutController.cs | 63 +-
service/Warehouse/MesInvItemOutsManager.cs | 2
13 files changed, 865 insertions(+), 325 deletions(-)
diff --git a/Controllers/Warehouse/MesCgthSqController.cs b/Controllers/Warehouse/MesCgthSqController.cs
new file mode 100644
index 0000000..5f38f1d
--- /dev/null
+++ b/Controllers/Warehouse/MesCgthSqController.cs
@@ -0,0 +1,234 @@
+锘縰sing System.Dynamic;
+using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.Warehouse;
+using NewPdaSqlServer.util;
+
+namespace NewPdaSqlServer.Controllers.Warehouse;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MesCgthSqController : ControllerBase
+{
+ private readonly MesCgthSqManager m = new();
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夊凡缁忓鏍哥殑鐢宠鍗�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetMesCgthSq")]
+ public ResponseResult GetMesCgthSq()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetMesCgthSq();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夊凡缁忓鏍哥殑鐢宠鍗�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetSumItem")]
+ public ResponseResult GetSumItem(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetSumItem(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //ScanCode
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夊凡缁忓鏍哥殑鐢宠鍗�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("ScanCode")]
+ public ResponseResult ScanCode(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.ScanCode(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] MesCgthSq data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] MesCgthSq 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>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] MesCgthSq data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index ce03abd..b196f79 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.cs
@@ -163,38 +163,35 @@
}
/// <summary>
- /// 鐢熶骇琛ユ枡鍗曟潯鐮佹媶鍒�
+ /// 鐢熶骇琛ユ枡鍗曟潯鐮佹媶鍒�
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>鎷嗗垎缁撴灉鍜屽緟澶勭悊鍒楄〃</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
+ /// 璇锋眰绀轰緥:
/// POST /api/MesItemBl/SplitBarcode
/// {
- /// "billNo": "WO202401010001", // 宸ュ崟鍙�(蹇呭～)
- /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
- /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
- /// "blNo": "BL202401010001", // 琛ユ枡鍗曞彿(蹇呭～)
- /// "Num": 10 // 鎷嗗垎鏁伴噺(蹇呭～,蹇呴』澶т簬0)
+ /// "billNo": "WO202401010001", // 宸ュ崟鍙�(蹇呭～)
+ /// "barcode": "BC001", // 鏉＄爜鍙�(蹇呭～)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "blNo": "BL202401010001", // 琛ユ枡鍗曞彿(蹇呭～)
+ /// "Num": 10 // 鎷嗗垎鏁伴噺(蹇呭～,蹇呴』澶т簬0)
/// }
- ///
- /// 涓氬姟澶勭悊锛�
- /// - 楠岃瘉琛ユ枡鍗曠姸鎬�
- /// - 楠岃瘉鏉＄爜搴撳瓨淇℃伅
- /// - 楠岃瘉鎷嗗垎鏁伴噺鏄惁鍚堢悊
- /// - 鎵ц鏉＄爜鎷嗗垎浜嬪姟澶勭悊
- /// - 鏇存柊宸ュ崟鍜岃ˉ鏂欏崟鐩稿叧鏁伴噺
- ///
- /// 杩斿洖鏁版嵁鍖呭惈锛�
- /// - success: 鎷嗗垎鏄惁鎴愬姛
- /// - pendingList: 寰呭鐞嗘槑缁嗗垪琛紝鍖呭惈锛�
- /// * Bld012: 鐗╂枡ID
- /// * Bld002: 鐗╂枡缂栧彿
- /// * Bld003: 鐗╂枡鍚嶇О
- /// * Bld004: 鐗╂枡瑙勬牸
- /// * Bld007: 璁″垝鏁伴噺
- /// * Bld008: 宸茶ˉ鏁伴噺
+ /// 涓氬姟澶勭悊锛�
+ /// - 楠岃瘉琛ユ枡鍗曠姸鎬�
+ /// - 楠岃瘉鏉＄爜搴撳瓨淇℃伅
+ /// - 楠岃瘉鎷嗗垎鏁伴噺鏄惁鍚堢悊
+ /// - 鎵ц鏉＄爜鎷嗗垎浜嬪姟澶勭悊
+ /// - 鏇存柊宸ュ崟鍜岃ˉ鏂欏崟鐩稿叧鏁伴噺
+ /// 杩斿洖鏁版嵁鍖呭惈锛�
+ /// - success: 鎷嗗垎鏄惁鎴愬姛
+ /// - pendingList: 寰呭鐞嗘槑缁嗗垪琛紝鍖呭惈锛�
+ /// * Bld012: 鐗╂枡ID
+ /// * Bld002: 鐗╂枡缂栧彿
+ /// * Bld003: 鐗╂枡鍚嶇О
+ /// * Bld004: 鐗╂枡瑙勬牸
+ /// * Bld007: 璁″垝鏁伴噺
+ /// * Bld008: 宸茶ˉ鏁伴噺
/// </remarks>
/// <response code="200">鎷嗗垎鎴愬姛</response>
/// <response code="400">鎷嗗垎澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
diff --git a/Controllers/Warehouse/TransferOutController.cs b/Controllers/Warehouse/TransferOutController.cs
index b826b2b..d37e531 100644
--- a/Controllers/Warehouse/TransferOutController.cs
+++ b/Controllers/Warehouse/TransferOutController.cs
@@ -7,7 +7,7 @@
namespace NewPdaSqlServer.Controllers.Warehouse;
/// <summary>
-/// 璋冩嫧鍑哄簱鐩稿叧鎺ュ彛
+/// 璋冩嫧鍑哄簱鐩稿叧鎺ュ彛
/// </summary>
[Route("api/[controller]")]
[ApiController]
@@ -18,7 +18,7 @@
#region 鍩虹CRUD
/// <summary>
- /// 鑾峰彇鎵�鏈夎皟鎷ㄥ嚭搴撳崟
+ /// 鑾峰彇鎵�鏈夎皟鎷ㄥ嚭搴撳崟
/// </summary>
/// <returns>璋冩嫧鍑哄簱鍗曞垪琛�</returns>
[HttpPost("GetList")]
@@ -46,11 +46,11 @@
#region 璋冩嫧鍑哄簱涓氬姟
/// <summary>
- /// 鑾峰彇鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃
+ /// 鑾峰彇鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃
/// </summary>
/// <returns>鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃</returns>
/// <remarks>
- /// 鑾峰彇鐢宠鏁伴噺(sq)涓嶇瓑浜庡凡鎵暟閲�(ys)鐨勮皟鎷ㄥ嚭搴撳崟鍙峰垪琛�
+ /// 鑾峰彇鐢宠鏁伴噺(sq)涓嶇瓑浜庡凡鎵暟閲�(ys)鐨勮皟鎷ㄥ嚭搴撳崟鍙峰垪琛�
/// </remarks>
/// <response code="200">鎴愬姛鑾峰彇璋冩嫧鍑哄簱鍗曞彿鍒楄〃</response>
/// <response code="400">鑾峰彇澶辫触</response>
@@ -75,33 +75,33 @@
}
/// <summary>
- /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧緟澶勭悊鐨勮皟鎷ㄥ嚭搴撴槑缁嗗垪琛�
+ /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧緟澶勭悊鐨勮皟鎷ㄥ嚭搴撴槑缁嗗垪琛�
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>寰呭鐞嗙殑璋冩嫧鍑哄簱鏄庣粏鍒楄〃</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
+ /// 璇锋眰绀轰緥:
/// POST /api/TransferOut/GetTransferOutDetailListByBillNo
/// {
- /// "billNo": "DB202401010001" // 璋冩嫧鍗曞彿(蹇呭～)
+ /// "billNo": "DB202401010001" // 璋冩嫧鍗曞彿(蹇呭～)
/// }
- ///
- /// 杩斿洖鏈畬鎴愮殑鏄庣粏璁板綍(ShNum-YsNum>0)锛屽寘鍚細
- /// - ItemNo: 鐗╂枡缂栧彿
- /// - ItemModel: 鐗╂枡瑙勬牸
- /// - ShNum: 鐢宠鏁伴噺
- /// - YsNum: 宸叉壂鏁伴噺
+ /// 杩斿洖鏈畬鎴愮殑鏄庣粏璁板綍(ShNum-YsNum>0)锛屽寘鍚細
+ /// - ItemNo: 鐗╂枡缂栧彿
+ /// - ItemModel: 鐗╂枡瑙勬牸
+ /// - ShNum: 鐢宠鏁伴噺
+ /// - YsNum: 宸叉壂鏁伴噺
/// </remarks>
/// <response code="200">鎴愬姛鑾峰彇璋冩嫧鍑哄簱鏄庣粏</response>
/// <response code="400">鑾峰彇澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
[HttpPost("GetTransferOutDetailListByBillNo")]
- public ResponseResult GetTransferOutDetailListByBillNo([FromBody] WarehouseQuery query)
+ public ResponseResult GetTransferOutDetailListByBillNo(
+ [FromBody] WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetTransferOutDetailListByBillNo(query);
+ resultInfos.tbBillList =
+ _manager.GetTransferOutDetailListByBillNo(query);
return new ResponseResult
{
status = 0,
@@ -116,30 +116,27 @@
}
/// <summary>
- /// 鎵弿鏉＄爜杩涜璋冩嫧鍑哄簱澶勭悊
+ /// 鎵弿鏉＄爜杩涜璋冩嫧鍑哄簱澶勭悊
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉鍜屽緟澶勭悊鏄庣粏</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- ///
+ /// 璇锋眰绀轰緥:
/// POST /api/TransferOut/ScanMoveBarcode
/// {
- /// "billNo": "DB202401010001", // 璋冩嫧鍗曞彿(蹇呭～)
- /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
- /// "barcode": "BC001" // 鏉＄爜鍙�(蹇呭～)
+ /// "billNo": "DB202401010001", // 璋冩嫧鍗曞彿(蹇呭～)
+ /// "userName": "admin", // 鐢ㄦ埛鍚�(蹇呭～)
+ /// "barcode": "BC001" // 鏉＄爜鍙�(蹇呭～)
/// }
- ///
- /// 涓氬姟澶勭悊锛�
- /// - 楠岃瘉璋冩嫧鍗曠姸鎬�
- /// - 楠岃瘉鏉＄爜搴撳瓨淇℃伅
- /// - 楠岃瘉浠撳簱涓�鑷存��
- /// - 楠岃瘉鏁伴噺鏄惁瓒呭嚭鏈壂鏁伴噺
- /// - 鎵ц璋冩嫧鍑哄簱浜嬪姟澶勭悊
- ///
- /// 杩斿洖鏁版嵁鍖呭惈锛�
- /// - form: 澶勭悊缁撴灉琛ㄥ崟
- /// - items: 寰呭鐞嗘槑缁嗗垪琛�
+ /// 涓氬姟澶勭悊锛�
+ /// - 楠岃瘉璋冩嫧鍗曠姸鎬�
+ /// - 楠岃瘉鏉＄爜搴撳瓨淇℃伅
+ /// - 楠岃瘉浠撳簱涓�鑷存��
+ /// - 楠岃瘉鏁伴噺鏄惁瓒呭嚭鏈壂鏁伴噺
+ /// - 鎵ц璋冩嫧鍑哄簱浜嬪姟澶勭悊
+ /// 杩斿洖鏁版嵁鍖呭惈锛�
+ /// - form: 澶勭悊缁撴灉琛ㄥ崟
+ /// - items: 寰呭鐞嗘槑缁嗗垪琛�
/// </remarks>
/// <response code="200">鎵弿鎴愬姛</response>
/// <response code="400">鎵弿澶辫触锛岃繑鍥炲叿浣撻敊璇俊鎭�</response>
diff --git a/Dto/service/OutItemDto.cs b/Dto/service/OutItemDto.cs
index b897f34..43045ef 100644
--- a/Dto/service/OutItemDto.cs
+++ b/Dto/service/OutItemDto.cs
@@ -12,5 +12,5 @@
public decimal? Quantity { get; set; }
- public List<MesInvItemOutItems>? SumItem { get; set; }
+ public List<MesCgthSqDetail>? SumItem { get; set; }
}
\ No newline at end of file
diff --git a/entity/MesCgthSq.cs b/entity/MesCgthSq.cs
new file mode 100644
index 0000000..eef073a
--- /dev/null
+++ b/entity/MesCgthSq.cs
@@ -0,0 +1,113 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// 閲囪喘閫�璐х敵璇�
+/// </summary>
+[SugarTable("MES_CGTH_SQ")]
+public class MesCgthSq
+{
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string BillNo { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庤窡鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LAST_UPDATE_USER")]
+ public string LastUpdateUser { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LAST_UPDATE_TIME")]
+ public DateTime? LastUpdateTime { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
+ public string CheckUser { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
+ public bool? Status { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹屾垚
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FINISH")]
+ public bool? IsFinish { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欐柟寮�
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_METHOD")]
+ public string ReturnMethod { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欑被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_TYPE")]
+ public string ReturnType { get; set; }
+
+ /// <summary>
+ /// 浠撳簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_ID")]
+ public int? DepotId { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public int? SuppId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 濮斿鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_OUT")]
+ public bool? IsOut { get; set; }
+
+ /// <summary>
+ /// 閫�璐х粍缁嘔D
+ /// </summary>
+ [SugarColumn(ColumnName = "TH_ORG_ID")]
+ public string ThOrgId { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesCgthSqDetail.cs b/entity/MesCgthSqDetail.cs
new file mode 100644
index 0000000..96dc934
--- /dev/null
+++ b/entity/MesCgthSqDetail.cs
@@ -0,0 +1,97 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// 閲囪喘閫�璐х敵璇锋槑缁�
+/// </summary>
+[SugarTable("MES_CGTH_SQ_DETAIL")]
+public class MesCgthSqDetail
+{
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MID")]
+ public Guid? Mid { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_BILL_NO")]
+ public string InvBillNo { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "INV_WORK_LINE")]
+ public int? InvWorkLine { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
+ public string Ebeln { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟id
+ /// </summary>
+ [SugarColumn(ColumnName = "EID")]
+ public int? Eid { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
+ public int? Erpid { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public int? ItemId { get; set; }
+
+ /// <summary>
+ /// 鐢宠鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SQ_NUM")]
+ public decimal? SqNum { get; set; }
+
+ /// <summary>
+ /// 宸叉壂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "YS_NUM")]
+ public decimal? YsNum { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹屾垚
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FINISH")]
+ public bool? IsFinish { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_NO")]
+ public int? OrderNo { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏄庣粏鐨刧uid
+ /// </summary>
+ [SugarColumn(ColumnName = "RKMX_GUID")]
+ public Guid? RkmxGuid { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? ItemNo { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesInvItemArn.cs b/entity/MesInvItemArn.cs
index b3bd8bb..fca1937 100644
--- a/entity/MesInvItemArn.cs
+++ b/entity/MesInvItemArn.cs
@@ -8,243 +8,243 @@
public class MesInvItemArn
{
/// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// 涓婚敭
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鍒拌揣鍗曞彿
- ///</summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "bill_no")]
public string? BillNo { get; set; }
/// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "status")]
public int? Status { get; set; }
/// <summary>
- /// 鍘熷洜
- ///</summary>
+ /// 鍘熷洜
+ /// </summary>
[SugarColumn(ColumnName = "reason")]
public string? Reason { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "create_by")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "create_date")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "lastupdate_by")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "lastupdate_date")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷ID
- ///</summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
[SugarColumn(ColumnName = "bill_type_id")]
public int? BillTypeId { get; set; }
/// <summary>
- /// 浜嬪姟绫诲瀷ID
- ///</summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
[SugarColumn(ColumnName = "transaction_id")]
public int? TransactionId { get; set; }
/// <summary>
- /// 澶囨敞
- ///</summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "remark")]
public string? Remark { get; set; }
/// <summary>
- /// 閫佽揣鍗曞彿
- ///</summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "paper_bill_no")]
public string? PaperBillNo { get; set; }
/// <summary>
- /// 閫�鏂欎汉宸ュ彿
- ///</summary>
+ /// 閫�鏂欎汉宸ュ彿
+ /// </summary>
[SugarColumn(ColumnName = "user_no_back")]
public string? UserNoBack { get; set; }
/// <summary>
- /// 鎻愪氦浜�
- ///</summary>
+ /// 鎻愪氦浜�
+ /// </summary>
[SugarColumn(ColumnName = "check_user")]
public string? CheckUser { get; set; }
/// <summary>
- /// 鎻愪氦鏃ユ湡
- ///</summary>
+ /// 鎻愪氦鏃ユ湡
+ /// </summary>
[SugarColumn(ColumnName = "check_date")]
public DateTime? CheckDate { get; set; }
/// <summary>
- /// 鍏ュ簱鏃ユ湡
- ///</summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
[SugarColumn(ColumnName = "ins_date")]
public DateTime? InsDate { get; set; }
/// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
[SugarColumn(ColumnName = "check_res")]
public string? CheckRes { get; set; }
/// <summary>
- /// 宸叉崱鏁伴噺
- ///</summary>
+ /// 宸叉崱鏁伴噺
+ /// </summary>
[SugarColumn(ColumnName = "check_qty")]
public int? CheckQty { get; set; }
/// <summary>
- /// 浠撳簱id
- ///</summary>
+ /// 浠撳簱id
+ /// </summary>
[SugarColumn(ColumnName = "depots_id")]
public string? DepotsId { get; set; }
/// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- ///</summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "transction_no")]
public string? TransctionNo { get; set; }
/// <summary>
- /// 渚涘簲鍟唅d
- ///</summary>
+ /// 渚涘簲鍟唅d
+ /// </summary>
[SugarColumn(ColumnName = "supp_id")]
public string? SuppId { get; set; }
/// <summary>
- /// 鎻愪氦鐘舵��
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鎻愪氦鐘舵��
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "fstatus")]
public bool? Fstatus { get; set; }
/// <summary>
- /// 宸ュ巶缂栫爜
- ///</summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "factory")]
public string? Factory { get; set; }
/// <summary>
- /// 鏄惁宸插洖鍐橲AP
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鏄惁宸插洖鍐橲AP
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "sapstatus")]
public int? Sapstatus { get; set; }
/// <summary>
- /// 鏄惁妫�楠�
- ///</summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
[SugarColumn(ColumnName = "ischeck")]
public bool? Ischeck { get; set; }
/// <summary>
- /// 瀹℃牳鍏ュ簱浜�
- ///</summary>
+ /// 瀹℃牳鍏ュ簱浜�
+ /// </summary>
[SugarColumn(ColumnName = "insby")]
public string? Insby { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- ///</summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
[SugarColumn(ColumnName = "company")]
public string? Company { get; set; }
/// <summary>
- /// 鎬ユ枡鏍囪瘑
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "urgent_flag")]
public bool? UrgentFlag { get; set; }
/// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- ///</summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "mttransction_no")]
public int? MttransctionNo { get; set; }
/// <summary>
- /// IQC妫�楠屽崟鍙�
- ///</summary>
+ /// IQC妫�楠屽崟鍙�
+ /// </summary>
[SugarColumn(ColumnName = "iqc_release_no")]
public string? IqcReleaseNo { get; set; }
/// <summary>
- /// 鏄惁鏄剧ず
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鏄惁鏄剧ず
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "is_visual")]
public int? IsVisual { get; set; }
/// <summary>
- /// 0=閲囪喘锛�1=濮斿
- /// 榛樿鍊�: ((1))
- ///</summary>
+ /// 0=閲囪喘锛�1=濮斿
+ /// 榛樿鍊�: ((1))
+ /// </summary>
[SugarColumn(ColumnName = "f_type")]
public bool? FType { get; set; }
/// <summary>
- /// ERP鍒拌揣鍗旾D
- ///</summary>
+ /// ERP鍒拌揣鍗旾D
+ /// </summary>
[SugarColumn(ColumnName = "ebeln_k3id")]
public string? EbelnK3id { get; set; }
/// <summary>
- /// 鏉＄爜鏉″嵃杩涘害
- ///</summary>
+ /// 鏉＄爜鏉″嵃杩涘害
+ /// </summary>
[SugarColumn(ColumnName = "barcode_ratio")]
public int? BarcodeRatio { get; set; }
/// <summary>
- /// ERP鍗曞彿
- ///</summary>
+ /// ERP鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "erpno")]
public string? Erpno { get; set; }
/// <summary>
- /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
- ///</summary>
+ /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ /// </summary>
[SugarColumn(ColumnName = "thstatus")]
public int? Thstatus { get; set; }
/// <summary>
- /// ERP閫�璐у崟鍙�
- ///</summary>
+ /// ERP閫�璐у崟鍙�
+ /// </summary>
[SugarColumn(ColumnName = "erpthno")]
public string? Erpthno { get; set; }
/// <summary>
- /// 缁勭粐缂栫爜
- ///</summary>
+ /// 缁勭粐缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "organize_code")]
public string? OrganizeCode { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
- ///</summary>
+ /// 鏀舵枡缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "ReceiveOrgId")]
public string? ReceiveOrgId { get; set; }
diff --git a/entity/MesInvItemIns.cs b/entity/MesInvItemIns.cs
index 0ffde9b..cf3b109 100644
--- a/entity/MesInvItemIns.cs
+++ b/entity/MesInvItemIns.cs
@@ -9,321 +9,299 @@
public class MesInvItemIns
{
/// <summary>
- /// ID(SEQ_INV_ID)
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// ID(SEQ_INV_ID)
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鍏ュ簱鍗曞彿
- ///</summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
/// <summary>
- /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\\缁撴
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "STATUS")]
public byte? Status { get; set; }
/// <summary>
- /// 浠撳簱
- ///</summary>
+ /// 浠撳簱
+ /// </summary>
[SugarColumn(ColumnName = "DEPOTS_ID")]
public long? DepotsId { get; set; }
/// <summary>
- /// 鍘熷洜
- ///</summary>
+ /// 鍘熷洜
+ /// </summary>
[SugarColumn(ColumnName = "REASON")]
public string? Reason { get; set; }
/// <summary>
- /// 鍒涘缓浜�
- ///</summary>
+ /// 鍒涘缓浜�
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
public string? CreateBy { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string? LastupdateBy { get; set; }
/// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷ID
- ///</summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
[SugarColumn(ColumnName = "BILL_TYPE_ID")]
public long? BillTypeId { get; set; }
/// <summary>
- /// 浜嬪姟绫诲瀷ID
- ///</summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
[SugarColumn(ColumnName = "TRANSACTION_ID")]
public long? TransactionId { get; set; }
/// <summary>
- /// 澶囨敞
- ///</summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "REMARK")]
public string? Remark { get; set; }
/// <summary>
- /// 閫佽揣鍗曞彿
- ///</summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "PAPER_BILL_NO")]
public string? PaperBillNo { get; set; }
/// <summary>
- /// 閫�鏂欎汉宸ュ彿
- ///</summary>
+ /// 閫�鏂欎汉宸ュ彿
+ /// </summary>
[SugarColumn(ColumnName = "USER_NO_BACK")]
public string? UserNoBack { get; set; }
/// <summary>
- /// 瀹℃牳浜�
- ///</summary>
+ /// 瀹℃牳浜�
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_USER")]
public string? CheckUser { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "TASK_NO")]
public string? TaskNo { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "INS_DATE")]
public DateTime? InsDate { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_RES")]
public string? CheckRes { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_QTY")]
public long? CheckQty { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "MMLIST")]
public string? Mmlist { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "EBELN")]
public string? Ebeln { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "DEPOTS_CODE")]
public string? DepotsCode { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "TRANSCTION_NO")]
public string? TransctionNo { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string? SuppNo { get; set; }
/// <summary>
- /// 鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鐘舵�� | 0-鏈鏍� 1-瀹℃牳鍏ュ簱/缁撴
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "FSTATUS")]
public byte? Fstatus { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- ///
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "SAPSTATUS")]
public byte? Sapstatus { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "SAPNO")]
public string? Sapno { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "SAPYEAR")]
public short? Sapyear { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "SAPTEXT")]
public string? Saptext { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "ISCHECK")]
public byte? Ischeck { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "INSBY")]
public string? Insby { get; set; }
/// <summary>
- ///
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "IS_VISUAL")]
public byte? IsVisual { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- ///
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "URGENT_FLAG")]
public byte? UrgentFlag { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "LINE_NO")]
public string? LineNo { get; set; }
/// <summary>
- /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
- ///</summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "MTTRANSCTION_NO")]
public long? MttransctionNo { get; set; }
/// <summary>
- /// 宸ュ崟琛屽彿
- ///</summary>
+ /// 宸ュ崟琛屽彿
+ /// </summary>
[SugarColumn(ColumnName = "TASK_LINO")]
public string? TaskLino { get; set; }
/// <summary>
- /// 鎶曟枡閫氱煡鍗曞崟鍙�
- ///</summary>
+ /// 鎶曟枡閫氱煡鍗曞崟鍙�
+ /// </summary>
[SugarColumn(ColumnName = "FBILLNO")]
public string? Fbillno { get; set; }
/// <summary>
- /// 鎶曟枡鍗曡鍙�
- ///</summary>
+ /// 鎶曟枡鍗曡鍙�
+ /// </summary>
[SugarColumn(ColumnName = "FBILL_LINO")]
public string? FbillLino { get; set; }
/// <summary>
- /// 瀹㈡埛缂栧彿
- ///</summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
public string? CustNo { get; set; }
/// <summary>
- /// 瀹㈡埛鍚嶇О
- ///</summary>
+ /// 瀹㈡埛鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "CUST_NAME")]
public string? CustName { get; set; }
/// <summary>
- /// IQC妫�楠屽崟鍙�
- ///</summary>
+ /// IQC妫�楠屽崟鍙�
+ /// </summary>
[SugarColumn(ColumnName = "IQC_RELEASE_NO")]
public string? IqcReleaseNo { get; set; }
/// <summary>
- /// 鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿
- ///</summary>
+ /// 鍒拌揣鍗曞彿/鍏跺畠鍏ュ簱鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "CBILL_NO")]
public string? CbillNo { get; set; }
/// <summary>
- /// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇�
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 0 鐢宠鍗曪紝1鍏ュ簱鍗曟爣璇�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "PICK_INS")]
public byte? PickIns { get; set; }
/// <summary>
- /// 鍏ュ簱瀹℃牳浜�
- ///</summary>
+ /// 鍏ュ簱瀹℃牳浜�
+ /// </summary>
[SugarColumn(ColumnName = "FCHECK_USER")]
public string? FcheckUser { get; set; }
/// <summary>
- /// 鍏ュ簱瀹℃牳鏃ユ湡
- ///</summary>
+ /// 鍏ュ簱瀹℃牳鏃ユ湡
+ /// </summary>
[SugarColumn(ColumnName = "FCHECK_DATE")]
public DateTime? FcheckDate { get; set; }
/// <summary>
- /// 浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級
- ///</summary>
+ /// 浠诲姟姹囨姤鍗�/宸ュ崟鍙凤紙鎴愬搧鍏ュ簱銆侀��鏂欙級
+ /// </summary>
[SugarColumn(ColumnName = "RBILL_NO")]
public string? RbillNo { get; set; }
/// <summary>
- /// 鎶ュ伐浜�
- ///</summary>
+ /// 鎶ュ伐浜�
+ /// </summary>
[SugarColumn(ColumnName = "BGR")]
public string? Bgr { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_ID")]
public string? SuppId { get; set; }
/// <summary>
- /// 鏀舵枡缁勭粐
- ///</summary>
+ /// 鏀舵枡缁勭粐
+ /// </summary>
[SugarColumn(ColumnName = "ReceiveOrgId")]
public string? ReceiveOrgId { get; set; }
diff --git a/service/Warehouse/MesCgthSqManager.cs b/service/Warehouse/MesCgthSqManager.cs
new file mode 100644
index 0000000..97ad55d
--- /dev/null
+++ b/service/Warehouse/MesCgthSqManager.cs
@@ -0,0 +1,145 @@
+锘縰sing System.Data;
+using System.Data.SqlClient;
+using Masuit.Tools;
+using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using SqlSugar;
+
+namespace NewPdaSqlServer.service.Warehouse;
+
+public class MesCgthSqManager : Repository<MesCgthSq>
+{
+ public List<MesCgthSq> GetMesCgthSq()
+ {
+ return Db.Queryable<MesCgthSq>()
+ .Where(s => s.Status == true)
+ .ToList();
+ }
+
+ public OutItemDto GetSumItem(WarehouseQuery query)
+ {
+ var mesInvItemOuts = base.GetSingle(it => it.BillNo == query.billNo);
+ if (mesInvItemOuts == null) throw new Exception("閲囪喘閫�璐х敵璇峰崟涓嶅瓨鍦�");
+
+ var dto = new OutItemDto();
+ dto.SumItem = GetItems(query);
+
+ var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
+ .Where(a => a.ItemBarcode == query.barcode).Single();
+
+ if (mesInvItemStocks == null) return dto;
+
+ var mesItems = Db.Queryable<MesItems>()
+ .Where(s => s.Id == mesInvItemStocks.ItemId).Single();
+
+ dto.ItemNo = mesItems.ItemNo;
+ dto.Quantity = mesInvItemStocks.Quantity;
+
+ return dto;
+ }
+
+ public List<MesCgthSqDetail> GetItems(WarehouseQuery query)
+ {
+ // 灏濊瘯灏唓uery.id杞崲涓篏uid绫诲瀷锛屽鏋滆浆鎹㈠け璐ワ紝鍒欐姏鍑哄紓甯�
+ var parsedGuid = Guid.Empty;
+ if (string.IsNullOrEmpty(query.id))
+ return new List<MesCgthSqDetail>(); // 濡傛灉query.id涓虹┖锛屽垯杩斿洖绌哄垪琛�
+
+ var isValid = Guid.TryParse(query.id, out parsedGuid);
+ if (!isValid)
+ throw new ApplicationException("GUID杞崲閿欒"); // 濡傛灉杞崲澶辫触锛屽垯鎶涘嚭寮傚父
+
+ // 浣跨敤SqlSugar妗嗘灦鏌ヨMesInvItemOutItems鍜孧esItems琛紝鏍规嵁ItemId杩涜鍐呰繛鎺�
+ var mesInvItemOutItemsList = Db.Queryable<MesCgthSqDetail, MesItems>(
+ (c, s) => new object[]
+ {
+ JoinType.Inner, c.ItemId == s.Id // 鍐呰繛鎺ユ潯浠�
+ }).Where((c, s) => c.Mid == parsedGuid) // 鏍规嵁ItemOutId杩囨护
+ .Select<MesCgthSqDetail>((c, s) =>
+ new MesCgthSqDetail // 閫夋嫨骞舵槧灏勫埌MesInvItemOutItems瀵硅薄
+ {
+ Id = c.Id,
+ Mid = c.Mid,
+ InvBillNo = c.InvBillNo,
+ InvWorkLine = c.InvWorkLine,
+ Ebeln = c.Ebeln,
+ Eid = c.Eid,
+ Erpid = c.Erpid,
+ SqNum = c.SqNum,
+ YsNum = c.YsNum,
+ RkmxGuid = c.RkmxGuid,
+ Remark = c.Remark,
+ ItemNo = s.ItemNo, // 浠嶮esItems琛ㄤ腑鑾峰彇ItemNo
+ ItemName = s.ItemName, // 浠嶮esItems琛ㄤ腑鑾峰彇ItemName
+ ItemModel = s.ItemModel, // 浠嶮esItems琛ㄤ腑鑾峰彇ItemModel
+ ItemId = c.ItemId,
+ }).ToList(); // 灏嗘煡璇㈢粨鏋滆浆鎹负鍒楄〃
+
+ return mesInvItemOutItemsList; // 杩斿洖澶勭悊鍚庣殑鍒楄〃
+ }
+
+ public ProductionPickDto ScanCode(WarehouseQuery query)
+ {
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.billNo.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[prc_pda_CGTH]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ SqlParameter[] parameters =
+ {
+ new("@outMsg", SqlDbType.NVarChar, 300),
+ new("@outSum", SqlDbType.NVarChar, 300),
+ new("@barcode_num", SqlDbType.NVarChar, 300),
+ new("@split_num", SqlDbType.NVarChar, 300),
+ new("@c_User", query.userName),
+ new("@p_biLL_no", query.billNo),
+ new("@p_item_barcode", query.barcode)
+ };
+ parameters[0].Direction = ParameterDirection.Output;
+ parameters[1].Direction = ParameterDirection.Output;
+ parameters[2].Direction = ParameterDirection.Output;
+ parameters[3].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[0].Value.ToString();
+ _intSum = parameters[1].Value.ToString();
+
+ var barcodeNum = parameters[2].Value.ToString();
+ var splitNum = parameters[3].Value.ToString();
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.daa001,
+ barcodeNum = barcodeNum,
+ splitNum = splitNum,
+ barcode = query.barcode
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/service/Warehouse/MesInvItemInCDetailsManager.cs b/service/Warehouse/MesInvItemInCDetailsManager.cs
index 24c96d8..1e9d456 100644
--- a/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -48,7 +48,7 @@
// && it.EbelnLine == itemBarcodeDetails.WorkLine
// && it.Ebeln == itemBarcodeDetails.WorkNo)
// .First();
-
+
var inventoryDetails = Db.Queryable<MesInvItemArnDetail>()
.Where(it => it.Guid == itemBarcodeDetails.AboutGuid)
.First();
diff --git a/service/Warehouse/MesInvItemOutsManager.cs b/service/Warehouse/MesInvItemOutsManager.cs
index dd2664f..413e251 100644
--- a/service/Warehouse/MesInvItemOutsManager.cs
+++ b/service/Warehouse/MesInvItemOutsManager.cs
@@ -405,7 +405,7 @@
var dto = new OutItemDto();
- dto.SumItem = GetItems(query);
+ //dto.SumItem = GetItems(query);
var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
.Where(a => a.ItemBarcode == query.barcode).Single();
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
index 3338d08..0df7b9a 100644
--- a/service/Warehouse/MesItemTblManager.cs
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -8,12 +8,12 @@
namespace NewPdaSqlServer.service.Warehouse;
/// <summary>
-/// MES鐗╂枡琛ㄧ鐞嗙被
+/// MES鐗╂枡琛ㄧ鐞嗙被
/// </summary>
public class MesItemTblManager : Repository<MesItemTbl>
{
/// <summary>
- /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
+ /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
/// </summary>
/// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
public List<string> GetSCTLBillNo(WarehouseQuery query)
@@ -28,7 +28,7 @@
}
/// <summary>
- /// 鏍规嵁鍗曞彿鑾峰彇MES鐗╂枡琛ㄦ槑缁�
+ /// 鏍规嵁鍗曞彿鑾峰彇MES鐗╂枡琛ㄦ槑缁�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>鐗╂枡鏄庣粏鍒楄〃</returns>
@@ -65,7 +65,7 @@
}
/// <summary>
- /// 鐢熶骇閫�鏂欐壂鎻忓簱浣�
+ /// 鐢熶骇閫�鏂欐壂鎻忓簱浣�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>搴撲綅淇℃伅</returns>
@@ -92,7 +92,7 @@
}
/// <summary>
- /// 鐢熶骇閫�鏂欐壂鎻忔潯鐮�
+ /// 鐢熶骇閫�鏂欐壂鎻忔潯鐮�
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
@@ -445,8 +445,9 @@
// 妫�鏌ュ繀瑕佺殑鎻掑叆鎿嶄綔鏄惁閮芥垚鍔熸墽琛�
var minimumExpectedOperations = 3; // 鑷冲皯闇�瑕佹墽琛岀殑鎻掑叆鎿嶄綔鏁�
- if (totalResult < minimumExpectedOperations)
- throw new Exception($"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
+ if (totalResult < minimumExpectedOperations)
+ throw new Exception(
+ $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
return totalResult;
});
@@ -458,7 +459,7 @@
/// <summary>
- /// 濮斿閫�鏂欐壂鎻忔潯鐮�(鐢熶骇閫�鏂欑殑閫昏緫锛屽彧鏄皟鏁翠簡鍑犱釜瀛楁)
+ /// 濮斿閫�鏂欐壂鎻忔潯鐮�(鐢熶骇閫�鏂欑殑閫昏緫锛屽彧鏄皟鏁翠簡鍑犱釜瀛楁)
/// </summary>
/// <param name="query">浠撳簱鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊缁撴灉</returns>
@@ -527,7 +528,7 @@
var C_MES_ITEM_TBL = Db.Queryable<MesItemTbl>()
.Where(a => a.BillNo == c_mes_inv_item_barcodes.BillNo
&& (a.Tbl013 ?? 0) == 1).First();
-
+
if (C_MES_ITEM_TBL == null) throw new Exception("鐢宠鍗曞凡鎾ゅ洖,鏃犳硶鎵爜!");
if (C_MES_ITEM_TBL.Tbl020 == 1) throw new Exception("鎵爜瀹屾垚,鐢宠鍗曞凡瀹岀粨!");
@@ -811,8 +812,9 @@
// 妫�鏌ュ繀瑕佺殑鎻掑叆鎿嶄綔鏄惁閮芥垚鍔熸墽琛�
var minimumExpectedOperations = 3; // 鑷冲皯闇�瑕佹墽琛岀殑鎻掑叆鎿嶄綔鏁�
- if (totalResult < minimumExpectedOperations)
- throw new Exception($"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
+ if (totalResult < minimumExpectedOperations)
+ throw new Exception(
+ $"鍏抽敭鏁版嵁鎻掑叆澶辫触锛岄鏈熻嚦灏憑minimumExpectedOperations}涓搷浣滐紝瀹為檯鎵ц{totalResult}涓搷浣�");
return totalResult;
});
diff --git a/service/Warehouse/TransferOutManager.cs b/service/Warehouse/TransferOutManager.cs
index 2788646..0524c81 100644
--- a/service/Warehouse/TransferOutManager.cs
+++ b/service/Warehouse/TransferOutManager.cs
@@ -7,13 +7,13 @@
namespace NewPdaSqlServer.service.Warehouse;
/// <summary>
-/// 璋冩嫧鍑哄簱绠＄悊绫�
-/// 璐熻矗澶勭悊璋冩嫧鍑哄簱鐩稿叧鐨勪笟鍔￠�昏緫
+/// 璋冩嫧鍑哄簱绠＄悊绫�
+/// 璐熻矗澶勭悊璋冩嫧鍑哄簱鐩稿叧鐨勪笟鍔￠�昏緫
/// </summary>
public class TransferOutManager : Repository<TransferOut>
{
/// <summary>
- /// 鑾峰彇鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃
+ /// 鑾峰彇鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃
/// </summary>
/// <returns>鏈畬鎴愮殑璋冩嫧鍑哄簱鍗曞彿鍒楄〃</returns>
public List<string> GetTransferOutNoList()
@@ -28,8 +28,8 @@
.Select(g => new
{
pid = g.Key,
- sq = g.Sum(x => x.ShNum), // 鐢宠鏁伴噺鍚堣
- ys = g.Sum(x => x.YsNum) // 宸叉壂鏁伴噺鍚堣
+ sq = g.Sum(x => x.ShNum), // 鐢宠鏁伴噺鍚堣
+ ys = g.Sum(x => x.YsNum) // 宸叉壂鏁伴噺鍚堣
})
.Where(x => (x.sq ?? 0) != (x.ys ?? 0))
.Select(x => x.pid)
@@ -45,7 +45,7 @@
}
/// <summary>
- /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧緟澶勭悊鐨勮皟鎷ㄥ嚭搴撴槑缁嗗垪琛�
+ /// 鏍规嵁鍗曟嵁鍙疯幏鍙栧緟澶勭悊鐨勮皟鎷ㄥ嚭搴撴槑缁嗗垪琛�
/// </summary>
/// <param name="query">鏌ヨ鍙傛暟,鍖呭惈鍗曟嵁鍙�</param>
/// <returns>寰呭鐞嗙殑璋冩嫧鍑哄簱鏄庣粏鍒楄〃</returns>
@@ -62,16 +62,16 @@
JoinType.Left, b.Pid == a.Guid,
JoinType.Left, b.ItemId == s.Id))
.Where((b, a, s) =>
- (b.ShNum ?? 0) - (b.YsNum ?? 0) > 0 // 鏈畬鎴愭暟閲忓ぇ浜�0
- && a.BillNo == p_bill_no // 鍖归厤鍗曟嵁鍙�
- && a.Status == 1) // 鍗曟嵁宸插鏍�
+ (b.ShNum ?? 0) - (b.YsNum ?? 0) > 0 // 鏈畬鎴愭暟閲忓ぇ浜�0
+ && a.BillNo == p_bill_no // 鍖归厤鍗曟嵁鍙�
+ && a.Status == 1) // 鍗曟嵁宸插鏍�
.OrderBy((b, a, s) => s.ItemNo)
.Select((b, a, s) => new TransferOutDetail
{
ItemNo = s.ItemNo,
ItemModel = s.ItemModel,
- ShNum = b.ShNum, // 鐢宠鏁伴噺
- YsNum = b.YsNum, // 宸叉壂鏁伴噺
+ ShNum = b.ShNum, // 鐢宠鏁伴噺
+ YsNum = b.YsNum, // 宸叉壂鏁伴噺
// 淇濈暀鍏朵粬蹇呰瀛楁...
Pid = b.Pid,
ItemId = b.ItemId,
@@ -83,7 +83,7 @@
}
/// <summary>
- /// 鎵弿鏉＄爜杩涜璋冩嫧鍑哄簱澶勭悊
+ /// 鎵弿鏉＄爜杩涜璋冩嫧鍑哄簱澶勭悊
/// </summary>
/// <param name="query">鍖呭惈鍗曟嵁鍙枫�佺敤鎴峰悕鍜屾潯鐮佷俊鎭殑鏌ヨ鍙傛暟</param>
/// <returns>澶勭悊鍚庣殑琛ㄥ崟鍜屽緟澶勭悊鏄庣粏鍒楄〃</returns>
@@ -94,23 +94,17 @@
var c_user = query.userName;
var p_item_barcode = query.barcode;
- var p_bill_type_id = 300; // 鍗曟嵁绫诲瀷ID
- var p_transaction_no = 301; // 浜ゆ槗缂栧彿
+ var p_bill_type_id = 300; // 鍗曟嵁绫诲瀷ID
+ var p_transaction_no = 301; // 浜ゆ槗缂栧彿
// 楠岃瘉鍗曟嵁鍙�
- if (string.IsNullOrEmpty(p_bill_no))
- {
- throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
- }
+ if (string.IsNullOrEmpty(p_bill_no)) throw new Exception("璇烽�夊彇鍗曟嵁鍙凤紒");
// 鏌ヨ鍑哄簱鍗曞苟楠岃瘉鐘舵��
var transferOut = Db.Queryable<TransferOut>()
.Where(x => x.BillNo == p_bill_no && x.Status == 1)
.First();
- if (transferOut == null)
- {
- throw new Exception("鏈壘鍒拌皟鎷ㄧ敵璇峰崟鎴栬�呰皟鎷ㄧ敵璇峰崟娌″鏍�");
- }
+ if (transferOut == null) throw new Exception("鏈壘鍒拌皟鎷ㄧ敵璇峰崟鎴栬�呰皟鎷ㄧ敵璇峰崟娌″鏍�");
// 鏌ヨ鏉＄爜搴撳瓨淇℃伅骞堕獙璇�
var stock = Db.Queryable<MesInvItemStocks>()
@@ -118,42 +112,29 @@
&& x.Quantity > 0
&& !string.IsNullOrEmpty(x.DepotsCode))
.First();
- if (stock == null)
- {
- throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋牳瀵癸紒{p_item_barcode}");
- }
+ if (stock == null) throw new Exception($"搴撳瓨涓棤姝ゆ潯鐮侊紝璇锋牳瀵癸紒{p_item_barcode}");
// 楠岃瘉浠撳簱涓�鑷存��
if (stock.DepotsCode != transferOut.InvCode)
- {
throw new Exception(
$"鏉＄爜搴撳瓨浠撳簱{stock.DepotsCode}鍜岀敵璇蜂粨搴撲笉涓�鑷磠transferOut.InvCode}");
- }
// 鏌ヨ鐗╂枡淇℃伅
var item = Db.Queryable<MesItems>()
.Where(x => x.Id == stock.ItemId)
.First();
- if (item == null)
- {
- throw new Exception("鏈壘鍒扮墿鏂�");
- }
+ if (item == null) throw new Exception("鏈壘鍒扮墿鏂�");
// 鏌ヨ璋冩嫧鏄庣粏骞堕獙璇�
var detail = Db.Queryable<TransferOutDetail>()
.Where(x => x.ItemId == stock.ItemId && x.Pid == transferOut.Guid)
.First();
- if (detail == null)
- {
- throw new Exception("鏈壘鍒版潯鐮佺墿鏂欑浉搴旂殑璋冩嫧鐢宠");
- }
+ if (detail == null) throw new Exception("鏈壘鍒版潯鐮佺墿鏂欑浉搴旂殑璋冩嫧鐢宠");
// 楠岃瘉鏁伴噺鏄惁瓒呭嚭鏈壂鏁伴噺
if ((detail.ShNum ?? 0) - (detail.YsNum ?? 0) < stock.Quantity)
- {
throw new Exception("鏉＄爜鏁伴噺澶т簬鐢宠鏈壂鏁伴噺锛岃鎷嗗垎浜嗗啀鎵爜");
- }
-
+
// 浣跨敤浜嬪姟澶勭悊鏁版嵁鏇存柊
UseTransaction(db =>
{
@@ -164,7 +145,7 @@
&& (x.Status ?? 0) == 0)
.First();
- var commit = 0; // 璁板綍鏇存柊鎿嶄綔娆℃暟
+ var commit = 0; // 璁板綍鏇存柊鎿嶄綔娆℃暟
var c_id = Guid.Empty;
// 澶勭悊绉诲簱涓昏〃璁板綍
@@ -241,7 +222,7 @@
SuppNo = stock.SuppNo,
ItemId = stock.ItemId,
EbelnK3id = stock.EbelnK3id,
- LineK3id = stock.LineK3id,
+ LineK3id = stock.LineK3id
// RkDepot = transferOut.RkDepot,
// CkDepot = transferOut.CkDepot
};
@@ -284,7 +265,7 @@
SuppNo = stock.SuppNo,
ItemId = (int)stock.ItemId,
EbelnK3id = stock.EbelnK3id,
- LineK3id = stock.LineK3id,
+ LineK3id = stock.LineK3id
// RkDepot = transferOut.RkDepot,
// CkDepot = transferOut.CkDepot
};
@@ -321,7 +302,7 @@
WorkLine = stock.WorkLine,
EbelnK3id = (int)stock.EbelnK3id,
LineK3id = (int)stock.LineK3id,
- Quantity = stock.Quantity,
+ Quantity = stock.Quantity
// Unit = stock.ItemUnit
};
@@ -342,35 +323,31 @@
.Where(x => x.Guid == detail.Guid)
.ExecuteCommand();
}
-
+
// 妫�鏌ユ槸鍚︽墍鏈夋槑缁嗛兘宸插畬鎴�
- var totals = db.Queryable<TransferOutDetail, TransferOut>((b, a) =>
- new JoinQueryInfos(JoinType.Left, b.Pid == a.Guid))
+ var totals = db.Queryable<TransferOutDetail, TransferOut>((b, a) =>
+ new JoinQueryInfos(JoinType.Left, b.Pid == a.Guid))
.Where((b, a) => a.BillNo == p_bill_no)
- .Select((b, a) => new {
- ShNum = SqlFunc.AggregateSum(b.ShNum), // 鐢宠鎬绘暟閲�
- YsNum = SqlFunc.AggregateSum(b.YsNum) // 宸叉壂鎬绘暟閲�
+ .Select((b, a) => new
+ {
+ ShNum = SqlFunc.AggregateSum(b.ShNum), // 鐢宠鎬绘暟閲�
+ YsNum = SqlFunc.AggregateSum(b.YsNum) // 宸叉壂鎬绘暟閲�
})
.First();
// 濡傛灉鐢宠鏁伴噺绛変簬宸叉壂鏁伴噺锛屾洿鏂板崟鎹畬鎴愮姸鎬�
if (totals.ShNum == totals.YsNum)
- {
commit += db.Updateable<TransferOut>()
.SetColumns(x => x.IsWc == 1)
.Where(x => x.BillNo == p_bill_no)
.ExecuteCommand();
- }
-
+
// 鏇存柊杩斿洖鍙傛暟
query.itemNo = item.ItemNo;
query.Num = stock.Quantity;
-
+
// 楠岃瘉鏇存柊鎿嶄綔鏄惁鍏ㄩ儴鎴愬姛
- if (commit < 4)
- {
- throw new Exception("鏇存柊澶辫触");
- }
+ if (commit < 4) throw new Exception("鏇存柊澶辫触");
return commit;
});
--
Gitblit v1.9.3