From a204df28fd20b4908bba80deb482f9c91ecc0877 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 08 一月 2025 16:22:23 +0800
Subject: [PATCH] 11
---
entity/WwGd.cs | 188 ++++++++
service/Wom/WomdaaManager.cs | 2
Controllers/Wom/WomdaaController.cs | 4
entity/ProductionOrder.cs | 354 ++++++++++++++++
service/Wom/WwGdManager.cs | 56 +-
Dto/service/ProductionPickDto.cs | 3
service/Warehouse/InventoryManager.cs | 35 -
Controllers/Warehouse/InventoryController.cs | 20
Controllers/Wom/WwGdController.cs | 133 +++--
entity/ProductionOrderSub.cs | 301 ++++++++++++++
entity/WwGdDetail.cs | 138 ++++++
11 files changed, 1,102 insertions(+), 132 deletions(-)
diff --git a/Controllers/Warehouse/InventoryController.cs b/Controllers/Warehouse/InventoryController.cs
index 7d7799f..c4fca46 100644
--- a/Controllers/Warehouse/InventoryController.cs
+++ b/Controllers/Warehouse/InventoryController.cs
@@ -13,16 +13,16 @@
private readonly InventoryManager m = new();
/// <summary>
- /// 鎵弿搴撲綅鏉＄爜鐨勬帶鍒跺櫒鏂规硶
+ /// 鎵弿搴撲綅鏉＄爜鐨勬帶鍒跺櫒鏂规硶
/// </summary>
/// <param name="query">鍖呭惈搴撲綅浠ｇ爜鐨勬煡璇㈠璞�</param>
/// <returns>鎵弿缁撴灉淇℃伅</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/Inventory/ScanDepotNo
- /// {
+ /// 璇锋眰绀轰緥:
+ /// POST /api/Inventory/ScanDepotNo
+ /// {
/// "DepotCode": "搴撲綅浠ｇ爜"
- /// }
+ /// }
/// </remarks>
[HttpPost("ScanDepotNo")]
public ResponseResult ScanDepotNo([FromBody] WarehouseQuery query)
@@ -45,18 +45,18 @@
}
/// <summary>
- /// 鎵弿鏉＄爜鐨勬帶鍒跺櫒鏂规硶
+ /// 鎵弿鏉＄爜鐨勬帶鍒跺櫒鏂规硶
/// </summary>
/// <param name="query">鍖呭惈鏉＄爜銆佸簱浣嶄唬鐮佸拰鐢ㄦ埛鍚嶇殑鏌ヨ瀵硅薄</param>
/// <returns>鎵弿缁撴灉淇℃伅</returns>
/// <remarks>
- /// 璇锋眰绀轰緥:
- /// POST /api/Inventory/ScanBarcode
- /// {
+ /// 璇锋眰绀轰緥:
+ /// POST /api/Inventory/ScanBarcode
+ /// {
/// "barcode": "鏉＄爜",
/// "DepotCode": "搴撲綅浠ｇ爜",
/// "userName": "鐢ㄦ埛鍚�"
- /// }
+ /// }
/// </remarks>
[HttpPost("ScanBarcode")]
public ResponseResult ScanBarcode([FromBody] WarehouseQuery query)
diff --git a/Controllers/Warehouse/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
similarity index 98%
rename from Controllers/Warehouse/WomdaaController.cs
rename to Controllers/Wom/WomdaaController.cs
index 9de2fe2..3bca6be 100644
--- a/Controllers/Warehouse/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -2,10 +2,10 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.service.Warehouse;
+using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
-namespace NewPdaSqlServer.Controllers.Warehouse;
+namespace NewPdaSqlServer.Controllers.Wom;
[ApiController]
[Route("api/[controller]")]
diff --git a/Controllers/Warehouse/WomdaaController.cs b/Controllers/Wom/WwGdController.cs
similarity index 74%
copy from Controllers/Warehouse/WomdaaController.cs
copy to Controllers/Wom/WwGdController.cs
index 9de2fe2..a1a34f0 100644
--- a/Controllers/Warehouse/WomdaaController.cs
+++ b/Controllers/Wom/WwGdController.cs
@@ -2,75 +2,37 @@
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
-using NewPdaSqlServer.service.Warehouse;
+using NewPdaSqlServer.service.Wom;
using NewPdaSqlServer.util;
-namespace NewPdaSqlServer.Controllers.Warehouse;
+namespace NewPdaSqlServer.Controllers.Wom;
[ApiController]
[Route("api/[controller]")]
-public class WomdaaController : ControllerBase
+public class WwGdController : ControllerBase
{
- private readonly WomdaaManager m = new();
+ private readonly WwGdManager 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
+ /// <param name="query">鎵爜璇锋眰鍙傛暟</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ /// // Demo Request:
+ // POST /api/WwGdController/ScanCode
+ // Body:
+ // {
+ // "query": {
+ // "Code": "SampleCode",
+ // "Type": 1
+ // }
+ // }
[HttpPost("ScanCode")]
public ResponseResult ScanCode(WarehouseQuery query)
{
try
{
+ // 璋冪敤WwGdManager鐨凷canCode鏂规硶杩涜鎵爜鎿嶄綔
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
return new ResponseResult
@@ -82,16 +44,31 @@
}
catch (Exception ex)
{
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
return ResponseResult.ResponseError(ex);
}
}
- //ScanCodeCF
+ /// <summary>
+ /// 鎵爜纭
+ /// </summary>
+ /// <param name="query">鎵爜纭璇锋眰鍙傛暟</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ /// // Demo Request:
+ // POST /api/WwGdController/ScanCodeCF
+ // Body:
+ // {
+ // "query": {
+ // "Code": "SampleCode",
+ // "Type": 1
+ // }
+ // }
[HttpPost("ScanCodeCF")]
public ResponseResult ScanCodeCF(WarehouseQuery query)
{
try
{
+ // 璋冪敤WwGdManager鐨凷canCodeCF鏂规硶杩涜鎵爜纭鎿嶄綔
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCodeCF(query);
return new ResponseResult
@@ -103,6 +80,42 @@
}
catch (Exception ex)
{
+ // 濡傛灉鍙戠敓寮傚父锛岃繑鍥為敊璇俊鎭�
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// </summary>
+ /// <param name="query">宸ュ崟鍙疯姹傚弬鏁�</param>
+ /// <returns>ResponseResult瀵硅薄锛屽寘鍚姸鎬併�佹秷鎭拰鏁版嵁</returns>
+ // Demo Request:
+ // POST /api/WwGdController/GetItemsByDaa001
+ // Body:
+ // {
+ // "query": {
+ // "BillNo": "SampleBillNo"
+ // }
+ // }
+ [HttpPost("GetItemsByDaa001")]
+ public ResponseResult GetItemsByDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ // 璋冪敤WwGdManager鐨凣etItemsByDaa001鏂规硶鑾峰彇浠ｉ鐗╂枡鏄庣粏
+ 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);
}
}
@@ -185,7 +198,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] Womdaa data)
+ public ResponseResult Add([FromBody] WwGd data)
{
try
{
@@ -209,7 +222,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] Womdaa data)
+ public ResponseResult InsertReturnIdentity([FromBody] WwGd data)
{
try
{
@@ -233,7 +246,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] Womdaa data)
+ public ResponseResult Update([FromBody] WwGd data)
{
try
{
@@ -251,6 +264,4 @@
return ResponseResult.ResponseError(ex);
}
}
-
- #endregion
}
\ No newline at end of file
diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
index 77fcc6e..44dc1ea 100644
--- a/Dto/service/ProductionPickDto.cs
+++ b/Dto/service/ProductionPickDto.cs
@@ -15,8 +15,11 @@
public string? barcode { get; set; }
public List<Womdab>? totals { get; set; }
+ public List<WwGdDetail>? totals1 { get; set; }
public List<Womdab>? daisao { get; set; }
+ public List<WwGdDetail>? daisao1 { get; set; }
+
public List<MesInvItemOutCDetails> yisao { get; set; }
}
\ No newline at end of file
diff --git a/entity/ProductionOrder.cs b/entity/ProductionOrder.cs
new file mode 100644
index 0000000..05c88f6
--- /dev/null
+++ b/entity/ProductionOrder.cs
@@ -0,0 +1,354 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// 鐢熶骇璁㈠崟琛�(濮斿)
+/// </summary>
+[SugarTable("PRODUCTION_ORDER")]
+public class ProductionOrder
+{
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_NO")]
+ public string? OrderNo { get; set; }
+
+ /// <summary>
+ /// 璐寸墖宸ヨ壓灞炴��
+ /// </summary>
+ [SugarColumn(ColumnName = "SMT_PROCESS_ATTR")]
+ public string? SmtProcessAttr { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string? Warehouse { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_DATE")]
+ public DateTime? OrderDate { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_TYPE")]
+ public string? OrderType { get; set; }
+
+ /// <summary>
+ /// 涓氬姟鐘舵�� 1璁″垝纭 2涓嬭揪 3寮�宸� 4瀹屽伐 5缁撴
+ /// </summary>
+ [SugarColumn(ColumnName = "BUSINESS_STATUS")]
+ public string? BusinessStatus { get; set; }
+
+ /// <summary>
+ /// 浜у搧缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "PRODUCT_CODE")]
+ public string? ProductCode { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string? Unit { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_ORDER_QTY")]
+ public decimal? WorkOrderQty { get; set; }
+
+ /// <summary>
+ /// 璁″垝缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLANNING_GROUP")]
+ public string? PlanningGroup { get; set; }
+
+ /// <summary>
+ /// 璁″垝鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLANNER")]
+ public string? Planner { get; set; }
+
+ /// <summary>
+ /// 棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "ESTIMATED_START_TIME")]
+ public DateTime? EstimatedStartTime { get; set; }
+
+ /// <summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "ESTIMATED_END_TIME")]
+ public DateTime? EstimatedEndTime { get; set; }
+
+ /// <summary>
+ /// 璁″垝涓嬭揪鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_RELEASE_DATE")]
+ public DateTime? PlanReleaseDate { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STORAGE_UPPER_LIMIT")]
+ public decimal? StorageUpperLimit { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STORAGE_LOWER_LIMIT")]
+ public decimal? StorageLowerLimit { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TRACKING_NO")]
+ public string? TrackingNo { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BATCH_NO")]
+ public string? BatchNo { get; set; }
+
+ /// <summary>
+ /// BOM鐗堟
+ /// </summary>
+ [SugarColumn(ColumnName = "BOM_VERSION")]
+ public string? BomVersion { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_NO")]
+ public string? SalesOrderNo { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_LINE_NO")]
+ public string? SalesOrderLineNo { get; set; }
+
+ /// <summary>
+ /// 鐢熸垚鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "GENERATION_METHOD")]
+ public string? GenerationMethod { get; set; }
+
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_ID")]
+ public string? ErpProductionOrderId { get; set; }
+
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_LINE_NO")]
+ public string? ErpProductionOrderLineNo { get; set; }
+
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_PRODUCTION_ORDER_NO")]
+ public string? ErpProductionOrderNo { get; set; }
+
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_ORDER_TYPE")]
+ public string? SourceOrderType { get; set; }
+
+ /// <summary>
+ /// 婧愬崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_ORDER_NO")]
+ public string? SourceOrderNo { get; set; }
+
+ /// <summary>
+ /// 婧愬崟鍒嗗綍琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_ORDER_ENTRY_NO")]
+ public string? SourceOrderEntryNo { get; set; }
+
+ /// <summary>
+ /// 闇�姹傚崟鎹彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEMAND_ORDER_NO")]
+ public string? DemandOrderNo { get; set; }
+
+ /// <summary>
+ /// 闇�姹傚崟鎹鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "DEMAND_ORDER_LINE_NO")]
+ public string? DemandOrderLineNo { get; set; }
+
+ /// <summary>
+ /// 缁撴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSING_PERSON")]
+ public string? ClosingPerson { get; set; }
+
+ /// <summary>
+ /// 缁撴绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSING_TYPE")]
+ public string? ClosingType { get; set; }
+
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曠紪鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SPLIT_ORDER_NO")]
+ public string? SplitOrderNo { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string? Remarks { get; set; }
+
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? ErpId { get; set; }
+
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")]
+ public string? ErpProductionEntryCode { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "PURCHASEORDERNO")]
+ public string? Purchaseorderno { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PURCHASEORDERENTRYSEQ")]
+ public int? Purchaseorderentryseq { get; set; }
+
+ /// <summary>
+ /// 鏍囧噯鐐规暟
+ /// </summary>
+ [SugarColumn(ColumnName = "STANDARDPOINTS")]
+ public decimal? Standardpoints { get; set; }
+
+ /// <summary>
+ /// 璁′环鐐规暟
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICINGPOINTS")]
+ public decimal? Pricingpoints { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCKINQTY")]
+ public decimal? Stockinqty { get; set; }
+
+ /// <summary>
+ /// 鏈叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "NOSTOCKINQTY")]
+ public decimal? Nostockinqty { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCKOWNER")]
+ public string? Stockowner { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鐘舵��
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDIT_STATUS")]
+ public int? AuditStatus { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITOR")]
+ public string? Auditor { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDIT_DATE")]
+ public DateTime? AuditDate { get; set; }
+
+ /// <summary>
+ /// 閫氱煡澶囨枡鐘舵��
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "PREPARE_FLAG")]
+ public int? PrepareFlag { get; set; }
+
+ /// <summary>
+ /// 閫氱煡澶囨枡浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "PREPARER")]
+ public string? Preparer { get; set; }
+
+ /// <summary>
+ /// 閫氱煡澶囨枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "PREPARE_DATE")]
+ public DateTime? PrepareDate { get; set; }
+
+ /// <summary>
+ /// 渚涘晢缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string? SuppNo { get; set; }
+
+ /// <summary>
+ /// 澶囨枡瀹屾垚鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "PREPARE_COMP_DATE")]
+ public DateTime? PrepareCompDate { get; set; }
+
+ /// <summary>
+ /// 澶囨枡瀹屾垚鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "PREPARE_COMP_FLAG")]
+ public int? PrepareCompFlag { get; set; }
+
+ /// <summary>
+ /// 璁″垝纭鏃堕棿锛堟墽琛屾棩鏈燂級
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_CONFIRMATION")]
+ public DateTime? PlanConfirmation { get; set; }
+
+ /// <summary>
+ /// 闇�姹傛潵婧�
+ /// </summary>
+ [SugarColumn(ColumnName = "Req_Src")]
+ public string? ReqSrc { get; set; }
+
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_SPLIT_SEQ")]
+ public string? SrcSplitSeq { get; set; }
+
+ /// <summary>
+ /// 1锛屾柊澧烇紱2锛屽彉鏇�
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPEA")]
+ public string? Typea { get; set; }
+}
\ No newline at end of file
diff --git a/entity/ProductionOrderSub.cs b/entity/ProductionOrderSub.cs
new file mode 100644
index 0000000..82b541a
--- /dev/null
+++ b/entity/ProductionOrderSub.cs
@@ -0,0 +1,301 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// 鐢熶骇璁㈠崟琛�(濮斿) 瀛愯〃
+/// </summary>
+[SugarTable("PRODUCTION_ORDER_SUB")]
+public class ProductionOrderSub
+{
+ /// <summary>
+ /// 榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ public Guid Guid { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_ORDER_NO")]
+ public string? WorkOrderNo { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SEQUENCE_NO")]
+ public int? SequenceNo { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_CODE")]
+ public string? MaterialCode { get; set; }
+
+ /// <summary>
+ /// 闇�棰嗙敤閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "REQUIRED_QTY")]
+ public decimal? RequiredQty { get; set; }
+
+ /// <summary>
+ /// 宸查鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUED_QTY")]
+ public decimal? IssuedQty { get; set; }
+
+ /// <summary>
+ /// 浣嶇疆鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "LOCATION_NO")]
+ public string? LocationNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLYING_ORG")]
+ public string? SupplyingOrg { get; set; }
+
+ /// <summary>
+ /// 鍙戞枡缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUING_ORG")]
+ public string? IssuingOrg { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_OWNER")]
+ public string? StockOwner { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TRACKING_NO")]
+ public string? TrackingNo { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BATCH_NO")]
+ public string? BatchNo { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string? Warehouse { get; set; }
+
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUING_METHOD")]
+ public string? IssuingMethod { get; set; }
+
+ /// <summary>
+ /// 宸ヨ壓
+ /// </summary>
+ [SugarColumn(ColumnName = "PROCESS")]
+ public string? Process { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string? Unit { get; set; }
+
+ /// <summary>
+ /// 渚涘簲绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLYING_TYPE")]
+ public string? SupplyingType { get; set; }
+
+ /// <summary>
+ /// 缁勬垚鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPOSITION_QTY")]
+ public decimal? CompositionQty { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏇挎枡
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_SUBSTITUTE")]
+ public string? IsSubstitute { get; set; }
+
+ /// <summary>
+ /// 鍒嗗瓙
+ /// </summary>
+ [SugarColumn(ColumnName = "NUMERATOR")]
+ public decimal? Numerator { get; set; }
+
+ /// <summary>
+ /// 鍒嗘瘝
+ /// </summary>
+ [SugarColumn(ColumnName = "DENOMINATOR")]
+ public decimal? Denominator { get; set; }
+
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? ErpId { get; set; }
+
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_HEADER_ID")]
+ public string? ErpHeaderId { get; set; }
+
+ /// <summary>
+ /// 鍥哄畾鎹熻��
+ /// </summary>
+ [SugarColumn(ColumnName = "FIXED_LOSS")]
+ public decimal? FixedLoss { get; set; }
+
+ /// <summary>
+ /// 鍙樺姩鎹熻�楃巼%
+ /// </summary>
+ [SugarColumn(ColumnName = "VARIABLE_LOSS_RATE")]
+ public decimal? VariableLossRate { get; set; }
+
+ /// <summary>
+ /// 瀛愰」绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SUB_ITEM_TYPE")]
+ public string? SubItemType { get; set; }
+
+ /// <summary>
+ /// 瀛愰」鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "SUB_ITEM_UNIT")]
+ public string? SubItemUnit { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_NO")]
+ public string? SalesOrderNo { get; set; }
+
+ /// <summary>
+ /// 椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鍙戞枡缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUING_ORG_2")]
+ public string? IssuingOrg2 { get; set; }
+
+ /// <summary>
+ /// 璐т富绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_TYPE")]
+ public string? OwnerType { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER")]
+ public string? Owner { get; set; }
+
+ /// <summary>
+ /// 渚涘簲缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLYING_ORG_2")]
+ public string? SupplyingOrg2 { get; set; }
+
+ /// <summary>
+ /// 鍒剁▼涓嶈壇閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "TLNUM1")]
+ public int? Tlnum1 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ枡涓嶈壇閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "TLNUM2")]
+ public int? Tlnum2 { get; set; }
+
+ /// <summary>
+ /// 鑹搧閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "TLNUM3")]
+ public int? Tlnum3 { get; set; }
+
+ /// <summary>
+ /// 琛ユ枡鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "BLNUM")]
+ public int? Blnum { get; set; }
+
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍒嗗綍鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_PRODUCTION_ENTRY_CODE")]
+ public string? ErpProductionEntryCode { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT2")]
+ public string? Unit2 { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍙戞崯鑰�
+ /// </summary>
+ [SugarColumn(ColumnName = "FISGETSCRAP")]
+ public string? Fisgetscrap { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏抽敭浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "FISKEYCOMPONENT")]
+ public string? Fiskeycomponent { get; set; }
+
+ /// <summary>
+ /// 鎷ㄥ嚭缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "FSRCTRANSORGID")]
+ public string? Fsrctransorgid { get; set; }
+
+ /// <summary>
+ /// 鎷ㄥ嚭浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "FSRCTRANSSTOCKID")]
+ public string? Fsrctransstockid { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTOCKSTATUSID")]
+ public string? Fstockstatusid { get; set; }
+
+ /// <summary>
+ /// 闇�姹傛棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNEEDDATE")]
+ public DateTime? Fneeddate { get; set; }
+
+ /// <summary>
+ /// 棰勭暀绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FRESERVETYPE")]
+ public string? Freservetype { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ枡娓呭崟澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "FMEMO")]
+ public string? Fmemo { get; set; }
+
+ /// <summary>
+ /// A锛屽垱寤� B锛屽鏍镐腑 C锛屽凡瀹℃牳 D锛岄噸鏂板鏍� Z锛屾殏瀛�
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPEB")]
+ public string? Typeb { get; set; }
+}
\ No newline at end of file
diff --git a/entity/WwGd.cs b/entity/WwGd.cs
new file mode 100644
index 0000000..a96a5c7
--- /dev/null
+++ b/entity/WwGd.cs
@@ -0,0 +1,188 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("WW_GD")]
+public class WwGd
+{
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// PRODUCTION_ORDER_SUB涓殑ERP_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "erpid")]
+ public int? Erpid { get; set; }
+
+ /// <summary>
+ /// eid 鏄疨RODUCTION_ORDER鐨別rp_id
+ /// </summary>
+ [SugarColumn(ColumnName = "eid")]
+ public int? Eid { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa001")]
+ public string? Daa001 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [SugarColumn(ColumnName = "daa003")]
+ public int? Daa003 { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa008")]
+ public int? Daa008 { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅id
+ /// </summary>
+ [SugarColumn(ColumnName = "unit")]
+ public int? Unit { get; set; }
+
+ /// <summary>
+ /// 濮斿璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa014")]
+ public string? Daa014 { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa011")]
+ public int? Daa011 { get; set; }
+
+ /// <summary>
+ /// 棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_start_prod")]
+ public DateTime? MesStartProd { get; set; }
+
+ /// <summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_end_prod")]
+ public DateTime? MesEndProd { get; set; }
+
+ /// <summary>
+ /// 鏄惁澶囨枡
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "bl_state")]
+ public int? BlState { get; set; }
+
+ /// <summary>
+ /// 澶囨枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "bl_time")]
+ public DateTime? BlTime { get; set; }
+
+ /// <summary>
+ /// 澶囨枡浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "bl_user")]
+ public string? BlUser { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "daa018")]
+ public string? Daa018 { get; set; }
+
+ /// <summary>
+ /// 瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "wg_time")]
+ public DateTime? WgTime { get; set; }
+
+ /// <summary>
+ /// 瀹屽伐浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "wg_user")]
+ public string? WgUser { get; set; }
+
+ /// <summary>
+ /// 鎺掍骇瀹℃牳
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "pc_sh")]
+ public long? PcSh { get; set; }
+
+ /// <summary>
+ /// 鍒嗛挓浜ц兘
+ /// </summary>
+ [SugarColumn(ColumnName = "mi_cn")]
+ public int? MiCn { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_order")]
+ public int? ScheduleOrder { get; set; }
+
+ /// <summary>
+ /// 鎺掍骇鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "pc_time")]
+ public DateTime? PcTime { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "daa013")]
+ public int? Daa013 { get; set; }
+
+ /// <summary>
+ /// 棰嗘枡閮ㄩ棬id
+ /// </summary>
+ [SugarColumn(ColumnName = "depart_id")]
+ public int? DepartId { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "remark")]
+ public string? Remark { get; set; }
+
+ /// <summary>
+ /// 鎺掍骇guid
+ /// </summary>
+ [SugarColumn(ColumnName = "pcGuid")]
+ public Guid? PcGuid { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曠殑guid
+ /// </summary>
+ [SugarColumn(ColumnName = "rwdGuid")]
+ public Guid? RwdGuid { get; set; }
+
+ /// <summary>
+ /// 鎺掍骇浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "PC_USER")]
+ public string? PcUser { get; set; }
+
+ /// <summary>
+ /// 澶囨枡鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "BL_STATUS")]
+ public string? BlStatus { get; set; }
+
+ /// <summary>
+ /// 寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "KG_TIME")]
+ public DateTime? KgTime { get; set; }
+
+ /// <summary>
+ /// 寮�宸ヤ汉
+ /// </summary>
+ [SugarColumn(ColumnName = "KG_USER")]
+ public string? KgUser { get; set; }
+}
\ No newline at end of file
diff --git a/entity/WwGdDetail.cs b/entity/WwGdDetail.cs
new file mode 100644
index 0000000..5410d89
--- /dev/null
+++ b/entity/WwGdDetail.cs
@@ -0,0 +1,138 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("WW_GD_DETAIL")]
+public class WwGdDetail
+{
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟涓婚敭
+ /// </summary>
+ [SugarColumn(ColumnName = "pid")]
+ public Guid? Pid { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "erpid")]
+ public int? Erpid { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "eid")]
+ public int? Eid { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡id
+ /// </summary>
+ [SugarColumn(ColumnName = "dab003")]
+ public int? Dab003 { get; set; }
+
+ /// <summary>
+ /// 闇�棰�
+ /// </summary>
+ [SugarColumn(ColumnName = "dab006")]
+ public int? Dab006 { get; set; }
+
+ /// <summary>
+ /// 宸查
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "dab007")]
+ public int? Dab007 { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "dab009")]
+ public int? Dab009 { get; set; }
+
+ /// <summary>
+ /// 瀹為鐢ㄩ噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "dab020")]
+ public int? Dab020 { get; set; }
+
+ /// <summary>
+ /// 琛ラ鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "dab021")]
+ public int? Dab021 { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欐暟閲�
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "dab022")]
+ public int? Dab022 { get; set; }
+
+ /// <summary>
+ /// 瓒呴鏁伴噺
+ /// 榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "dab023")]
+ public int? Dab023 { get; set; }
+
+ /// <summary>
+ /// 鑹搧閫�鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "lp_tl")]
+ public int? LpTl { get; set; }
+
+ /// <summary>
+ /// 鏉ユ枡涓嶈壇
+ /// </summary>
+ [SugarColumn(ColumnName = "ll_bl")]
+ public int? LlBl { get; set; }
+
+ /// <summary>
+ /// 浣滀笟涓嶈壇
+ /// </summary>
+ [SugarColumn(ColumnName = "zy_bl")]
+ public int? ZyBl { get; set; }
+
+ /// <summary>
+ /// 浠撳簱id
+ /// </summary>
+ [SugarColumn(ColumnName = "dab017")]
+ public string? Dab017 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "dab018")]
+ public string? Dab018 { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "dab001")]
+ public string? Dab001 { get; set; }
+
+ /// <summary>
+ /// 缁勬垚鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "dab012")]
+ public int? Dab012 { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "dab002")]
+ public int? Dab002 { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public decimal? wNum { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemNo { get; set; }
+}
\ No newline at end of file
diff --git a/service/Warehouse/InventoryManager.cs b/service/Warehouse/InventoryManager.cs
index 4107f50..a5fc989 100644
--- a/service/Warehouse/InventoryManager.cs
+++ b/service/Warehouse/InventoryManager.cs
@@ -16,9 +16,7 @@
// 妫�鏌ュ簱浣嶄唬鐮佹槸鍚︿负绌�
if (string.IsNullOrEmpty(p_section_code))
- {
throw new Exception("002[璇锋壂搴撲綅鏉＄爜锛�");
- }
// 鏌ヨ搴撳尯搴撲綅淇℃伅
var depotSection = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
@@ -32,9 +30,7 @@
// 濡傛灉搴撲綅浠ｇ爜涓嶅瓨鍦紝鍒欒繑鍥為敊璇俊鎭�
if (depotSection == null)
- {
throw new Exception("搴撲綅缂栫爜 " + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
// 杩斿洖鎴愬姛淇℃伅
return "浠撳簱锛�" + depotSection.DepotName + " 搴撲綅锛�" +
@@ -52,9 +48,7 @@
// 妫�鏌ュ簱浣嶄唬鐮佹槸鍚︿负绌�
if (string.IsNullOrEmpty(p_section_code))
- {
throw new Exception("002[璇锋壂搴撲綅鏉＄爜锛�");
- }
// 鏌ヨ搴撳尯搴撲綅淇℃伅
var depotSection = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
@@ -68,9 +62,7 @@
// 濡傛灉搴撲綅浠ｇ爜涓嶅瓨鍦紝鍒欒繑鍥為敊璇俊鎭�
if (depotSection == null)
- {
throw new Exception("搴撲綅缂栫爜 " + p_section_code + " 涓嶅瓨鍦紝璇风‘璁わ紒");
- }
// 妫�鏌ユ槸鍚﹀凡缁忔敹璐�
var c_num = Db.Queryable<MesInvItemIns, MesInvItemInCDetails>((a, b) =>
@@ -80,20 +72,14 @@
.Where((a, b) => b.ItemBarcode == p_item_barcode)
.Count();
- if (c_num > 0)
- {
- throw new Exception("002[鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
- }
+ if (c_num > 0) throw new Exception("002[鏉＄爜閲嶅鎵弿锛岃鏍稿锛�");
// 鏌ヨ鏉＄爜淇℃伅
c_num = Db.Queryable<MesInvItemStocks>()
.Where(t => t.ItemBarcode == p_item_barcode)
.Count();
- if (c_num > 0)
- {
- throw new Exception("002[鏉＄爜宸插湪搴撳瓨涓紝璇锋牳瀵癸紒");
- }
+ if (c_num > 0) throw new Exception("002[鏉＄爜宸插湪搴撳瓨涓紝璇锋牳瀵癸紒");
// 鏌ヨ鏉＄爜璇︾粏淇℃伅
var c_mes_inv_item_barcodes = Db.Queryable<MesInvItemBarcodes>()
@@ -101,14 +87,10 @@
.Single();
if (c_mes_inv_item_barcodes == null)
- {
throw new Exception("002[鏉＄爜涓嶅瓨鍦紝璇锋牳瀵癸紒");
- }
if (c_mes_inv_item_barcodes.ComeFlg != 0)
- {
throw new Exception("002[鏉＄爜涓嶆槸鏈熷垵鏉＄爜锛屾棤娉曠敤鏈熷垵鍏ュ簱锛�");
- }
UseTransaction(db =>
{
@@ -144,7 +126,12 @@
BillNo = billNo,
SuppId = c_mes_inv_item_barcodes.SuppId,
SuppNo = c_mes_inv_item_barcodes.SuppNo,
- UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag == null ? null : c_mes_inv_item_barcodes.UrgentFlag.Value ? "1" : "0",
+ UrgentFlag = c_mes_inv_item_barcodes.UrgentFlag == null
+ ?
+ null
+ : c_mes_inv_item_barcodes.UrgentFlag.Value
+ ? "1"
+ : "0",
CbillNo = c_mes_inv_item_barcodes.BillNo,
Fstatus = 0
};
@@ -226,7 +213,9 @@
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 == null ? null : (byte)(c_mes_inv_item_barcodes.EpFlag.Value ? 1 : 0),
+ EpFlag = c_mes_inv_item_barcodes.EpFlag == null
+ ? null
+ : (byte)(c_mes_inv_item_barcodes.EpFlag.Value ? 1 : 0),
DepotsCode = depotSection.DepotCode,
DepotsId = depotSection.DepotId,
DepotSectionsCode = p_section_code,
@@ -245,7 +234,7 @@
});
var mesItems = Db.Queryable<MesItems>()
- .Where(s=>s.Id == c_mes_inv_item_barcodes.ItemId)
+ .Where(s => s.Id == c_mes_inv_item_barcodes.ItemId)
.First();
query.itemNo = mesItems.ItemNo;
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
similarity index 99%
rename from service/Warehouse/WomdaaManager.cs
rename to service/Wom/WomdaaManager.cs
index 3174d1a..8c92aee 100644
--- a/service/Warehouse/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -6,7 +6,7 @@
using NewPdaSqlServer.entity;
using SqlSugar;
-namespace NewPdaSqlServer.service.Warehouse;
+namespace NewPdaSqlServer.service.Wom;
public class WomdaaManager : Repository<Womdaa>
{
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Wom/WwGdManager.cs
similarity index 82%
copy from service/Warehouse/WomdaaManager.cs
copy to service/Wom/WwGdManager.cs
index 3174d1a..103187c 100644
--- a/service/Warehouse/WomdaaManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -6,30 +6,10 @@
using NewPdaSqlServer.entity;
using SqlSugar;
-namespace NewPdaSqlServer.service.Warehouse;
+namespace NewPdaSqlServer.service.Wom;
-public class WomdaaManager : Repository<Womdaa>
+public class WwGdManager : Repository<WwGd>
{
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
-
- //鑾峰彇宸ュ崟鍙�
- public List<string> GetProductionPickDaa001(WarehouseQuery query)
- {
- var sql =
- "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID FROM WOMDAB WHERE DAB006 > DAB007 GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
- query.daa001 +
- "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
-
- return Db.Ado.SqlQuery<string>(sql);
- }
-
- //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
- public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
- {
- return getDaa001(query);
- }
-
public ProductionPickDto ScanCode(WarehouseQuery query)
{
var _strMsg = "";
@@ -40,7 +20,7 @@
if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
- using (var cmd = new SqlCommand("[prc_pda_SCLL]", conn))
+ using (var cmd = new SqlCommand("[prc_pda_WWLL]", conn))
{
try
{
@@ -107,7 +87,7 @@
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_WWLL_CF]", conn))
{
try
{
@@ -154,34 +134,39 @@
}
}
+ public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+ {
+ return getDaa001(query);
+ }
+
private ProductionPickDto getDaa001(WarehouseQuery query)
{
if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
- var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+ var womdaa = Db.Queryable<WwGd, MesItems>((a, i) =>
new JoinQueryInfos(JoinType.Left,
- a.Daa002 == i.ItemId.ToString()))
+ a.Daa003 == i.ItemId))
.Where((a, i) => a.Daa001 == query.daa001)
.Select((a, i) => new
{
- a.Daa001, a.CaaGuid
+ a.Daa001, a.Eid
}).First();
if (womdaa?.Daa001 == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
- var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
+ var womdabs = Db.Queryable<WwGd, WwGdDetail, MesItems, Womcab>(
(a, b, c, d) =>
new JoinQueryInfos(
JoinType.Left,
- a.Guid == b.DaaGuid,
+ a.Id == b.Pid,
JoinType.Inner,
- c.Id.ToString() ==
+ c.Id ==
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
+ .Select((a, b, c, d) => new WwGdDetail
{
Pid = b.Pid,
Dab003 = b.Dab003,
@@ -215,15 +200,16 @@
})
.ToList();
- var womcaa = Db.Queryable<Womcaa>().Where(s => s.Guid == womdaa.CaaGuid)
+ var womcaa = Db.Queryable<ProductionOrder>()
+ .Where(s => s.ErpId == womdaa.Eid.ToString())
.First();
var dto = new ProductionPickDto
{
daa001 = womdaa.Daa001,
- PlanNo = womcaa.Caa020,
- totals = womdabs,
- daisao = list,
+ PlanNo = womcaa.ErpProductionOrderNo,
+ totals1 = womdabs,
+ daisao1 = list,
yisao = mesInvItemOutCDetailsList
};
--
Gitblit v1.9.3