From b2f0199d41ef80ba835bf58d6787df7f4accf7be Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 13 十二月 2024 17:40:15 +0800
Subject: [PATCH] 11
---
entity/Womcab.cs | 2
entity/MesSysPageview.cs | 27
service/base/LoginService.cs | 10
entity/Womcaa.cs | 534 ++++++++++----------
service/Warehouse/WomdaaManager.cs | 134 ++++
Dto/service/ProductionPickDto.cs | 12
entity/Womdab.cs | 203 ++++----
entity/MesFile.cs | 84 +-
Controllers/Warehouse/WomdaaController.cs | 235 +++++++++
entity/MesInvItemOutCDetails.cs | 229 ++++----
10 files changed, 904 insertions(+), 566 deletions(-)
diff --git a/Controllers/Warehouse/WomdaaController.cs b/Controllers/Warehouse/WomdaaController.cs
new file mode 100644
index 0000000..84f5d32
--- /dev/null
+++ b/Controllers/Warehouse/WomdaaController.cs
@@ -0,0 +1,235 @@
+锘縰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 WomdaaController : ControllerBase
+{
+ private readonly WomdaaManager m = new();
+
+ #region 鐢熶骇棰嗘枡
+
+ //GetProductionPickDaa001
+ /// <summary>
+ /// 妯＄硦鏌ヨ宸ュ崟鍙峰苟杩斿洖
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetProductionPickDaa001")]
+ public ResponseResult GetProductionPickDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItemsByDaa001
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsByDaa001")]
+ public ResponseResult GetItemsByDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //ScanCode
+ [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] Womdaa 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] Womdaa 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] Womdaa 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);
+ }
+ }
+
+ #endregion
+}
\ No newline at end of file
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index d0298d9..77fcc6e 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -1,12 +1,18 @@
-锘�
-
-using NewPdaSqlServer.entity;
+锘縰sing NewPdaSqlServer.entity;
namespace NewPdaSqlServer.Dto.service;
public class ProductionPickDto
{
public string? ItemModel { get; set; }
+ public string? PlanNo { get; set; }
+ public string? daa001 { get; set; }
+
+ public string? barcodeNum { get; set; }
+
+ public string? splitNum { get; set; }
+
+ public string? barcode { get; set; }
public List<Womdab>? totals { get; set; }
diff --git a/entity/MesFile.cs b/entity/MesFile.cs
index 09b9195..adc504a 100644
--- a/entity/MesFile.cs
+++ b/entity/MesFile.cs
@@ -1,53 +1,51 @@
锘縰sing SqlSugar;
-namespace NewPdaSqlServer.entity
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("MES_FILE")]
+public class MesFile
{
/// <summary>
- ///
- ///</summary>
- [SugarTable("MES_FILE")]
- public class MesFile
- {
- /// <summary>
- /// 涓婚敭
- ///</summary>
- [SugarColumn(ColumnName="guid" ,IsPrimaryKey = true )]
- public Guid Guid { get; set; }
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
- /// <summary>
- /// 鐖朵翰Guid
- ///</summary>
- [SugarColumn(ColumnName="parent_Guid" )]
- public Guid? ParentGuid { get; set; }
+ /// <summary>
+ /// 鐖朵翰Guid
+ /// </summary>
+ [SugarColumn(ColumnName = "parent_Guid")]
+ public Guid? ParentGuid { get; set; }
- /// <summary>
- /// 鏂囦欢鏍囬
- ///</summary>
- [SugarColumn(ColumnName="file_Title" )]
- public string FileTitle { get; set; }
+ /// <summary>
+ /// 鏂囦欢鏍囬
+ /// </summary>
+ [SugarColumn(ColumnName = "file_Title")]
+ public string? FileTitle { get; set; }
- /// <summary>
- /// 鏂囦欢绫诲瀷
- ///</summary>
- [SugarColumn(ColumnName="file_Type" )]
- public string FileType { get; set; }
+ /// <summary>
+ /// 鏂囦欢绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "file_Type")]
+ public string? FileType { get; set; }
- /// <summary>
- /// 鏂囦欢璺緞
- ///</summary>
- [SugarColumn(ColumnName="url_Path" )]
- public string UrlPath { get; set; }
+ /// <summary>
+ /// 鏂囦欢璺緞
+ /// </summary>
+ [SugarColumn(ColumnName = "url_Path")]
+ public string? UrlPath { get; set; }
- /// <summary>
- /// 涓婁紶鑰�
- ///</summary>
- [SugarColumn(ColumnName="create_by" )]
- public string CreateBy { 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 = "create_date")]
+ public DateTime? CreateDate { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesInvItemOutCDetails.cs b/entity/MesInvItemOutCDetails.cs
index 48f47ce..3caf1e7 100644
--- a/entity/MesInvItemOutCDetails.cs
+++ b/entity/MesInvItemOutCDetails.cs
@@ -9,254 +9,255 @@
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; }
+ public string ItemBarcode { get; set; }
/// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- /// </summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
[SugarColumn(ColumnName = "C_ITEM_CODE")]
- public string? CItemCode { get; set; }
+ public string CItemCode { get; set; }
/// <summary>
- /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- /// </summary>
+ /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ ///</summary>
[SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
- /// 鍘傚鎵规
- /// </summary>
+ /// 鍘傚鎵规
+ ///</summary>
[SugarColumn(ColumnName = "LOT_NO")]
- public string? LotNo { get; set; }
+ 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; }
+ 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; }
+ 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; }
+ public string CustNo { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
+ /// 浠撳簱缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
+ public string DepotCode { get; set; }
/// <summary>
- /// 璐т綅缂栫爜
- /// </summary>
+ /// 璐т綅缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
- public string? DepotSectionCode { get; set; }
+ public string DepotSectionCode { get; set; }
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "REMARK")]
- public string? Remark { get; set; }
+ 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; }
+ 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; }
+ public string Factory { get; set; }
/// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
+ /// 鍏徃缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
+ public string Company { get; set; }
/// <summary>
- /// 鍘熺敓浜у伐鍗�
- /// </summary>
+ /// 鍘熺敓浜у伐鍗�
+ ///</summary>
[SugarColumn(ColumnName = "TASK_NOY")]
- public string? TaskNoy { get; set; }
+ public string TaskNoy { get; set; }
/// <summary>
- /// 绠卞彿
- /// </summary>
+ /// 绠卞彿
+ ///</summary>
[SugarColumn(ColumnName = "BOX_NO")]
- public string? BoxNo { get; set; }
+ public string BoxNo { get; set; }
/// <summary>
- /// 鍖呰鎵规
- /// </summary>
+ /// 鍖呰鎵规
+ ///</summary>
[SugarColumn(ColumnName = "TASK_PACK")]
- public string? TaskPack { get; set; }
+ public string TaskPack { get; set; }
/// <summary>
- /// 鍗℃澘
- /// </summary>
+ /// 鍗℃澘
+ ///</summary>
[SugarColumn(ColumnName = "KB_NO")]
- public string? KbNo { get; set; }
+ public string KbNo { get; set; }
/// <summary>
- /// 鏉垮瀷
- /// </summary>
+ /// 鏉垮瀷
+ ///</summary>
[SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
+ public string BoardStyle { get; set; }
/// <summary>
- /// 鐢熶骇宸ュ崟
- /// </summary>
+ /// 鐢熶骇宸ュ崟
+ ///</summary>
[SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
+ /// 宸ュ崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
+ 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; }
+ public string SuppNo { get; set; }
/// <summary>
- /// 閲囪喘鍗曞彿
- /// </summary>
+ /// 閲囪喘鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "PBILL_NO")]
- public string? PbillNo { get; set; }
+ 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; }
+ public string RcvBy { get; set; }
/// <summary>
- /// 鏀惰揣閮ㄥ垎
- /// </summary>
+ /// 鏀惰揣閮ㄥ垎
+ ///</summary>
[SugarColumn(ColumnName = "RCV_PART")]
- public string? RcvPart { get; set; }
+ public string RcvPart { get; set; }
/// <summary>
- /// 鍏ュ簱缂栧彿
- /// </summary>
+ /// 鍏ュ簱缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "RK_NO")]
- public string? RkNo { get; set; }
+ 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>
- [SugarColumn(ColumnName = "DABID")]
- public long? Dabid { get; set; }
-
- /// <summary>
- /// 浠撳簱id
- /// </summary>
+ /// 浠撳簱id
+ ///</summary>
[SugarColumn(ColumnName = "depot_id")]
public int? DepotId { get; set; }
+ /// <summary>
+ /// 宸ュ崟鏄庣粏琛宨d
+ ///</summary>
+ [SugarColumn(ColumnName = "DABID")]
+ public Guid? Dabid { get; set; }
+
[SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
diff --git a/entity/MesSysPageview.cs b/entity/MesSysPageview.cs
index 7440f0a..2688515 100644
--- a/entity/MesSysPageview.cs
+++ b/entity/MesSysPageview.cs
@@ -9,45 +9,42 @@
public class MesSysPageview
{
/// <summary>
- /// 涓婚敭
- /// 榛樿鍊�: (newid())
- ///</summary>
+ /// 涓婚敭
+ /// 榛樿鍊�: (newid())
+ /// </summary>
[SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
/// <summary>
- /// 椤甸潰涓枃鍚�
- ///</summary>
+ /// 椤甸潰涓枃鍚�
+ /// </summary>
[SugarColumn(ColumnName = "PAGE_VIEW")]
public string PageView { get; set; }
/// <summary>
- /// 椤甸潰璺緞
- ///</summary>
+ /// 椤甸潰璺緞
+ /// </summary>
[SugarColumn(ColumnName = "PATH")]
public string Path { get; set; }
/// <summary>
- /// 椤甸潰鍥炬爣
- ///</summary>
+ /// 椤甸潰鍥炬爣
+ /// </summary>
[SugarColumn(ColumnName = "ICOIMG")]
public string Icoimg { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "PAGE_GROUP")]
public string PageGroup { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "PAGE_IDX")]
public int? PageIdx { get; set; }
/// <summary>
- ///
- ///</summary>
+ /// </summary>
[SugarColumn(ColumnName = "PAGE_STATUS")]
public bool? PageStatus { get; set; }
}
\ No newline at end of file
diff --git a/entity/Womcaa.cs b/entity/Womcaa.cs
index 6f73e68..feaef07 100644
--- a/entity/Womcaa.cs
+++ b/entity/Womcaa.cs
@@ -8,410 +8,410 @@
[SugarTable("WOMCAA")]
public class Womcaa
{
- /// <summary>
- /// 榛樿鍊�: (newid())
- /// </summary>
- [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
public Guid Guid { get; set; }
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
public int? Erpid { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA001")]
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA001")]
public string Caa001 { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷("1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇")
- /// </summary>
- [SugarColumn(ColumnName = "CAA004")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷("1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇")
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA004")]
public string Caa004 { get; set; }
- /// <summary>
- /// 璁″垝涓嬭揪鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CAA005")]
+ /// <summary>
+ /// 璁″垝涓嬭揪鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA005")]
public string Caa005 { get; set; }
- /// <summary>
- /// 浜у搧ID
- /// </summary>
- [SugarColumn(ColumnName = "CAA006")]
+ /// <summary>
+ /// 浜у搧ID
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA006")]
public string Caa006 { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAA009")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA009")]
public string Caa009 { get; set; }
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "CAA010")]
+ /// <summary>
+ /// 棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA010")]
public string Caa010 { get; set; }
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA011")]
+ /// <summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA011")]
public string Caa011 { get; set; }
- /// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA012")]
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA012")]
public decimal? Caa012 { get; set; }
- /// <summary>
- /// BOM鐗堟
- /// </summary>
- [SugarColumn(ColumnName = "CAA013")]
+ /// <summary>
+ /// BOM鐗堟
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA013")]
public string Caa013 { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA015")]
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA015")]
public string Caa015 { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "CAA016")]
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA016")]
public string Caa016 { get; set; }
- /// <summary>
- /// 宸叉帓鏁伴噺锛堝純鐢級
- /// </summary>
- [SugarColumn(ColumnName = "CAA017")]
+ /// <summary>
+ /// 宸叉帓鏁伴噺锛堝純鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA017")]
public int? Caa017 { get; set; }
- /// <summary>
- /// ERP鐢熶骇璁㈠崟ID
- /// </summary>
- [SugarColumn(ColumnName = "CAA018")]
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟ID
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA018")]
public int? Caa018 { get; set; }
- /// <summary>
- /// ERP鐢熶骇璁㈠崟搴忓彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA019")]
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA019")]
public int? Caa019 { get; set; }
- /// <summary>
- /// ERP鐢熶骇璁㈠崟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA020")]
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA020")]
public string Caa020 { get; set; }
- /// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA021")]
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA021")]
public string Caa021 { 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 = "CAA022")]
+ /// <summary>
+ /// 鏈帓鏁伴噺锛堝純鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA022")]
public int? Caa022 { get; set; }
- /// <summary>
- /// 涓氬姟鐘舵��("1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�")
- /// </summary>
- [SugarColumn(ColumnName = "CAA023")]
+ /// <summary>
+ /// 涓氬姟鐘舵��("1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�")
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA023")]
public string Caa023 { get; set; }
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAA024")]
+ /// <summary>
+ /// 宸插叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA024")]
public int? Caa024 { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎
- /// </summary>
- [SugarColumn(ColumnName = "ROUTING_ID")]
+ /// <summary>
+ /// 宸ヨ壓璺嚎
+ /// </summary>
+ [SugarColumn(ColumnName = "ROUTING_ID")]
public string RoutingId { get; set; }
- /// <summary>
- /// 浜х嚎
- /// </summary>
- [SugarColumn(ColumnName = "WORK_SHOP_ID")]
+ /// <summary>
+ /// 浜х嚎
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_SHOP_ID")]
public string WorkShopId { get; set; }
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
public string DepotCode { get; set; }
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public string CreateDate { get; set; }
- /// <summary>
- /// 璁″垝缁�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_GROUP_ID")]
+ /// <summary>
+ /// 璁″垝缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_GROUP_ID")]
public string WorkGroupId { get; set; }
- /// <summary>
- /// 璁″垝鍛�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_ID")]
+ /// <summary>
+ /// 璁″垝鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_ID")]
public string PlanId { get; set; }
- /// <summary>
- /// 鍏ュ簱涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITH")]
+ /// <summary>
+ /// 鍏ュ簱涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_INLIMITH")]
public string StockInlimith { get; set; }
- /// <summary>
- /// 鍏ュ簱涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITL")]
+ /// <summary>
+ /// 鍏ュ簱涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_INLIMITL")]
public string StockInlimitl { get; set; }
- /// <summary>
- /// 涓昏溅闂磋皟搴﹀崟
- /// </summary>
- [SugarColumn(ColumnName = "MTONO")]
+ /// <summary>
+ /// 涓昏溅闂磋皟搴﹀崟
+ /// </summary>
+ [SugarColumn(ColumnName = "MTONO")]
public string Mtono { get; set; }
- /// <summary>
- /// 鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
+ /// <summary>
+ /// 鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT")]
public string Lot { get; set; }
- /// <summary>
- /// 寮曠敤鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA015_HEAD")]
+ /// <summary>
+ /// 寮曠敤鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA015_HEAD")]
public string Caa015Head { get; set; }
- /// <summary>
- /// 鍒跺崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TYPE")]
+ /// <summary>
+ /// 鍒跺崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_TYPE")]
public string CreateType { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
public string SrcBillType { get; set; }
- /// <summary>
- /// 鏉ユ簮鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_NO")]
public string SrcBillNo { get; set; }
- /// <summary>
- /// 鏉ユ簮琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
+ /// <summary>
+ /// 鏉ユ簮琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
public string SrcBillentryseq { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_NO")]
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_ORDER_NO")]
public string SaleOrderNo { get; set; }
- /// <summary>
- /// 閿�鍞鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
public string SaleOrderEntryseq { get; set; }
- /// <summary>
- /// 寮哄埗鍏抽棴浜�
- /// </summary>
- [SugarColumn(ColumnName = "FORCE_CLOSERID")]
+ /// <summary>
+ /// 寮哄埗鍏抽棴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FORCE_CLOSERID")]
public string ForceCloserid { get; set; }
- /// <summary>
- /// 鍏抽棴绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "CLOSE_TYPE")]
+ /// <summary>
+ /// 鍏抽棴绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_TYPE")]
public string CloseType { get; set; }
- /// <summary>
- /// 鍒嗗崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
+ /// <summary>
+ /// 鍒嗗崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
public string SrcSplitBillno { get; set; }
- /// <summary>
- /// 鏄惁绠℃帶
- /// </summary>
- [SugarColumn(ColumnName = "ERP_SCZZ")]
+ /// <summary>
+ /// 鏄惁绠℃帶
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_SCZZ")]
public int? ErpSczz { get; set; }
- /// <summary>
- /// 鏄惁濮旀墭
- /// </summary>
- [SugarColumn(ColumnName = "ERP_WTZZ")]
+ /// <summary>
+ /// 鏄惁濮旀墭
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_WTZZ")]
public int? ErpWtzz { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
public string MainProductNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
public int? MainProductQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
public string CustomerItemNumber { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
public string PackingListNumber { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NAME")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_NAME")]
public string CustomerName { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER")]
public string Customer { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "TYPE")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPE")]
public string Type { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "JA_BS")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_BS")]
public string JaBs { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "JA_TIME")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_TIME")]
public DateTime? JaTime { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "YP_NUM")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "YP_NUM")]
public int? YpNum { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "CAA011_1")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA011_1")]
public string Caa0111 { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ERP_GYZZ")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_GYZZ")]
public int? ErpGyzz { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ERP_FLZZ")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_FLZZ")]
public int? ErpFlzz { get; set; }
- /// <summary>
- /// 鏄惁鍏ュ簱
- /// </summary>
- [SugarColumn(ColumnName = "ERP_SLZZ")]
+ /// <summary>
+ /// 鏄惁鍏ュ簱
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_SLZZ")]
public int? ErpSlzz { get; set; }
- /// <summary>
- /// 鏄惁閫�搴�
- /// </summary>
- [SugarColumn(ColumnName = "ERP_RKZZ")]
+ /// <summary>
+ /// 鏄惁閫�搴�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_RKZZ")]
public int? ErpRkzz { get; set; }
- /// <summary>
- /// 鏄惁鎹㈣揣
- /// </summary>
- [SugarColumn(ColumnName = "ERP_RKHZ")]
+ /// <summary>
+ /// 鏄惁鎹㈣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_RKHZ")]
public int? ErpRkhz { get; set; }
- /// <summary>
- /// 鏄惁瀵勫敭
- /// </summary>
- [SugarColumn(ColumnName = "ERP_JJDS")]
+ /// <summary>
+ /// 鏄惁瀵勫敭
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_JJDS")]
public int? ErpJjds { get; set; }
- /// <summary>
- /// 鏄惁鎸夋
- /// </summary>
- [SugarColumn(ColumnName = "ERP_BZDS")]
+ /// <summary>
+ /// 鏄惁鎸夋
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_BZDS")]
public int? ErpBzds { get; set; }
- /// <summary>
- /// 鏄惁鏂板缓
- /// </summary>
- [SugarColumn(ColumnName = "CAA025")]
+ /// <summary>
+ /// 鏄惁鏂板缓
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA025")]
public int? Caa025 { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "FPURORDERNO")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERNO")]
public string Fpurorderno { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
public string Fpurorderentryseq { get; set; }
- /// <summary>
- /// 澶囨敞锛堣〃浣擄級
- /// </summary>
- [SugarColumn(ColumnName = "Btbz")]
+ /// <summary>
+ /// 澶囨敞锛堣〃浣擄級
+ /// </summary>
+ [SugarColumn(ColumnName = "Btbz")]
public string Btbz { get; set; }
- /// <summary>
- /// 婧愭媶鍒嗚鍗曠紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "fmoentryid")]
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曠紪鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "fmoentryid")]
public string Fmoentryid { get; set; }
- /// <summary>
- /// 鎺掍骇绾垮埆
- /// </summary>
- [SugarColumn(ColumnName = "prod_line")]
+ /// <summary>
+ /// 鎺掍骇绾垮埆
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_line")]
public string ProdLine { get; set; }
}
\ No newline at end of file
diff --git a/entity/Womcab.cs b/entity/Womcab.cs
index 50d07ad..59cf490 100644
--- a/entity/Womcab.cs
+++ b/entity/Womcab.cs
@@ -129,7 +129,7 @@
public string DepotCode { get; set; }
/// <summary>
- /// 鍙戞枡鏂瑰紡
+ /// 鍙戞枡鏂瑰紡 1銆佺洿鎺ラ鏂欙紱2銆佺洿鎺ュ�掑啿锛�3銆佽皟鎷ㄩ鏂欙紱4銆佽皟鎷ㄥ埌鍐诧紱7銆佷笉鍙戞枡
/// </summary>
[SugarColumn(ColumnName = "ISSUE_TYPE")]
public string IssueType { get; set; }
diff --git a/entity/Womdab.cs b/entity/Womdab.cs
index 015c5db..d4d8723 100644
--- a/entity/Womdab.cs
+++ b/entity/Womdab.cs
@@ -8,227 +8,230 @@
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; }
+ 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; }
+ public string? Dab003 { get; set; }
/// <summary>
- /// 鏉愭枡鍚嶇О
- /// </summary>
+ /// 鏉愭枡鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "dab004")]
- public string Dab004 { get; set; }
+ public string? Dab004 { get; set; }
/// <summary>
- /// 鏉愭枡瑙勬牸
- /// </summary>
+ /// 鏉愭枡瑙勬牸
+ ///</summary>
[SugarColumn(ColumnName = "dab005")]
- public string Dab005 { get; set; }
+ public string? Dab005 { get; set; }
/// <summary>
- /// 闇�棰嗙敤閲�
- /// </summary>
+ /// 闇�棰嗙敤閲�
+ ///</summary>
[SugarColumn(ColumnName = "dab006")]
- public int? Dab006 { get; set; }
+ public decimal? Dab006 { get; set; }
/// <summary>
- /// 宸查鐢ㄩ噺
- /// </summary>
+ /// 宸查鐢ㄩ噺
+ ///</summary>
[SugarColumn(ColumnName = "dab007")]
- public int? Dab007 { get; set; }
+ public decimal? Dab007 { get; set; }
/// <summary>
- /// 宸ヨ壓
- /// </summary>
+ /// 宸ヨ壓
+ ///</summary>
[SugarColumn(ColumnName = "dab008")]
- public string Dab008 { get; set; }
+ public string? Dab008 { get; set; }
/// <summary>
- /// 鍗曚綅
- /// </summary>
+ /// 鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "dab009")]
- public string Dab009 { get; set; }
+ public string? Dab009 { get; set; }
/// <summary>
- /// 鏉愭枡绫诲瀷
- /// </summary>
+ /// 鏉愭枡绫诲瀷
+ ///</summary>
[SugarColumn(ColumnName = "dab010")]
- public string Dab010 { get; set; }
+ public string? Dab010 { get; set; }
/// <summary>
- /// 涓绘枡
- /// </summary>
+ /// 涓绘枡
+ ///</summary>
[SugarColumn(ColumnName = "dab011")]
- public string Dab011 { get; set; }
+ 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; }
+ public string? Dab014 { get; set; }
/// <summary>
- /// 鐐逛綅
- /// </summary>
+ /// 鐐逛綅
+ ///</summary>
[SugarColumn(ColumnName = "dab015")]
- public string Dab015 { get; set; }
+ public string? Dab015 { get; set; }
/// <summary>
- /// 鎶曟枡鍗曞彿
- /// </summary>
+ /// 鎶曟枡鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "dab016")]
- public string Dab016 { get; set; }
+ public string? Dab016 { get; set; }
/// <summary>
- /// 浠撳簱缂栫爜
- /// </summary>
+ /// 浠撳簱缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "dab017")]
- public string Dab017 { get; set; }
+ public string? Dab017 { get; set; }
/// <summary>
- /// 浠撳簱鍚嶇О
- /// </summary>
+ /// 浠撳簱鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "dab018")]
- public string Dab018 { get; set; }
+ public string? Dab018 { get; set; }
/// <summary>
- /// 棰嗘枡鏂瑰紡
- /// </summary>
+ /// 棰嗘枡鏂瑰紡
+ ///</summary>
[SugarColumn(ColumnName = "dab019")]
- public string Dab019 { get; set; }
+ 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 int? Dab020 { get; set; }
+ public decimal? Dab020 { get; set; }
/// <summary>
- /// 琛ラ鏁伴噺
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 琛ラ鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "dab021")]
- public int? Dab021 { get; set; }
+ public decimal? Dab021 { get; set; }
/// <summary>
- /// 閫�鏂欐暟閲�
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "dab022")]
- public int? Dab022 { get; set; }
+ public decimal? Dab022 { get; set; }
/// <summary>
- /// 瓒呴鏁伴噺
- /// 榛樿鍊�: ((0))
- /// </summary>
+ /// 瓒呴鏁伴噺
+ /// 榛樿鍊�: ((0))
+ ///</summary>
[SugarColumn(ColumnName = "dab023")]
- public int? Dab023 { get; set; }
+ 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; }
+ public string? HbNo { get; set; }
+
// 鍔ㄦ�佹坊鍔犵殑灞炴��
[SugarColumn(IsIgnore = true)] public decimal? wNum { get; set; }
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Warehouse/WomdaaManager.cs
index 8485ed1..b6ad5b0 100644
--- a/service/Warehouse/WomdaaManager.cs
+++ b/service/Warehouse/WomdaaManager.cs
@@ -1,4 +1,6 @@
-锘縰sing NewPdaSqlServer.DB;
+锘縰sing System.Data;
+using System.Data.SqlClient;
+using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using SqlSugar;
@@ -24,6 +26,75 @@
//鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
{
+ return getDaa001(query);
+ }
+
+ public ProductionPickDto ScanCode(WarehouseQuery query)
+ {
+ string _strMsg = "";
+ string _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ using (var cmd =new SqlCommand("[prc_sys_role_set_menuOrAction]", 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.daa001),
+ 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();
+ }
+ }
+ }
+ }
+
+ private ProductionPickDto getDaa001(WarehouseQuery query)
+ {
if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
@@ -32,22 +103,24 @@
.Where((a, i) => a.Daa001 == query.daa001)
.Select((a, i) => new
{
- i.ItemModel
+ a.Daa001,a.CaaGuid
}).First();
- if (womdaa?.ItemModel == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
-
- var womdabs = Db.Queryable<Womdaa, Womdab, MesItems>((a, b, c) =>
- new JoinQueryInfos(
- JoinType.Left,
- a.Id == b.Pid,
- JoinType.Inner,
- c.Id.ToString() ==
- b.Dab003
- ))
- .Where((a, b, c) =>
- a.Daa001 == query.daa001)
- .Select((a, b, c) => new Womdab
+ if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+
+ var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
+ (a, b, c, d) =>
+ new JoinQueryInfos(
+ JoinType.Left,
+ a.Guid == b.DaaGuid,
+ JoinType.Inner,
+ c.Id.ToString() ==
+ b.Dab003,
+ JoinType.Inner, b.Erpid == d.Erpid
+ ))
+ .Where((a, b, c, d) =>
+ a.Daa001 == query.daa001 && d.IssueType == "1")
+ .Select((a, b, c, d) => new Womdab
{
Pid = b.Pid,
Dab003 = b.Dab003,
@@ -59,15 +132,38 @@
})
.ToList();
- var list = womdabs.Where(s=>s.wNum > 0).ToList();
+ var list = womdabs.Where(s => s.wNum > 0).ToList();
+
+ var mesInvItemOutCDetailsList = Db
+ .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
+ ((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
+ {
+ ItemName = b.ItemName,
+ ItemNo = b.ItemNo,
+ ItemId = a.ItemId,
+ DepotId = a.DepotId,
+ WorkNo = a.WorkNo,
+ DepotName = c.DepotName,
+ Quantity = a.Quantity,
+ })
+ .ToList();
+
+ var womcaa = Db.Queryable<Womcaa>().Where(s=>s.Guid == womdaa.CaaGuid).First();
var dto = new ProductionPickDto
{
- ItemModel = womdaa.ItemModel,
+ daa001 = womdaa.Daa001,
+ PlanNo = womcaa.Caa020,
totals = womdabs,
- daisao = list
+ daisao = list,
+ yisao = mesInvItemOutCDetailsList
};
-
return dto;
}
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index c4b5a68..cd24096 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -24,8 +24,6 @@
public List<dynamic> getUserMenu(string name)
{
- var sql = "";
-
var pageViewList = Db.Queryable<MesSysPageview>()
.Where(s => s.PageStatus == true)
.OrderBy(s => s.PageIdx)
@@ -51,13 +49,17 @@
var mesFile = Db.Queryable<MesFile>()
.Where(s => s.ParentGuid == pageView.Guid).First();
+ var icoimg = "";
+ if (mesFile != null)
+ icoimg = "http://192.168.1.145:81/upload/" +
+ mesFile.UrlPath;
+
groupObj.child.Add(new MesSysPageview
{
Guid = pageView.Guid,
PageView = pageView.PageView,
Path = pageView.Path,
- Icoimg = "http://192.168.1.145:81/upload/" +
- mesFile.UrlPath,
+ Icoimg = icoimg,
PageGroup = pageView.PageGroup,
PageIdx = pageView.PageIdx,
PageStatus = pageView.PageStatus
--
Gitblit v1.9.3