From 06287f58cd161d8daa0942a950ca62aa2e10c30f Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 23 十二月 2024 13:21:52 +0800
Subject: [PATCH] 11
---
Controllers/Warehouse/MesItemTblDetailController.cs | 162 ++++
service/Warehouse/WomdaaManager.cs | 100 -
service/Warehouse/MesItemTblManager.cs | 430 +++++++++++
Dto/service/WarehouseQuery.cs | 25
entity/MesItemTblDetail.cs | 112 ++
Controllers/Warehouse/MesItemTblController.cs | 266 ++++++
entity/MesInvItemOutCDetails.cs | 171 ++--
entity/MesItemTbl.cs | 163 ++++
entity/MesDepots.cs | 2
entity/Womdab.cs | 160 ++--
entity/Womdaa.cs | 534 ++++++------
entity/MesInvBusiness2.cs | 176 ++-
service/Warehouse/MesItemTblDetailManager.cs | 11
13 files changed, 1,717 insertions(+), 595 deletions(-)
diff --git a/Controllers/Warehouse/MesItemTblController.cs b/Controllers/Warehouse/MesItemTblController.cs
new file mode 100644
index 0000000..6a06111
--- /dev/null
+++ b/Controllers/Warehouse/MesItemTblController.cs
@@ -0,0 +1,266 @@
+锘縰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;
+
+/// <summary>
+/// 鐢熶骇閫�鏂欑浉鍏虫帴鍙�
+/// </summary>
+
+[Route("api/[controller]")]
+[ApiController]
+public class MesItemTblController : ControllerBase
+{
+ private readonly MesItemTblManager m = new();
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <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] MesItemTbl 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] MesItemTbl 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] MesItemTbl 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);
+ }
+ }
+
+ // 鏂板鐨勬柟娉�
+
+ /// <summary>
+ /// 鑾峰彇鐢熶骇閫�鏂欏崟鍙峰垪琛�
+ /// </summary>
+ /// <returns>閫�鏂欏崟鍙峰垪琛�</returns>
+ [HttpPost("GetSCTLBillNo")]
+ public ResponseResult GetSCTLBillNo()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetSCTLBillNo();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曞彿鑾峰彇鐢熶骇閫�鏂欏崟鏄庣粏
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>閫�鏂欏崟鏄庣粏鍒楄〃</returns>
+ [HttpPost("GetMesItemTblDetailByBillNo")]
+ public ResponseResult GetMesItemTblDetailByBillNo([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetMesItemTblDetailByBillNo(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鎵弿搴撲綅
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>搴撲綅淇℃伅</returns>
+ [HttpPost("SctlScanDepots")]
+ public ResponseResult SctlScanDepots([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.SctlScanDepots(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鎵弿鏉＄爜
+ /// </summary>
+ /// <param name="query">鏌ヨ鍙傛暟</param>
+ /// <returns>鎵弿缁撴灉</returns>
+ [HttpPost("SctlScanBarcode")]
+ public ResponseResult SctlScanBarcode([FromBody] WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.SctlScanBarcode(query);
+ 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/MesItemTblDetailController.cs b/Controllers/Warehouse/MesItemTblDetailController.cs
new file mode 100644
index 0000000..43a0f33
--- /dev/null
+++ b/Controllers/Warehouse/MesItemTblDetailController.cs
@@ -0,0 +1,162 @@
+锘縰sing System.Dynamic;
+using Microsoft.AspNetCore.Mvc;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.Warehouse;
+using NewPdaSqlServer.util;
+
+namespace NewPdaSqlServer.Controllers.Warehouse;
+
+[ApiController]
+[Route("api/[controller]")]
+public class MesItemTblDetailController : ControllerBase
+{
+ private readonly MesItemTblDetailManager m = new();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <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] MesItemTblDetail 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] MesItemTblDetail 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] MesItemTblDetail 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/Dto/service/WarehouseQuery.cs b/Dto/service/WarehouseQuery.cs
index cf21cc1..6e543bd 100644
--- a/Dto/service/WarehouseQuery.cs
+++ b/Dto/service/WarehouseQuery.cs
@@ -5,11 +5,6 @@
public class WarehouseQuery : Page
{
public string? id { get; set; }
-
- public decimal[]? ItemArnDetailIds { get; set; }
-
- public string? itemInId { get; set; }
-
public string? sectionCode { get; set; }
public string? barcode { get; set; }
public string? userName { get; set; }
@@ -17,22 +12,16 @@
public short? status { get; set; }
public DateTime? date { get; set; }
public string? Type { get; set; }
+
public string? DepotCode { get; set; }
- public string? SuppNo { get; set; }
+
+ public string? DepotSectionName { get; set; }
+
+ public string? DepotName { get; set; }
+
+
public string? SuppId { get; set; }
- public string? Factory { get; set; }
-
- public string? Company { get; set; }
- public string? ItemNo { get; set; }
-
- public string? ItemModel { get; set; }
- public string? OrgName { get; set; }
- public string? OrgOwner { get; set; }
- public string? ItemNum { get; set; }
- public string? Printnumn { get; set; }
-
- public string? ItemName { get; set; }
public string? daa001 { get; set; }
public decimal? Num { get; set; }
diff --git a/entity/MesDepots.cs b/entity/MesDepots.cs
index bdeee02..2e12ab3 100644
--- a/entity/MesDepots.cs
+++ b/entity/MesDepots.cs
@@ -17,7 +17,7 @@
/// ID(SEQ_INV_ID)
/// </summary>
[SugarColumn(ColumnName = "depot_id")]
- public int DepotId { get; set; }
+ public int? DepotId { get; set; }
/// <summary>
/// 浠撳簱绫诲埆缂栫爜
diff --git a/entity/MesInvBusiness2.cs b/entity/MesInvBusiness2.cs
index 5e786cc..234b1dd 100644
--- a/entity/MesInvBusiness2.cs
+++ b/entity/MesInvBusiness2.cs
@@ -9,228 +9,250 @@
public class MesInvBusiness2
{
/// <summary>
- /// ID(seq_inv_id)
- /// 榛樿鍊�: (newid())
- /// </summary>
+ /// ID(seq_inv_id)
+ /// 榛樿鍊�: (newid())
+ ///</summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
- /// </summary>
+ /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
+ ///</summary>
[SugarColumn(ColumnName = "STATUS")]
public long? Status { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
+ /// 鍗曟嵁绫诲瀷ID
+ ///</summary>
[SugarColumn(ColumnName = "BILL_TYPE_ID")]
public long? BillTypeId { get; set; }
/// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "TRANSACTION_CODE")]
public string? TransactionCode { get; set; }
/// <summary>
- /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
- /// </summary>
+ /// 浜ゆ槗绫诲瀷|1-鍏ュ簱0-杞簱-1鍑哄簱
+ ///</summary>
[SugarColumn(ColumnName = "BUSINESS_TYPE")]
public long? BusinessType { get; set; }
/// <summary>
- /// 鍗曟嵁ID
- /// </summary>
+ /// 鍗曟嵁ID
+ ///</summary>
[SugarColumn(ColumnName = "BILL_ID")]
public long? BillId { get; set; }
/// <summary>
- /// 鍗曟嵁缂栫爜
- /// </summary>
+ /// 鍗曟嵁缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "BILL_NO")]
public string? BillNo { get; set; }
/// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
+ /// 鐢熶骇璁㈠崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "TASK_NO")]
public string? TaskNo { get; set; }
/// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "CUSTOMER_NO")]
public string? CustomerNo { get; set; }
/// <summary>
- /// 鍗曟嵁琛孖D
- /// </summary>
+ /// 鍗曟嵁琛孖D
+ ///</summary>
[SugarColumn(ColumnName = "BILL_LINE_ID")]
public long? BillLineId { get; set; }
/// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
+ /// 鐗╂枡鏉＄爜
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_BARCODE")]
public string? ItemBarcode { get; set; }
/// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- /// </summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string? ItemNo { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "C_ITEM_CODE")]
public string? CItemCode { get; set; }
/// <summary>
- /// 鍘傚鎵规
- /// </summary>
+ /// 鍘傚鎵规
+ ///</summary>
[SugarColumn(ColumnName = "LOT_NO")]
public string? LotNo { get; set; }
/// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- /// </summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ ///</summary>
[SugarColumn(ColumnName = "EP_FLAG")]
public bool? EpFlag { get; set; }
/// <summary>
- /// 鏁伴噺
- /// </summary>
+ /// 鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
/// <summary>
- /// 婧愬瓙搴揅ODE
- /// </summary>
+ /// 婧愬瓙搴揅ODE
+ ///</summary>
[SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
public string? FromInvDepotsCode { get; set; }
/// <summary>
- /// 婧愯揣浣岰ODE
- /// </summary>
+ /// 婧愯揣浣岰ODE
+ ///</summary>
[SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
public string? FromInvDepotSectionsCode { get; set; }
/// <summary>
- /// 鐩殑瀛愬簱CODE
- /// </summary>
+ /// 鐩殑瀛愬簱CODE
+ ///</summary>
[SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
public string? ToInvDepotsCode { get; set; }
/// <summary>
- /// 鐩殑璐т綅CODE
- /// </summary>
+ /// 鐩殑璐т綅CODE
+ ///</summary>
[SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
public string? ToInvDepotSectionsCode { get; set; }
/// <summary>
- /// 浜ゆ槗寮傚父淇℃伅
- /// </summary>
+ /// 浜ゆ槗寮傚父淇℃伅
+ ///</summary>
[SugarColumn(ColumnName = "DESCRIPTION")]
public string? Description { 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>
- /// 瓒呮崯缁熻鏍囪瘑
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 瓒呮崯缁熻鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
public bool? UllageStatFlag { get; set; }
/// <summary>
- /// 鍒嗗巶缂栫爜
- /// </summary>
+ /// 鍒嗗巶缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "FACTORY")]
public string? Factory { get; set; }
/// <summary>
- /// 鍏徃浠ｇ爜
- /// </summary>
+ /// 鍏徃浠ｇ爜
+ ///</summary>
[SugarColumn(ColumnName = "COMPANY")]
public string? Company { get; set; }
/// <summary>
- /// 绠卞彿鏉＄爜
- /// </summary>
+ /// 绠卞彿鏉＄爜
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_BARCODE2")]
public string? ItemBarcode2 { get; set; }
/// <summary>
- /// 鍗℃澘鏉＄爜
- /// </summary>
+ /// 鍗℃澘鏉＄爜
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_BARCODE3")]
public string? ItemBarcode3 { get; set; }
/// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
+ /// 浠诲姟鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "WORK_NO")]
public string? WorkNo { get; set; }
/// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
+ /// 浠诲姟鍗曡鍙�
+ ///</summary>
[SugarColumn(ColumnName = "WORK_LINE")]
public int? WorkLine { get; set; }
/// <summary>
- /// 渚涘簲鍟�
- /// </summary>
+ /// 渚涘簲鍟�
+ ///</summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string? SuppNo { get; set; }
/// <summary>
- /// 鐢熶骇绾�
- /// </summary>
+ /// 鐢熶骇绾�
+ ///</summary>
[SugarColumn(ColumnName = "LINE_NO")]
public string? LineNo { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
+ /// 閲囪喘璁㈠崟id
+ ///</summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
public long? EbelnK3id { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ ///</summary>
[SugarColumn(ColumnName = "LINE_K3ID")]
public long? LineK3id { get; set; }
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
+ /// 鐗╂枡ID
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public long? ItemId { get; set; }
- [SugarColumn(ColumnName = "SUPP_ID")] public string? SuppId { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPP_ID")]
+ public string? SuppId { get; set; }
+
+ /// <summary>
+ /// 婧愪粨搴揑D
+ ///</summary>
+ [SugarColumn(ColumnName = "FROM_DEPOT_ID")]
+ public int? FromDepotId { get; set; }
+
+ /// <summary>
+ /// 鐩殑浠撳簱ID
+ ///</summary>
+ [SugarColumn(ColumnName = "INV_DEPOT_ID")]
+ public int? InvDepotId { get; set; }
+
+ /// <summary>
+ /// mes鍗曟嵁鏄庣粏琛宨d
+ ///</summary>
+ [SugarColumn(ColumnName = "MES_LINE")]
+ public Guid? MesLine { get; set; }
}
\ No newline at end of file
diff --git a/entity/MesInvItemOutCDetails.cs b/entity/MesInvItemOutCDetails.cs
index 3caf1e7..e3e4e4d 100644
--- a/entity/MesInvItemOutCDetails.cs
+++ b/entity/MesInvItemOutCDetails.cs
@@ -9,252 +9,251 @@
public class MesInvItemOutCDetails
{
/// <summary>
- ///
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 鍑哄簱鍗昳d
- ///</summary>
+ /// 鍑哄簱鍗昳d
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_OUT_ID")]
public Guid? ItemOutId { get; set; }
/// <summary>
- /// 鐗╂枡鏉＄爜
- ///</summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_BARCODE")]
public string ItemBarcode { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
[SugarColumn(ColumnName = "C_ITEM_CODE")]
public string CItemCode { get; set; }
/// <summary>
- /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
+ /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
/// <summary>
- /// 鍘傚鎵规
- ///</summary>
+ /// 鍘傚鎵规
+ /// </summary>
[SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
/// <summary>
- /// 鏁伴噺锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
+ /// 鏁伴噺锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
[SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
/// <summary>
- /// 鎸枡鏍囧織锛�0锛嶅惁锛�1锛嶆槸锛�
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鎸枡鏍囧織锛�0锛嶅惁锛�1锛嶆槸锛�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "FORCE_OUT_FLAG")]
public long? ForceOutFlag { 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>
- /// 瀹㈡埛缂栫爜
- ///</summary>
+ /// 瀹㈡埛缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
public string CustNo { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
- ///</summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
/// <summary>
- /// 璐т綅缂栫爜
- ///</summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
public string DepotSectionCode { get; set; }
/// <summary>
- /// 澶囨敞
- ///</summary>
+ /// 澶囨敞
+ /// </summary>
[SugarColumn(ColumnName = "REMARK")]
public string Remark { get; set; }
/// <summary>
- /// 鍏嶆鏍囪瘑(0-鍚︼紝1-鏄�)
- ///</summary>
+ /// 鍏嶆鏍囪瘑(0-鍚︼紝1-鏄�)
+ /// </summary>
[SugarColumn(ColumnName = "FORCE_EXEMPT_FLAG")]
public bool? ForceExemptFlag { get; set; }
/// <summary>
- /// 鎶曟枡鎵规
- ///</summary>
+ /// 鎶曟枡鎵规
+ /// </summary>
[SugarColumn(ColumnName = "PRD_LOT_NO")]
public string PrdLotNo { get; set; }
/// <summary>
- /// 鏄惁鍋氭帴鏀舵鏌�
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鏄惁鍋氭帴鏀舵鏌�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "CHECK_STATUS")]
public bool? CheckStatus { get; set; }
/// <summary>
- /// 宸ュ巶缂栧彿
- ///</summary>
+ /// 宸ュ巶缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
/// <summary>
- /// 鍏徃缂栧彿
- ///</summary>
+ /// 鍏徃缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
/// <summary>
- /// 鍘熺敓浜у伐鍗�
- ///</summary>
+ /// 鍘熺敓浜у伐鍗�
+ /// </summary>
[SugarColumn(ColumnName = "TASK_NOY")]
public string TaskNoy { get; set; }
/// <summary>
- /// 绠卞彿
- ///</summary>
+ /// 绠卞彿
+ /// </summary>
[SugarColumn(ColumnName = "BOX_NO")]
public string BoxNo { get; set; }
/// <summary>
- /// 鍖呰鎵规
- ///</summary>
+ /// 鍖呰鎵规
+ /// </summary>
[SugarColumn(ColumnName = "TASK_PACK")]
public string TaskPack { get; set; }
/// <summary>
- /// 鍗℃澘
- ///</summary>
+ /// 鍗℃澘
+ /// </summary>
[SugarColumn(ColumnName = "KB_NO")]
public string KbNo { get; set; }
/// <summary>
- /// 鏉垮瀷
- ///</summary>
+ /// 鏉垮瀷
+ /// </summary>
[SugarColumn(ColumnName = "BOARD_STYLE")]
public string BoardStyle { get; set; }
/// <summary>
- /// 鐢熶骇宸ュ崟
- ///</summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
[SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
/// <summary>
- /// 宸ュ崟鍙�
- ///</summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
[SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
/// <summary>
- /// 宸ヤ綔绾�
- ///</summary>
+ /// 宸ヤ綔绾�
+ /// </summary>
[SugarColumn(ColumnName = "WORK_LINE")]
public int? WorkLine { get; set; }
/// <summary>
- /// 渚涘簲鍟嗙紪鍙�
- ///</summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
/// <summary>
- /// 閲囪喘鍗曞彿
- ///</summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "PBILL_NO")]
public string PbillNo { get; set; }
/// <summary>
- /// 鏀跺埌鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鏀跺埌鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "RECEIVE")]
public bool? Receive { get; set; }
/// <summary>
- /// 鏀跺埌鏃堕棿
- ///</summary>
+ /// 鏀跺埌鏃堕棿
+ /// </summary>
[SugarColumn(ColumnName = "RTIME")]
public DateTime? Rtime { get; set; }
/// <summary>
- /// 鏀惰揣浜�
- ///</summary>
+ /// 鏀惰揣浜�
+ /// </summary>
[SugarColumn(ColumnName = "RCV_BY")]
public string RcvBy { get; set; }
/// <summary>
- /// 鏀惰揣閮ㄥ垎
- ///</summary>
+ /// 鏀惰揣閮ㄥ垎
+ /// </summary>
[SugarColumn(ColumnName = "RCV_PART")]
public string RcvPart { get; set; }
/// <summary>
- /// 鍏ュ簱缂栧彿
- ///</summary>
+ /// 鍏ュ簱缂栧彿
+ /// </summary>
[SugarColumn(ColumnName = "RK_NO")]
public string RkNo { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟ID
- ///</summary>
+ /// 閲囪喘璁㈠崟ID
+ /// </summary>
[SugarColumn(ColumnName = "EBELN_K3ID")]
public long? EbelnK3id { get; set; }
/// <summary>
- /// 閲囪喘璁㈠崟琛孖D
- ///</summary>
+ /// 閲囪喘璁㈠崟琛孖D
+ /// </summary>
[SugarColumn(ColumnName = "LINE_K3ID")]
public long? LineK3id { get; set; }
/// <summary>
- /// 鐗╂枡ID
- ///</summary>
+ /// 鐗╂枡ID
+ /// </summary>
[SugarColumn(ColumnName = "ITEM_ID")]
public long? ItemId { get; set; }
/// <summary>
- /// 浠撳簱id
- ///</summary>
+ /// 浠撳簱id
+ /// </summary>
[SugarColumn(ColumnName = "depot_id")]
public int? DepotId { get; set; }
/// <summary>
- /// 宸ュ崟鏄庣粏琛宨d
- ///</summary>
+ /// 宸ュ崟鏄庣粏琛宨d
+ /// </summary>
[SugarColumn(ColumnName = "DABID")]
public Guid? Dabid { get; set; }
diff --git a/entity/MesItemTbl.cs b/entity/MesItemTbl.cs
new file mode 100644
index 0000000..a70498e
--- /dev/null
+++ b/entity/MesItemTbl.cs
@@ -0,0 +1,163 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("MES_ITEM_TBL")]
+public class MesItemTbl
+{
+ /// <summary>
+ /// ID
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "bill_no")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 浜х嚎鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl001")]
+ public string? Tbl001 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl002")]
+ public string? Tbl002 { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl003")]
+ public string? Tbl003 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl004")]
+ public string? Tbl004 { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欏師鍥�
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl005")]
+ public string? Tbl005 { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl006")]
+ public string? Tbl006 { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl007")]
+ public string? Tbl007 { get; set; }
+
+ /// <summary>
+ /// 浜嬪姟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl008")]
+ public string? Tbl008 { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl009")]
+ public string? Tbl009 { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl010")]
+ public DateTime? Tbl010 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl011")]
+ public string? Tbl011 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl012")]
+ public DateTime? Tbl012 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl013")]
+ public int? Tbl013 { get; set; }
+
+ /// <summary>
+ /// ERP鍥炲啓鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl014")]
+ public int? Tbl014 { get; set; }
+
+ /// <summary>
+ /// ERP鍥炲啓鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl015")]
+ public string? Tbl015 { get; set; }
+
+ /// <summary>
+ /// ERP杩斿洖淇℃伅
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl016")]
+ public string? Tbl016 { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl017")]
+ public string? Tbl017 { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl018")]
+ public string? Tbl018 { get; set; }
+
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl019")]
+ public string? Tbl019 { get; set; }
+
+ /// <summary>
+ /// 瀹岀粨鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl020")]
+ public int? Tbl020 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl021")]
+ public string? Tbl021 { get; set; }
+
+ /// <summary>
+ /// 浜у搧id
+ /// </summary>
+ [SugarColumn(ColumnName = "item_id")]
+ public int? ItemId { get; set; }
+
+ /// <summary>
+ /// 鏄惁琛ユ枡瀹屾垚
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tbl022")]
+ public int? Tbl022 { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesItemTblDetail.cs b/entity/MesItemTblDetail.cs
new file mode 100644
index 0000000..7ed7db8
--- /dev/null
+++ b/entity/MesItemTblDetail.cs
@@ -0,0 +1,112 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("MES_ITEM_TBL_DETAIL")]
+public class MesItemTblDetail
+{
+ /// <summary>
+ /// ID
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "tlid")]
+ public Guid? Tlid { get; set; }
+
+ /// <summary>
+ /// 涓昏〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "tlmid")]
+ public Guid? Tlmid { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "tld001")]
+ public string? Tld001 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "tld002")]
+ public string? Tld002 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "tld003")]
+ public string? Tld003 { get; set; }
+
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "tld004")]
+ public string? Tld004 { get; set; }
+
+ /// <summary>
+ /// 鐢宠鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "tld005")]
+ public int? Tld005 { get; set; }
+
+ /// <summary>
+ /// 宸查��鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tld006")]
+ public int? Tld006 { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "tld007")]
+ public string? Tld007 { get; set; }
+
+ /// <summary>
+ /// 瀹岀粨鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tld008")]
+ public int? Tld008 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [SugarColumn(ColumnName = "tld009")]
+ public int? Tld009 { get; set; }
+
+ /// <summary>
+ /// 椤规
+ /// </summary>
+ [SugarColumn(ColumnName = "tld010")]
+ public int? Tld010 { get; set; }
+
+ /// <summary>
+ /// ERP鎶曟枡鍗曡id
+ /// </summary>
+ [SugarColumn(ColumnName = "tld011")]
+ public int? Tld011 { get; set; }
+
+ /// <summary>
+ /// 鏄惁琛ユ枡瀹屾垚
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "tld012")]
+ public int? Tld012 { get; set; }
+
+ [SugarColumn(IsIgnore = true)]
+ public string? BillNo { get; set; }
+
+ [SugarColumn(IsIgnore = true)]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string? ItemName { get; set; }
+
+ [SugarColumn(IsIgnore = true)]
+ public string ItemModel { get; set; }
+}
\ No newline at end of file
diff --git a/entity/Womdaa.cs b/entity/Womdaa.cs
index 1a4169e..f748c76 100644
--- a/entity/Womdaa.cs
+++ b/entity/Womdaa.cs
@@ -7,404 +7,404 @@
[SugarTable("WOMDAA")]
public class Womdaa
{
- /// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- [SugarColumn(ColumnName = "guid")]
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid")]
public Guid? Guid { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "pbaGuid")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "pbaGuid")]
public Guid? PbaGuid { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "caaGuid")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "caaGuid")]
public Guid? CaaGuid { get; set; }
- /// <summary>
- /// 鑷鍒�
- /// </summary>
- [SugarColumn(ColumnName = "id")]
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "id")]
public int? Id { get; set; }
- /// <summary>
- /// 鎺掍骇ID
- /// </summary>
- [SugarColumn(ColumnName = "pid")]
+ /// <summary>
+ /// 鎺掍骇ID
+ /// </summary>
+ [SugarColumn(ColumnName = "pid")]
public int? Pid { get; set; }
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "daa001")]
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa001")]
public string Daa001 { get; set; }
- /// <summary>
- /// 浜у搧ID
- /// </summary>
- [SugarColumn(ColumnName = "daa002")]
+ /// <summary>
+ /// 浜у搧ID
+ /// </summary>
+ [SugarColumn(ColumnName = "daa002")]
public string Daa002 { get; set; }
- /// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "daa003")]
+ /// <summary>
+ /// 浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "daa003")]
public string Daa003 { get; set; }
- /// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
- [SugarColumn(ColumnName = "daa004")]
+ /// <summary>
+ /// 浜у搧瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "daa004")]
public string Daa004 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "daa005")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "daa005")]
public string Daa005 { get; set; }
- /// <summary>
- /// ERP棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "daa006")]
+ /// <summary>
+ /// ERP棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa006")]
public DateTime? Daa006 { get; set; }
- /// <summary>
- /// ERP棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "daa007")]
+ /// <summary>
+ /// ERP棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa007")]
public DateTime? Daa007 { get; set; }
- /// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "daa008")]
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa008")]
public int? Daa008 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "daa009")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "daa009")]
public string Daa009 { get; set; }
- /// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "daa010")]
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa010")]
public int? Daa010 { get; set; }
- /// <summary>
- /// 宸茬敓浜ч噺
- /// </summary>
- [SugarColumn(ColumnName = "daa011")]
+ /// <summary>
+ /// 宸茬敓浜ч噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa011")]
public int? Daa011 { get; set; }
- /// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "daa012")]
+ /// <summary>
+ /// 鎶ュ簾鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa012")]
public int? Daa012 { get; set; }
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "daa013")]
+ /// <summary>
+ /// 宸ヤ綔杞﹂棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa013")]
public string Daa013 { get; set; }
- /// <summary>
- /// 鎶曟枡鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "daa014")]
+ /// <summary>
+ /// 鎶曟枡鍗曞崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa014")]
public string Daa014 { get; set; }
- /// <summary>
- /// 鐢熶骇绾垮埆
- /// </summary>
- [SugarColumn(ColumnName = "daa015")]
+ /// <summary>
+ /// 鐢熶骇绾垮埆
+ /// </summary>
+ [SugarColumn(ColumnName = "daa015")]
public string Daa015 { get; set; }
- /// <summary>
- /// 瀹為檯寮�宸ユ棩
- /// </summary>
- [SugarColumn(ColumnName = "daa016")]
+ /// <summary>
+ /// 瀹為檯寮�宸ユ棩
+ /// </summary>
+ [SugarColumn(ColumnName = "daa016")]
public DateTime? Daa016 { get; set; }
- /// <summary>
- /// 瀹為檯瀹屽伐鏃�
- /// </summary>
- [SugarColumn(ColumnName = "daa017")]
+ /// <summary>
+ /// 瀹為檯瀹屽伐鏃�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa017")]
public DateTime? Daa017 { get; set; }
- /// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "daa018")]
+ /// <summary>
+ /// 宸ュ崟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "daa018")]
public string Daa018 { get; set; }
- /// <summary>
- /// 榻愬鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "daa019")]
+ /// <summary>
+ /// 榻愬鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "daa019")]
public string Daa019 { get; set; }
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "fstatus")]
+ /// <summary>
+ /// 瀹℃牳鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "fstatus")]
public int? Fstatus { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "check_date")]
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "check_date")]
public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "check_user")]
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "check_user")]
public string CheckUser { get; set; }
- /// <summary>
- /// 绾垮埆缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "daa020")]
+ /// <summary>
+ /// 绾垮埆缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "daa020")]
public string Daa020 { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "daa021")]
+ /// <summary>
+ /// 浠诲姟鍗曞崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa021")]
public string Daa021 { get; set; }
- /// <summary>
- /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
- /// 榛樿鍊�: ((0))
- /// </summary>
- [SugarColumn(ColumnName = "daa022")]
+ /// <summary>
+ /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "daa022")]
public int? Daa022 { get; set; }
- /// <summary>
- /// 鐢熶骇搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "daa023")]
+ /// <summary>
+ /// 鐢熶骇搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa023")]
public int? Daa023 { get; set; }
- /// <summary>
- /// 鎺掍骇鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "daa024")]
+ /// <summary>
+ /// 鎺掍骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "daa024")]
public string Daa024 { get; set; }
- /// <summary>
- /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
- /// </summary>
- [SugarColumn(ColumnName = "daa025")]
+ /// <summary>
+ /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa025")]
public string Daa025 { get; set; }
- /// <summary>
- /// 棣栦欢妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "daa026")]
+ /// <summary>
+ /// 棣栦欢妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa026")]
public string Daa026 { get; set; }
- /// <summary>
- /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
- /// </summary>
- [SugarColumn(ColumnName = "is_reportcheck")]
+ /// <summary>
+ /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
+ /// </summary>
+ [SugarColumn(ColumnName = "is_reportcheck")]
public int? IsReportcheck { get; set; }
- /// <summary>
- /// 鎶ユ浜�
- /// </summary>
- [SugarColumn(ColumnName = "usname")]
+ /// <summary>
+ /// 鎶ユ浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "usname")]
public string Usname { get; set; }
- /// <summary>
- /// 鎶ユ鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "reporttime")]
+ /// <summary>
+ /// 鎶ユ鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "reporttime")]
public DateTime? Reporttime { get; set; }
- /// <summary>
- /// 鏈哄彴缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "machine_no")]
+ /// <summary>
+ /// 鏈哄彴缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "machine_no")]
public string MachineNo { get; set; }
- /// <summary>
- /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
- /// </summary>
- [SugarColumn(ColumnName = "daa027")]
+ /// <summary>
+ /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa027")]
public int? Daa027 { get; set; }
- /// <summary>
- /// 澶囨枡瀹屾垚鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "daa028")]
+ /// <summary>
+ /// 澶囨枡瀹屾垚鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa028")]
public string Daa028 { get; set; }
- /// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
- [SugarColumn(ColumnName = "prod_hour")]
+ /// <summary>
+ /// 鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_hour")]
public int? ProdHour { get; set; }
- /// <summary>
- /// 鍗曚汉灏忔椂浜ц兘
- /// </summary>
- [SugarColumn(ColumnName = "person_hour_capacity")]
+ /// <summary>
+ /// 鍗曚汉灏忔椂浜ц兘
+ /// </summary>
+ [SugarColumn(ColumnName = "person_hour_capacity")]
public int? PersonHourCapacity { get; set; }
- /// <summary>
- /// 鐞嗚鏍囦骇
- /// </summary>
- [SugarColumn(ColumnName = "the_capacity")]
+ /// <summary>
+ /// 鐞嗚鏍囦骇
+ /// </summary>
+ [SugarColumn(ColumnName = "the_capacity")]
public int? TheCapacity { get; set; }
- /// <summary>
- /// 璁″垝鐢ㄤ汉鏁�
- /// </summary>
- [SugarColumn(ColumnName = "plan_personnel")]
+ /// <summary>
+ /// 璁″垝鐢ㄤ汉鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_personnel")]
public int? PlanPersonnel { get; set; }
- /// <summary>
- /// 璁″垝鏍囧噯浜ц兘
- /// </summary>
- [SugarColumn(ColumnName = "plan_capacity")]
+ /// <summary>
+ /// 璁″垝鏍囧噯浜ц兘
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_capacity")]
public int? PlanCapacity { get; set; }
- /// <summary>
- /// 鐞嗚鐢ㄦ椂/M
- /// </summary>
- [SugarColumn(ColumnName = "the_min")]
+ /// <summary>
+ /// 鐞嗚鐢ㄦ椂/M
+ /// </summary>
+ [SugarColumn(ColumnName = "the_min")]
public int? TheMin { get; set; }
- /// <summary>
- /// 鐞嗚鐢ㄦ椂/H
- /// </summary>
- [SugarColumn(ColumnName = "the_hour")]
+ /// <summary>
+ /// 鐞嗚鐢ㄦ椂/H
+ /// </summary>
+ [SugarColumn(ColumnName = "the_hour")]
public int? TheHour { get; set; }
- /// <summary>
- /// 绾夸綋绫诲埆
- /// </summary>
- [SugarColumn(ColumnName = "line_type")]
+ /// <summary>
+ /// 绾夸綋绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "line_type")]
public string LineType { get; set; }
- /// <summary>
- /// 鏍囧噯浜烘暟
- /// </summary>
- [SugarColumn(ColumnName = "personnel")]
+ /// <summary>
+ /// 鏍囧噯浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "personnel")]
public int? Personnel { get; set; }
- /// <summary>
- /// 鎹㈢嚎鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "change_line_time")]
+ /// <summary>
+ /// 鎹㈢嚎鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "change_line_time")]
public int? ChangeLineTime { get; set; }
- /// <summary>
- /// 浼戞伅鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "rest_time")]
+ /// <summary>
+ /// 浼戞伅鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "rest_time")]
public int? RestTime { get; set; }
- /// <summary>
- /// 鎺掍骇搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "schedule_order")]
+ /// <summary>
+ /// 鎺掍骇搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_order")]
public int? ScheduleOrder { get; set; }
- /// <summary>
- /// MES棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "mes_start_prod")]
+ /// <summary>
+ /// MES棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_start_prod")]
public DateTime? MesStartProd { get; set; }
- /// <summary>
- /// MES棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "mes_end_prod")]
+ /// <summary>
+ /// MES棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_end_prod")]
public DateTime? MesEndProd { get; set; }
- /// <summary>
- /// 鎺掍骇鎺ㄩ�佹爣璇�
- /// </summary>
- [SugarColumn(ColumnName = "prodts")]
+ /// <summary>
+ /// 鎺掍骇鎺ㄩ�佹爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "prodts")]
public int? Prodts { get; set; }
- /// <summary>
- /// 棰勮澶囨枡鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "prepare_time")]
+ /// <summary>
+ /// 棰勮澶囨枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "prepare_time")]
public DateTime? PrepareTime { get; set; }
- /// <summary>
- /// 鎻掍欢鎶曞叆浜烘暟
- /// </summary>
- [SugarColumn(ColumnName = "cj_worker")]
+ /// <summary>
+ /// 鎻掍欢鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_worker")]
public int? CjWorker { get; set; }
- /// <summary>
- /// 鎻掍欢璁″垝鎶曞叆浜烘暟
- /// </summary>
- [SugarColumn(ColumnName = "p_cj_worker")]
+ /// <summary>
+ /// 鎻掍欢璁″垝鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "p_cj_worker")]
public int? PCjWorker { get; set; }
- /// <summary>
- /// 鎻掍欢鏃ヤ骇閲�
- /// </summary>
- [SugarColumn(ColumnName = "cj_daily_out")]
+ /// <summary>
+ /// 鎻掍欢鏃ヤ骇閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_daily_out")]
public int? CjDailyOut { get; set; }
- /// <summary>
- /// 鎻掍欢鏍囧噯宸ユ椂
- /// </summary>
- [SugarColumn(ColumnName = "cj_std_hour")]
+ /// <summary>
+ /// 鎻掍欢鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_std_hour")]
public int? CjStdHour { get; set; }
- /// <summary>
- /// 閿＄剨鎶曞叆浜烘暟
- /// </summary>
- [SugarColumn(ColumnName = "hx_worker")]
+ /// <summary>
+ /// 閿＄剨鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_worker")]
public int? HxWorker { get; set; }
- /// <summary>
- /// 閿＄剨璁″垝鎶曞叆浜烘暟
- /// </summary>
- [SugarColumn(ColumnName = "p_hx_worker")]
+ /// <summary>
+ /// 閿＄剨璁″垝鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "p_hx_worker")]
public int? PHxWorker { get; set; }
- /// <summary>
- /// 閿＄剨鏃ヤ骇閲�
- /// </summary>
- [SugarColumn(ColumnName = "hx_daily_out")]
+ /// <summary>
+ /// 閿＄剨鏃ヤ骇閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_daily_out")]
public int? HxDailyOut { get; set; }
- /// <summary>
- /// 閿＄剨鏍囧噯宸ユ椂
- /// </summary>
- [SugarColumn(ColumnName = "hx_std_hour")]
+ /// <summary>
+ /// 閿＄剨鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_std_hour")]
public int? HxStdHour { get; set; }
- /// <summary>
- /// 鎻掍欢鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "cj_num")]
+ /// <summary>
+ /// 鎻掍欢鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_num")]
public int? CjNum { get; set; }
- /// <summary>
- /// 瀹㈡埛
- /// </summary>
- [SugarColumn(ColumnName = "cust")]
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "cust")]
public string Cust { get; set; }
- /// <summary>
- /// 鏄惁棣栨
- /// </summary>
- [SugarColumn(ColumnName = "IS_SJ")]
+ /// <summary>
+ /// 鏄惁棣栨
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_SJ")]
public int? IsSj { get; set; }
}
\ No newline at end of file
diff --git a/entity/Womdab.cs b/entity/Womdab.cs
index d4d8723..4521451 100644
--- a/entity/Womdab.cs
+++ b/entity/Womdab.cs
@@ -8,227 +8,225 @@
public class Womdab
{
/// <summary>
- ///
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "daaGuid")]
public Guid? DaaGuid { get; set; }
/// <summary>
- /// 鑷鍒�
- ///</summary>
+ /// 鑷鍒�
+ /// </summary>
[SugarColumn(ColumnName = "id")]
public int? Id { get; set; }
/// <summary>
- /// PID
- ///</summary>
+ /// PID
+ /// </summary>
[SugarColumn(ColumnName = "pid")]
public int? Pid { get; set; }
/// <summary>
- /// 宸ュ崟鍗曞彿
- ///</summary>
+ /// 宸ュ崟鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "dab001")]
public string? Dab001 { get; set; }
/// <summary>
- /// 搴忓彿
- ///</summary>
+ /// 搴忓彿
+ /// </summary>
[SugarColumn(ColumnName = "dab002")]
public int? Dab002 { get; set; }
/// <summary>
- /// 鏉愭枡缂栫爜
- ///</summary>
+ /// 鏉愭枡缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "dab003")]
public string? Dab003 { get; set; }
/// <summary>
- /// 鏉愭枡鍚嶇О
- ///</summary>
+ /// 鏉愭枡鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "dab004")]
public string? Dab004 { get; set; }
/// <summary>
- /// 鏉愭枡瑙勬牸
- ///</summary>
+ /// 鏉愭枡瑙勬牸
+ /// </summary>
[SugarColumn(ColumnName = "dab005")]
public string? Dab005 { get; set; }
/// <summary>
- /// 闇�棰嗙敤閲�
- ///</summary>
+ /// 闇�棰嗙敤閲�
+ /// </summary>
[SugarColumn(ColumnName = "dab006")]
public decimal? Dab006 { get; set; }
/// <summary>
- /// 宸查鐢ㄩ噺
- ///</summary>
+ /// 宸查鐢ㄩ噺
+ /// </summary>
[SugarColumn(ColumnName = "dab007")]
public decimal? Dab007 { get; set; }
/// <summary>
- /// 宸ヨ壓
- ///</summary>
+ /// 宸ヨ壓
+ /// </summary>
[SugarColumn(ColumnName = "dab008")]
public string? Dab008 { get; set; }
/// <summary>
- /// 鍗曚綅
- ///</summary>
+ /// 鍗曚綅
+ /// </summary>
[SugarColumn(ColumnName = "dab009")]
public string? Dab009 { get; set; }
/// <summary>
- /// 鏉愭枡绫诲瀷
- ///</summary>
+ /// 鏉愭枡绫诲瀷
+ /// </summary>
[SugarColumn(ColumnName = "dab010")]
public string? Dab010 { get; set; }
/// <summary>
- /// 涓绘枡
- ///</summary>
+ /// 涓绘枡
+ /// </summary>
[SugarColumn(ColumnName = "dab011")]
public string? Dab011 { get; set; }
/// <summary>
- /// 缁勬垚鐢ㄩ噺
- ///</summary>
+ /// 缁勬垚鐢ㄩ噺
+ /// </summary>
[SugarColumn(ColumnName = "dab012")]
public int? Dab012 { get; set; }
/// <summary>
- /// 搴曟暟
- ///</summary>
+ /// 搴曟暟
+ /// </summary>
[SugarColumn(ColumnName = "dab013")]
public int? Dab013 { get; set; }
/// <summary>
- /// 鏄惁鏇挎枡
- ///</summary>
+ /// 鏄惁鏇挎枡
+ /// </summary>
[SugarColumn(ColumnName = "dab014")]
public string? Dab014 { get; set; }
/// <summary>
- /// 鐐逛綅
- ///</summary>
+ /// 鐐逛綅
+ /// </summary>
[SugarColumn(ColumnName = "dab015")]
public string? Dab015 { get; set; }
/// <summary>
- /// 鎶曟枡鍗曞彿
- ///</summary>
+ /// 鎶曟枡鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "dab016")]
public string? Dab016 { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
- ///</summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
[SugarColumn(ColumnName = "dab017")]
public string? Dab017 { get; set; }
/// <summary>
- /// 浠撳簱鍚嶇О
- ///</summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
[SugarColumn(ColumnName = "dab018")]
public string? Dab018 { get; set; }
/// <summary>
- /// 棰嗘枡鏂瑰紡
- ///</summary>
+ /// 棰嗘枡鏂瑰紡
+ /// </summary>
[SugarColumn(ColumnName = "dab019")]
public string? Dab019 { get; set; }
/// <summary>
- /// 鍥哄畾鎹熻��
- ///</summary>
+ /// 鍥哄畾鎹熻��
+ /// </summary>
[SugarColumn(ColumnName = "scrapqty")]
public int? Scrapqty { get; set; }
/// <summary>
- /// 鍙樺姩鎹熻�楃巼
- ///</summary>
+ /// 鍙樺姩鎹熻�楃巼
+ /// </summary>
[SugarColumn(ColumnName = "scraprate")]
public int? Scraprate { get; set; }
/// <summary>
- /// 鎶曟枡鍗曡id
- ///</summary>
+ /// 鎶曟枡鍗曡id
+ /// </summary>
[SugarColumn(ColumnName = "erpid")]
public int? Erpid { get; set; }
/// <summary>
- /// 鎶曟枡鍗曞ごid
- ///</summary>
+ /// 鎶曟枡鍗曞ごid
+ /// </summary>
[SugarColumn(ColumnName = "eid")]
public int? Eid { get; set; }
/// <summary>
- /// 瀹為鐢ㄩ噺
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 瀹為鐢ㄩ噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "dab020")]
public decimal? Dab020 { get; set; }
/// <summary>
- /// 琛ラ鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 琛ラ鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "dab021")]
public decimal? Dab021 { get; set; }
/// <summary>
- /// 閫�鏂欐暟閲�
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "dab022")]
public decimal? Dab022 { get; set; }
/// <summary>
- /// 瓒呴鏁伴噺
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 瓒呴鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "dab023")]
public decimal? Dab023 { get; set; }
/// <summary>
- /// 鑹搧閫�鏂�
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鑹搧閫�鏂�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "lp_tl")]
public int? LpTl { get; set; }
/// <summary>
- /// 鏉ユ枡涓嶈壇
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鏉ユ枡涓嶈壇
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "ll_bl")]
public int? LlBl { get; set; }
/// <summary>
- /// 浣滀笟涓嶈壇
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 浣滀笟涓嶈壇
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "zy_bl")]
public int? ZyBl { get; set; }
/// <summary>
- /// 鍚堝苟鏍囪瘑
- /// 榛樿鍊�: ((0))
- ///</summary>
+ /// 鍚堝苟鏍囪瘑
+ /// 榛樿鍊�: ((0))
+ /// </summary>
[SugarColumn(ColumnName = "hb_flag")]
public int? HbFlag { get; set; }
/// <summary>
- /// 鍚堝苟鍗曞彿
- ///</summary>
+ /// 鍚堝苟鍗曞彿
+ /// </summary>
[SugarColumn(ColumnName = "hb_no")]
public string? HbNo { get; set; }
diff --git a/service/Warehouse/MesItemTblDetailManager.cs b/service/Warehouse/MesItemTblDetailManager.cs
new file mode 100644
index 0000000..ad18bfa
--- /dev/null
+++ b/service/Warehouse/MesItemTblDetailManager.cs
@@ -0,0 +1,11 @@
+锘縰sing NewPdaSqlServer.DB;
+using NewPdaSqlServer.entity;
+
+namespace NewPdaSqlServer.service.Warehouse;
+
+public class MesItemTblDetailManager : Repository<MesItemTblDetail>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesItemTblDetailManager.cs
+}
\ No newline at end of file
diff --git a/service/Warehouse/MesItemTblManager.cs b/service/Warehouse/MesItemTblManager.cs
new file mode 100644
index 0000000..f5c63c2
--- /dev/null
+++ b/service/Warehouse/MesItemTblManager.cs
@@ -0,0 +1,430 @@
+锘縰sing Masuit.Tools;
+using NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using NewPdaSqlServer.util;
+using SqlSugar;
+
+namespace NewPdaSqlServer.service.Warehouse;
+
+public class MesItemTblManager : Repository<MesItemTbl>
+{
+ public List<string> GetSCTLBillNo()
+ {
+ var list = Db.Queryable<MesItemTbl>()
+ .Where(s => (s.Tbl013 ?? 0) == 1
+ && (s.Tbl020 ?? 0) == 0)
+ .Select(s => s.BillNo).ToList();
+
+ return list;
+ }
+
+ public List<MesItemTblDetail> GetMesItemTblDetailByBillNo(
+ WarehouseQuery query)
+ {
+ var mesItemTblDetails = Db
+ .Queryable<MesItemTbl, MesItemTblDetail, MesItems>(
+ (a, b, c) => new JoinQueryInfos(
+ JoinType.Left,
+ a.Id == b.Tlmid,
+ JoinType.Left,
+ b.Tld009 == c.Id)
+ ).Where((a, b, c) => a.BillNo == query.billNo)
+ .Select<MesItemTblDetail>((a, b, c) => new MesItemTblDetail
+ {
+ BillNo = a.BillNo,
+ Tlid = b.Tlid,
+ Tlmid = b.Tlmid,
+ Tld005 = b.Tld005,
+ Tld006 = b.Tld006,
+ Tld009 = b.Tld009,
+ ItemNo = c.ItemNo,
+ ItemName = c.ItemName,
+ ItemModel = c.ItemModel
+ }).ToList();
+
+ var itemTblDetails = mesItemTblDetails
+ .Where(s => (s.Tld005 ?? 0) - (s.Tld006 ?? 0) > 0).ToList();
+
+ return itemTblDetails;
+ }
+
+ public WarehouseQuery SctlScanDepots(WarehouseQuery query)
+ {
+ if (query.DepotCode.IsNullOrEmpty())
+ {
+ throw new NullReferenceException("璇锋壂搴撲綅鏉＄爜");
+ }
+
+ var warehouseQuery = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
+ .Where((a, b) => a.DepotSectionCode == query.DepotCode)
+ .Select<WarehouseQuery>((a, b) => new WarehouseQuery
+ {
+ DepotSectionName = a.DepotSectionName,
+ DepotName = b.DepotName,
+ DepotCode = b.DepotCode,
+ }).First();
+
+ if (warehouseQuery == null)
+ {
+ throw new Exception("搴撲綅缂栫爜" + query.DepotCode + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
+
+ return warehouseQuery;
+ }
+
+ public bool SctlScanBarcode(WarehouseQuery query)
+ {
+ var p_item_barcode = query.barcode;
+ var p_bill_no = query.billNo;
+ var p_section_code = query.DepotCode;
+ var c_user = query.userName;
+
+ var p_bill_type_id = 100;
+ var p_transction_no = 104;
+
+ if (p_section_code.IsNullOrEmpty())
+ {
+ throw new Exception("璇锋壂搴撲綅鏉＄爜锛�");
+ }
+
+ var c_depot_code = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.DepotGuid == b.Guid))
+ .Where((a, b) => a.DepotSectionCode == p_section_code)
+ .Select((a, b) => b.DepotId).First();
+
+ if (!c_depot_code.HasValue)
+ {
+ throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
+
+ var mesDepotSections = Db.Queryable<MesDepotSections>()
+ .Where(a => a.DepotSectionCode == p_section_code).First();
+
+ if (mesDepotSections == null)
+ {
+ throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
+
+ var c_mes_depots = Db.Queryable<MesDepots>()
+ .Where(b => b.Guid == mesDepotSections.DepotGuid).First();
+
+ if (c_mes_depots == null)
+ {
+ throw new Exception("搴撲綅缂栫爜" + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
+ }
+
+ var c_num = Db.Queryable<MesInvItemIns, MesInvItemInCDetails>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.Guid == b.ItemInId))
+ .Where((a, b) => b.ItemBarcode == p_item_barcode
+ && a.BillTypeId == p_bill_type_id &&
+ a.TransctionNo == p_transction_no.ToString())
+ .Count();
+
+ if (c_num > 0)
+ {
+ throw new Exception("姝ゆ潯鐮佸凡鎵叆搴擄紝鍕块噸澶嶆壂鎻忥紒");
+ }
+
+ c_num = Db.Queryable<MesInvItemStocks>()
+ .Where(t => t.ItemBarcode == p_item_barcode).Count();
+
+ if (c_num > 0)
+ {
+ throw new Exception("姝ゆ潯鐮佸凡鎵叆搴擄紝鍕块噸澶嶆壂鎻忥紒");
+ }
+
+ var c_mes_inv_item_barcodes = Db.Queryable<MesInvItemBarcodes>()
+ .Where(t => t.ItemBarcode == p_item_barcode).First();
+
+ if (c_mes_inv_item_barcodes == null)
+ {
+ throw new Exception("姝ゆ潯鐮佷笉灞炰簬璇ラ��鏂欏崟锛岃鏍稿锛�");
+ }
+
+ if (c_mes_inv_item_barcodes.Memo != "鐢熶骇閫�鏂�")
+ {
+ throw new Exception("姝ゆ潯鐮佷笉鏄敓浜ч��鏂欐潯鐮侊紝涓嶅彲浣跨敤鐢熶骇閫�鏂欐ā鍧楋紒");
+ }
+
+ 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("鎵爜瀹屾垚,鐢宠鍗曞凡瀹岀粨!");
+ }
+
+ var C_MES_ITEM_TBL_DETAIL = Db.Queryable<MesItemTblDetail>()
+ .Where(a => a.Tlmid == C_MES_ITEM_TBL.Id
+ && a.Tld010 == c_mes_inv_item_barcodes.WorkLine)
+ .First();
+
+ if (C_MES_ITEM_TBL_DETAIL == null)
+ {
+ throw new Exception("鏉＄爜涓嶅睘浜庤鐢宠鍗曟槑缁�,鏃犳硶鎵爜!");
+ }
+
+ var c_quantity = c_mes_inv_item_barcodes.Quantity;
+
+ var c_bill_no = "";
+ var c_id = Guid.Empty;
+
+ UseTransaction(db =>
+ {
+ var mesInvItemIns = db.Queryable<MesInvItemIns>()
+ .Where(d =>
+ d.Status == 0 && d.TransctionNo ==
+ p_transction_no.ToString()
+ && d.CbillNo == c_mes_inv_item_barcodes.BillNo
+ && d.DepotsId == c_depot_code
+ && d.InsDate.Value.ToString("yyyyMMdd") ==
+ DateTime.Now.ToString("yyyyMMdd")).First();
+
+ var totalResult = 0;
+
+ if (mesInvItemIns == null)
+ {
+ c_bill_no = BillNo.GetBillNo("IN(鍏ュ簱鍗�)");
+
+ c_id = Guid.NewGuid();
+
+ totalResult += db.Insertable(new MesInvItemIns
+ {
+ Guid = c_id,
+ BillNo = c_bill_no,
+ BillTypeId = p_bill_type_id,
+ UserNoBack = c_user,
+ Reason = C_MES_ITEM_TBL.Tbl005,
+ Remark = C_MES_ITEM_TBL.Tbl006,
+ InsDate = DateTime.Now,
+ // DepotsCode = c_depot_code,
+ DepotsId = c_depot_code,
+ TransctionNo = p_transction_no.ToString(),
+ CreateBy = c_user,
+ CreateDate = DateTime.Now,
+ LastupdateBy = c_user,
+ LastupdateDate = DateTime.Now,
+ CbillNo = C_MES_ITEM_TBL.BillNo,
+ RbillNo = C_MES_ITEM_TBL.Tbl002
+ }).IgnoreColumns(true).ExecuteCommand();
+ }
+ else
+ {
+ c_id = mesInvItemIns.Guid;
+ c_bill_no = mesInvItemIns.BillNo;
+ }
+
+ var hbdy = c_mes_inv_item_barcodes.Hbdy ?? 0;
+ if (hbdy == 1)
+ {
+ throw new Exception("涓嶆敮鎸佸悎骞舵墦鍗扮殑鏉＄爜:" + p_item_barcode);
+ }
+
+ totalResult += db.Insertable(new MesInvItemInCDetails
+ {
+ Guid = Guid.NewGuid(),
+ ItemInId = c_id,
+ BillNo = c_bill_no,
+ ItemBarcode = p_item_barcode,
+ Quantity = c_quantity,
+ BarcodeFlag = true,
+ EpFlag = true,
+ WorkType = 1,
+ ItemId = c_mes_inv_item_barcodes.ItemId,
+ ItemNo = c_mes_inv_item_barcodes.ItemNo,
+ LotNo = c_mes_inv_item_barcodes.LotNo,
+ SuppId = c_mes_inv_item_barcodes.SuppId,
+ SuppNo = c_mes_inv_item_barcodes.SuppNo,
+ DepotId = c_mes_depots.DepotId,
+ DepotCode = c_mes_depots.DepotCode,
+ DepotSectionCode = p_section_code,
+ ItemSname = c_mes_inv_item_barcodes.ItemSname,
+ Unit = c_mes_inv_item_barcodes.Unit,
+ CreateBy = c_user,
+ CreateDate = DateTime.Now,
+ LastupdateBy = c_user,
+ LastupdateDate = DateTime.Now,
+ Remark = c_mes_inv_item_barcodes.Memo,
+ Ebeln = c_mes_inv_item_barcodes.Mblnr,
+ EbelnLineNo = c_mes_inv_item_barcodes.Zeile,
+ WorkNo = c_mes_inv_item_barcodes.WorkNo,
+ WorkLine = c_mes_inv_item_barcodes.WorkLine,
+ CbillNo = c_mes_inv_item_barcodes.BillNo,
+ UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag,
+ BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
+ TaskNo = c_mes_inv_item_barcodes.TaskNo,
+ RbillNo = C_MES_ITEM_TBL.Tbl002
+ }).IgnoreColumns(true).ExecuteCommand();
+
+ totalResult += db.Insertable(new MesInvBusiness2
+ {
+ Guid = Guid.NewGuid(),
+ Status = 1,
+ BillTypeId = p_bill_type_id,
+ TransactionCode = p_transction_no.ToString(),
+ BusinessType = 1,
+ ItemBarcode = p_item_barcode,
+ ItemNo = c_mes_inv_item_barcodes.ItemNo,
+ LotNo = c_mes_inv_item_barcodes.LotNo,
+ EpFlag = true,
+ Quantity = c_mes_inv_item_barcodes.Quantity,
+ ToInvDepotsCode = c_mes_depots.DepotCode,
+ InvDepotId = c_depot_code,
+ ToInvDepotSectionsCode = p_section_code,
+ Description = "鐢熶骇閫�鏂�",
+ CreateBy = c_user,
+ CreateDate = DateTime.Now,
+ LastupdateBy = c_user,
+ LastupdateDate = DateTime.Now,
+ TaskNo = c_mes_inv_item_barcodes.TaskNo,
+ BillNo = c_bill_no,
+ WorkNo = c_mes_inv_item_barcodes.WorkNo,
+ WorkLine = c_mes_inv_item_barcodes.WorkLine,
+ SuppId = c_mes_inv_item_barcodes.SuppId,
+ SuppNo = c_mes_inv_item_barcodes.SuppNo,
+ ItemId = c_mes_inv_item_barcodes.ItemId
+ }).IgnoreColumns(true).ExecuteCommand();
+
+ totalResult += db.Insertable(new MesInvItemStocks
+ {
+ Guid = Guid.NewGuid(),
+ TaskNo = c_mes_inv_item_barcodes.TaskNo,
+ ItemBarcode = p_item_barcode,
+ ItemNo = c_mes_inv_item_barcodes.ItemNo,
+ LotNo = c_mes_inv_item_barcodes.LotNo,
+ Quantity = c_mes_inv_item_barcodes.Quantity,
+ EpFlag = c_mes_inv_item_barcodes.EpFlag.Value
+ ? (byte)1
+ : (byte)0,
+ DepotId = c_mes_depots.DepotId,
+ DepotsCode = c_mes_depots.DepotCode,
+ DepotSectionsCode = p_section_code,
+ CheckDate = c_mes_inv_item_barcodes.CreateDate,
+ IndepDate = DateTime.Now,
+ BoardStyle = c_mes_inv_item_barcodes.BoardStyle,
+ WorkNo = c_mes_inv_item_barcodes.WorkNo,
+ WorkLine = c_mes_inv_item_barcodes.WorkLine,
+ SuppNo = c_mes_inv_item_barcodes.SuppNo,
+ ItemId = c_mes_inv_item_barcodes.ItemId
+ }).IgnoreColumns(true).ExecuteCommand();
+
+ // 鏍规嵁閫�鏂欑被鍨�(鑹搧閫�鏂欍�佹潵鏂欎笉鑹��鏂欍�佷綔涓氫笉鑹��鏂�)鏇存柊鐩稿叧鏁版嵁
+ if (C_MES_ITEM_TBL.Tbl005 is "鑹搧閫�鏂�" or "鏉ユ枡涓嶈壇閫�鏂�")
+ {
+ // 鑹搧閫�鏂� - 鏇存柊宸ュ崟琛�(WOMDAB)鐩稿叧鏁伴噺
+ if (C_MES_ITEM_TBL.Tbl005 == "鑹搧閫�鏂�")
+ {
+ totalResult += Db.Updateable<Womdab>()
+ .SetColumns(it => new Womdab
+ {
+ Dab007 = it.Dab007 - c_mes_inv_item_barcodes.Quantity, // 鍑忓皯宸ュ崟鏁伴噺
+ Dab022 = (it.Dab022 ?? 0) + c_mes_inv_item_barcodes.Quantity, // 澧炲姞閫�鏂欐暟閲�
+ LpTl = (it.LpTl ?? 0) + (int)c_mes_inv_item_barcodes.Quantity, // 澧炲姞鑹搧閫�鏂欐暟閲�
+ Dab020 = (it.Dab020 ?? 0) - c_mes_inv_item_barcodes.Quantity // 鍑忓皯宸插彂鏂欐暟閲�
+ })
+ .Where(it => it.Dab001 == c_mes_inv_item_barcodes.WorkNo
+ && it.Dab002 == c_mes_inv_item_barcodes.WorkLine
+ && it.Dab003 == c_mes_inv_item_barcodes.ItemId.ToString())
+ .ExecuteCommand();
+ }
+ // 鏉ユ枡涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛�(WOMDAB)鐩稿叧鏁伴噺
+ else if (C_MES_ITEM_TBL.Tbl005 == "鏉ユ枡涓嶈壇閫�鏂�")
+ {
+ totalResult += Db.Updateable<Womdab>()
+ .SetColumns(it => new Womdab
+ {
+ Dab007 = it.Dab007 - c_mes_inv_item_barcodes.Quantity, // 鍑忓皯宸ュ崟鏁伴噺
+ Dab022 = (it.Dab022 ?? 0) + c_mes_inv_item_barcodes.Quantity, // 澧炲姞閫�鏂欐暟閲�
+ LlBl = (it.LlBl ?? 0) + (int)c_mes_inv_item_barcodes.Quantity, // 澧炲姞鏉ユ枡涓嶈壇鏁伴噺
+ Dab020 = (it.Dab020 ?? 0) - c_mes_inv_item_barcodes.Quantity // 鍑忓皯宸插彂鏂欐暟閲�
+ })
+ .Where(it => it.Dab001 == c_mes_inv_item_barcodes.WorkNo
+ && it.Dab002 == c_mes_inv_item_barcodes.WorkLine
+ && it.Dab003 == c_mes_inv_item_barcodes.ItemId.ToString())
+ .ExecuteCommand();
+ }
+
+ // 鏇存柊閫�鏂欏崟鏄庣粏琛ㄥ凡閫�鏁伴噺
+ totalResult += Db.Updateable<MesItemTblDetail>()
+ .SetColumns(it => new MesItemTblDetail
+ {
+ Tld006 = (it.Tld006 ?? 0) + (int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
+ })
+ .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
+ && it.Tld009 == c_mes_inv_item_barcodes.ItemId
+ && it.Tld010 == c_mes_inv_item_barcodes.WorkLine)
+ .ExecuteCommand();
+ }
+ // 浣滀笟涓嶈壇閫�鏂� - 鏇存柊宸ュ崟琛ㄥ拰閫�鏂欏崟鏄庣粏琛�
+ else if (C_MES_ITEM_TBL.Tbl005 == "浣滀笟涓嶈壇閫�鏂�")
+ {
+ totalResult += Db.Updateable<Womdab>()
+ .SetColumns(it => new Womdab
+ {
+ Dab022 = (it.Dab022 ?? 0) + c_mes_inv_item_barcodes.Quantity, // 澧炲姞閫�鏂欐暟閲�
+ ZyBl = (it.ZyBl ?? 0) + (int)c_mes_inv_item_barcodes.Quantity, // 澧炲姞浣滀笟涓嶈壇鏁伴噺
+ Dab020 = (it.Dab020 ?? 0) - c_mes_inv_item_barcodes.Quantity // 鍑忓皯宸插彂鏂欐暟閲�
+ })
+ .Where(it => it.Dab001 == c_mes_inv_item_barcodes.WorkNo
+ && it.Dab002 == c_mes_inv_item_barcodes.WorkLine
+ && it.Dab003 == c_mes_inv_item_barcodes.ItemId.ToString())
+ .ExecuteCommand();
+
+ // 鏇存柊閫�鏂欏崟鏄庣粏琛ㄥ凡閫�鏁伴噺
+ totalResult += Db.Updateable<MesItemTblDetail>()
+ .SetColumns(it => new MesItemTblDetail
+ {
+ Tld006 = (it.Tld006 ?? 0) + (int)c_mes_inv_item_barcodes.Quantity // 澧炲姞宸查��鏁伴噺
+ })
+ .Where(it => it.Tlmid == C_MES_ITEM_TBL.Id
+ && it.Tld009 == c_mes_inv_item_barcodes.ItemId
+ && it.Tld010 == c_mes_inv_item_barcodes.WorkLine)
+ .ExecuteCommand();
+ }
+
+ // 濡傛灉寰呴��鏁伴噺绛変簬鏈閫�鏂欐暟閲忥紝鍒欐洿鏂版槑缁嗗畬鎴愮姸鎬�
+ if ((C_MES_ITEM_TBL_DETAIL.Tld005 ?? 0) - (C_MES_ITEM_TBL_DETAIL.Tld006 ?? 0) == c_mes_inv_item_barcodes.Quantity)
+ {
+ totalResult += Db.Updateable<MesItemTblDetail>()
+ .SetColumns(it => new MesItemTblDetail { Tld008 = 1 }) // 璁剧疆瀹屾垚鏍囧織
+ .Where(it => it.Tlid == C_MES_ITEM_TBL_DETAIL.Tlid)
+ .ExecuteCommand();
+ }
+
+ // 妫�鏌ラ��鏂欏崟鏄惁鎵�鏈夋槑缁嗛兘宸插畬鎴�
+ var remainingCount = Db.Queryable<MesItemTbl, MesItemTblDetail>((a, b) =>
+ new JoinQueryInfos(JoinType.Left, a.Id == b.Tlmid))
+ .Where((a, b) => a.BillNo == p_bill_no && (b.Tld005 ?? 0) - (b.Tld006 ?? 0) > 0)
+ .Count();
+
+ // 濡傛灉鎵�鏈夋槑缁嗛兘宸插畬鎴愶紝鍒欐洿鏂伴��鏂欏崟鐘舵�佷负宸插畬鎴�
+ if (remainingCount < 1)
+ {
+ totalResult += Db.Updateable<MesItemTbl>()
+ .SetColumns(it => it.Tbl020 == 1 ) // 璁剧疆瀹屾垚鏍囧織
+ .Where(it => it.BillNo == p_bill_no)
+ .ExecuteCommand();
+ }
+
+ if (totalResult < 3)
+ {
+ throw new Exception("鎻掑叆澶辫触");
+ }
+
+ return totalResult;
+ });
+
+ // 璁剧疆杩斿洖缁撴灉
+ // c_result = $"001[,{c_mes_inv_item_barcodes.ItemNo},{c_quantity},鎵爜鎴愬姛锛�,鍙傝�冨簱浣岪鐗╂枡@寰呴��鏁伴噺{c_in_field_valT}";
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Warehouse/WomdaaManager.cs
index b4d4e28..3174d1a 100644
--- a/service/Warehouse/WomdaaManager.cs
+++ b/service/Warehouse/WomdaaManager.cs
@@ -32,25 +32,15 @@
public ProductionPickDto ScanCode(WarehouseQuery query)
{
- string _strMsg = "";
- string _intSum = "";
+ var _strMsg = "";
+ var _intSum = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
-
- if (query.userName.IsNullOrEmpty())
- {
- throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- }
- if (query.daa001.IsNullOrEmpty())
- {
- throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
- }
- if (query.barcode.IsNullOrEmpty())
- {
- throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
- }
-
- using (var cmd =new SqlCommand("[prc_pda_SCLL]", conn))
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[prc_pda_SCLL]", conn))
{
try
{
@@ -73,18 +63,15 @@
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
- _strMsg = parameters[0].Value.ToString();
+ _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);
- }
-
+ if (result <= 0) throw new Exception(_strMsg);
+
var dto = new ProductionPickDto
{
daa001 = query.daa001,
@@ -94,7 +81,6 @@
};
return dto;
-
}
catch (Exception ex)
{
@@ -111,30 +97,17 @@
//prC_pda_SCLL_CF
public ProductionPickDto ScanCodeCF(WarehouseQuery query)
{
-
- if (query.userName.IsNullOrEmpty())
- {
- throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
- }
- if (query.daa001.IsNullOrEmpty())
- {
- throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
- }
- if (query.barcode.IsNullOrEmpty())
- {
- throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
- }
-
- if (query.Num is null or 0)
- {
- throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
- }
-
- string _strMsg = "";
- string _intSum = "";
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ if (query.Num is null or 0) throw new Exception("鏉＄爜鎷嗗垎鏁颁笉鍏佽涓虹┖鎴栬�呬负0");
+
+ var _strMsg = "";
+ var _intSum = "";
using (var conn = new SqlConnection(DbHelperSQL.strConn))
{
- using (var cmd =new SqlCommand("[prc_pda_SCLL_CF]", conn))
+ using (var cmd = new SqlCommand("[prc_pda_SCLL_CF]", conn))
{
try
{
@@ -147,23 +120,20 @@
new("@c_User", query.userName),
new("@p_biLL_no", query.daa001),
new("@p_item_barcode", query.barcode),
- new("@num", query.Num),
+ new("@num", query.Num)
};
parameters[0].Direction = ParameterDirection.Output;
parameters[1].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
- _strMsg = parameters[0].Value.ToString();
+ _strMsg = parameters[0].Value.ToString();
_intSum = parameters[1].Value.ToString();
-
+
var result = Convert.ToInt32(_intSum);
- if (result <= 0)
- {
- throw new Exception(_strMsg);
- }
-
+ if (result <= 0) throw new Exception(_strMsg);
+
var dto = new ProductionPickDto
{
daa001 = query.daa001,
@@ -171,7 +141,6 @@
};
return dto;
-
}
catch (Exception ex)
{
@@ -195,7 +164,7 @@
.Where((a, i) => a.Daa001 == query.daa001)
.Select((a, i) => new
{
- a.Daa001,a.CaaGuid
+ a.Daa001, a.CaaGuid
}).First();
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
@@ -228,13 +197,13 @@
var mesInvItemOutCDetailsList = Db
.Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
- ((a, b, c) =>
- new JoinQueryInfos(
- JoinType.Inner,a.ItemId == b.Id,
- JoinType.Inner,c.DepotId == a.DepotId
- ))
+ ((a, b, c) =>
+ new JoinQueryInfos(
+ JoinType.Inner, a.ItemId == b.Id,
+ JoinType.Inner, c.DepotId == a.DepotId
+ ))
.Where((a, b, c) => a.WorkNo == query.daa001)
- .Select((a, b, c)=> new MesInvItemOutCDetails
+ .Select((a, b, c) => new MesInvItemOutCDetails
{
ItemName = b.ItemName,
ItemNo = b.ItemNo,
@@ -242,11 +211,12 @@
DepotId = a.DepotId,
WorkNo = a.WorkNo,
DepotName = c.DepotName,
- Quantity = a.Quantity,
+ Quantity = a.Quantity
})
.ToList();
- var womcaa = Db.Queryable<Womcaa>().Where(s=>s.Guid == womdaa.CaaGuid).First();
+ var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
+ .First();
var dto = new ProductionPickDto
{
--
Gitblit v1.9.3