啊鑫
2024-08-10 fd6838164120ff30f76780f6478dcb0e04983ee9
采购退料,优化代码
已添加6个文件
已修改37个文件
1486 ■■■■■ 文件已修改
MES.Service/DB/OracleSQLHelper.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/DB/SqlSugarHelper.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/service/OutItemDto.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemArn.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemBarcodes.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemInCItems.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemOutCDetails.cs 242 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemStocks.cs 201 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesQaItemsDetect01.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MessageCenter.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Purdhb.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/Purdka.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/GetErpParametersServer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemOutsManager.cs 349 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemStocksManager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/WomcaaManager.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/util/AppsettingsUtility.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs 145 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs 162 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Debug/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/appsettings.json 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.dll 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.exe 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/bin/Release/net8.0/publish/appsettings.json 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/DB/OracleSQLHelper.cs
@@ -9,10 +9,11 @@
/// </summary>
public class OracleSQLHelper
{
    public readonly string ConnectionString =AppsettingsUtility.Settings.DataBaseConn;
    private readonly string _connectionString;
    public readonly string ConnectionString =
        AppsettingsUtility.Settings.DataBaseConn;
    //public static string connectionString = "Data Source = 192.168.1.19; Persist Security Info=True;User ID = abtdev; Password=abt_dev";
    public string connectionString =
        "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"; // è¿™é‡Œæ›¿æ¢æˆä½ çš„实际连接字符串
MES.Service/DB/SqlSugarHelper.cs
@@ -5,7 +5,8 @@
public class SqlSugarHelper
{
    private static readonly string _connectionString =AppsettingsUtility.Settings.DataBaseConn; // è¿™é‡Œæ›¿æ¢æˆä½ çš„实际连接字符串
    private static readonly string _connectionString =
        AppsettingsUtility.Settings.DataBaseConn; // è¿™é‡Œæ›¿æ¢æˆä½ çš„实际连接字符串
    public static SqlSugarClient GetInstance()
    {
MES.Service/Dto/service/OutItemDto.cs
@@ -4,7 +4,14 @@
public class OutItemDto
{
    public MesInvItemOuts Form { get; set; }
    public List<MesInvItemOutItems> SaveItems { get; set; }
    public List<MESInvItemOutItems> SelectItems { get; set; }
    public MesInvItemOuts? Form { get; set; }
    public List<MesInvItemOutItems>? SaveItems { get; set; }
    public List<MESInvItemOutItems>? SelectItems { get; set; }
    public string? ItemNo { get; set; }
    public decimal? Quantity { get; set; }
    public List<InventoryItem>? SumItem { get; set; }
}
MES.Service/Modes/MesInvItemArn.cs
MES.Service/Modes/MesInvItemBarcodes.cs
MES.Service/Modes/MesInvItemInCItems.cs
MES.Service/Modes/MesInvItemOutCDetails.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,242 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     ç‰©æ–™å‡ºåº“条码明细
/// </summary>
[SugarTable("MES_INV_ITEM_OUT_C_DETAILS")]
public class MesInvItemOutCDetails
{
    /// <summary>
    ///     SEQ_INV_ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
    ///     å‡ºåº“单id
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_OUT_ID")]
    public decimal? ItemOutId { get; set; }
    /// <summary>
    ///     ç‰©æ–™æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string ItemBarcode { get; set; }
    /// <summary>
    ///     å®¢æˆ·ç‰©æ–™ç¼–码(无条码手工录入,有条码为冗余字段)
    /// </summary>
    [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string CItemCode { get; set; }
    /// <summary>
    ///     æœ¬å¸ç‰©æ–™ç¼–码(无条码手工录入,有条码为冗余字段)
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }
    /// <summary>
    ///     åŽ‚å®¶æ‰¹æ¬¡
    /// </summary>
    [SugarColumn(ColumnName = "LOT_NO")]
    public string LotNo { get; set; }
    /// <summary>
    ///     æ•°é‡ï¼ˆæ— æ¡ç æ‰‹å·¥å½•入,有条码为冗余字段)
    /// </summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }
    /// <summary>
    ///     æŒªæ–™æ ‡å¿—(0-否,1-是)
    /// </summary>
    [SugarColumn(ColumnName = "FORCE_OUT_FLAG")]
    public decimal? ForceOutFlag { 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 = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }
    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }
    /// <summary>
    ///     å®¢æˆ·ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string CustNo { get; set; }
    /// <summary>
    ///     ä»“库编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string DepotCode { get; set; }
    /// <summary>
    ///     è´§ä½ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
    public string DepotSectionCode { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string Remark { get; set; }
    /// <summary>
    ///     å…æ£€æ ‡è¯†(0-否,1-是)
    /// </summary>
    [SugarColumn(ColumnName = "FORCE_EXEMPT_FLAG")]
    public short? ForceExemptFlag { get; set; }
    /// <summary>
    ///     æŠ•料批次
    /// </summary>
    [SugarColumn(ColumnName = "PRD_LOT_NO")]
    public string PrdLotNo { get; set; }
    /// <summary>
    ///     æ˜¯å¦åšæŽ¥æ”¶æ£€æŸ¥
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_STATUS")]
    public short? CheckStatus { get; set; }
    /// <summary>
    ///     å·¥åŽ‚ç¼–å·
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
    /// <summary>
    ///     å…¬å¸ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string Company { get; set; }
    /// <summary>
    ///     åŽŸç”Ÿäº§å·¥å•
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NOY")]
    public string TaskNoy { get; set; }
    /// <summary>
    ///     ç®±å·
    /// </summary>
    [SugarColumn(ColumnName = "BOX_NO")]
    public string BoxNo { get; set; }
    /// <summary>
    ///     åŒ…装批次
    /// </summary>
    [SugarColumn(ColumnName = "TASK_PACK")]
    public string TaskPack { get; set; }
    /// <summary>
    ///     å¡æ¿
    /// </summary>
    [SugarColumn(ColumnName = "KB_NO")]
    public string KbNo { get; set; }
    /// <summary>
    ///     äº§å“æœºåž‹
    /// </summary>
    [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string BoardStyle { get; set; }
    /// <summary>
    ///     ç”Ÿäº§å·¥å•
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }
    /// <summary>
    ///     ä»»åŠ¡å•å·
    /// </summary>
    [SugarColumn(ColumnName = "WORK_NO")]
    public string WorkNo { get; set; }
    /// <summary>
    ///     ä»»åŠ¡å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "WORK_LINE")]
    public decimal? WorkLine { get; set; }
    /// <summary>
    ///     ä¾›åº”商编号
    /// </summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { get; set; }
    /// <summary>
    ///     é¢†æ–™å•号/委外订单
    /// </summary>
    [SugarColumn(ColumnName = "PBILL_NO")]
    public string PbillNo { get; set; }
    /// <summary>
    ///     æŽ¥æ”¶æ ‡è¯†/1已接收
    /// </summary>
    [SugarColumn(ColumnName = "RECEIVE")]
    public decimal? Receive { get; set; }
    /// <summary>
    ///     æŽ¥æ”¶æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "RTIME")]
    public DateTime? Rtime { get; set; }
    /// <summary>
    ///     æŽ¥æ”¶äºº
    /// </summary>
    [SugarColumn(ColumnName = "RCV_BY")]
    public string RcvBy { get; set; }
    /// <summary>
    ///     æŽ¥æ”¶è½¦é—´
    /// </summary>
    [SugarColumn(ColumnName = "RCV_PART")]
    public string RcvPart { get; set; }
    /// <summary>
    ///     å…¥åº“单号
    /// </summary>
    [SugarColumn(ColumnName = "RK_NO")]
    public string RkNo { get; set; }
    /// <summary>
    ///     é‡‡è´­è®¢å•id
    /// </summary>
    [SugarColumn(ColumnName = "EBELN_K3ID")]
    public decimal? EbelnK3id { get; set; }
    /// <summary>
    ///     é‡‡è´­è®¢å•行id
    /// </summary>
    [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { 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; }
    [SugarColumn(IsIgnore = true)] public string? Unit { get; set; }
}
MES.Service/Modes/MesInvItemStocks.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,201 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     ç‰©æ–™åº“存表
/// </summary>
[SugarTable("MES_INV_ITEM_STOCKS")]
public class MesInvItemStocks
{
 /// <summary>
 /// </summary>
 [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
 /// <summary>
 ///     ç”Ÿäº§è®¢å•
 /// </summary>
 [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }
 /// <summary>
 ///     ç‰©æ–™æ¡ç 
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string ItemBarcode { get; set; }
 /// <summary>
 ///     å®¢æˆ·ç‰©æ–™ç¼–码(无条码手工录入,有条码为冗余字段)
 /// </summary>
 [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string CItemCode { get; set; }
 /// <summary>
 ///     æœ¬å¸ç‰©æ–™ç¼–码(无条码手工录入,有条码为冗余字段)
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }
 /// <summary>
 ///     å­åº“id
 /// </summary>
 [SugarColumn(ColumnName = "DEPOTS_ID")]
    public decimal? DepotsId { get; set; }
 /// <summary>
 ///     è´§ä½id
 /// </summary>
 [SugarColumn(ColumnName = "DEPOT_SECTIONS_ID")]
    public decimal? DepotSectionsId { get; set; }
 /// <summary>
 ///     åŽ‚å®¶æ‰¹æ¬¡
 /// </summary>
 [SugarColumn(ColumnName = "LOT_NO")]
    public string LotNo { get; set; }
 /// <summary>
 ///     æ•°é‡
 /// </summary>
 [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }
 /// <summary>
 ///     çŽ¯ä¿æ ‡å¿—ï¼ˆæ— æ¡ç æ‰‹å·¥å½•å…¥ï¼Œæœ‰æ¡ç ä¸ºå†—ä½™å­—æ®µï¼‰(0-否,1-是)
 /// </summary>
 [SugarColumn(ColumnName = "EP_FLAG")]
    public short? EpFlag { get; set; }
 /// <summary>
 ///     å®¢æˆ·ç¼–码
 /// </summary>
 [SugarColumn(ColumnName = "CUSTOMER_NO")]
    public string CustomerNo { get; set; }
 /// <summary>
 ///     é‡é‡
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_WT")]
    public decimal? ItemWt { get; set; }
 /// <summary>
 ///     å­åº“CODE
 /// </summary>
 [SugarColumn(ColumnName = "DEPOTS_CODE")]
    public string DepotsCode { get; set; }
 /// <summary>
 ///     è´§ä½CODE
 /// </summary>
 [SugarColumn(ColumnName = "DEPOT_SECTIONS_CODE")]
    public string DepotSectionsCode { get; set; }
 /// <summary>
 ///     æ£€éªŒæ—¥æœŸ
 /// </summary>
 [SugarColumn(ColumnName = "CHECK_DATE")]
    public DateTime? CheckDate { get; set; }
 /// <summary>
 ///     0 ç‰©æ–™ 1 åŠæˆå“ 2 æˆå“
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_TYPE")]
    public short? ItemType { get; set; }
 /// <summary>
 ///     å…¥åº“日期
 /// </summary>
 [SugarColumn(ColumnName = "INDEP_DATE")]
    public DateTime? IndepDate { get; set; }
 /// <summary>
 ///     å·¥åŽ‚ç¼–å·
 /// </summary>
 [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
 /// <summary>
 ///     å…¬å¸ç¼–号
 /// </summary>
 [SugarColumn(ColumnName = "COMPANY")]
    public string Company { get; set; }
 /// <summary>
 ///     è´¨æ£€çŠ¶æ€
 /// </summary>
 [SugarColumn(ColumnName = "IQC_STATUS")]
    public string IqcStatus { get; set; }
 /// <summary>
 ///     å°è½¦æ¡ç 
 /// </summary>
 [SugarColumn(ColumnName = "FCAR")]
    public string Fcar { get; set; }
 /// <summary>
 ///     å†»ç»“提交重检,0:冻结未提交重检,1:冻结并提交重检
 /// </summary>
 [SugarColumn(ColumnName = "VISABLE_SUBMIT")]
    public short? VisableSubmit { get; set; }
 /// <summary>
 ///     æäº¤é‡æ£€äºº
 /// </summary>
 [SugarColumn(ColumnName = "VISABLE_SUBMIT_BY")]
    public string VisableSubmitBy { get; set; }
 /// <summary>
 ///     æäº¤é‡æ£€æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "VISABLE_SUBMIT_DATE")]
    public DateTime? VisableSubmitDate { get; set; }
 /// <summary>
 ///     äº§å“åž‹å·
 /// </summary>
 [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string BoardStyle { get; set; }
 /// <summary>
 ///     ä»»åŠ¡å•å·
 /// </summary>
 [SugarColumn(ColumnName = "WORK_NO")]
    public string WorkNo { get; set; }
 /// <summary>
 ///     ä»»åŠ¡å•è¡Œå·
 /// </summary>
 [SugarColumn(ColumnName = "WORK_LINE")]
    public decimal? WorkLine { get; set; }
 /// <summary>
 ///     ä¾›åº”商
 /// </summary>
 [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { get; set; }
 /// <summary>
 ///     ç”Ÿäº§çº¿
 /// </summary>
 [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }
 /// <summary>
 ///     åŠæˆå“å…¥åº“单号
 /// </summary>
 [SugarColumn(ColumnName = "BILL_NO")]
    public string BillNo { get; set; }
 /// <summary>
 ///     é‡‡è´­è®¢å•id
 /// </summary>
 [SugarColumn(ColumnName = "EBELN_K3ID")]
    public decimal? EbelnK3id { get; set; }
 /// <summary>
 ///     é‡‡è´­è®¢å•行id
 /// </summary>
 [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }
}
MES.Service/Modes/MesQaItemsDetect01.cs
MES.Service/Modes/MessageCenter.cs
@@ -111,6 +111,13 @@
    [SugarColumn(ColumnName = "Content_Type")]
    public string? ContentType { get; set; }
    //
    /// <summary>
    ///     æ˜¯å¦æ˜¯æ¶ˆæ¯  0为推送失败 1为消息,默认为0
    /// </summary>
    [SugarColumn(ColumnName = "is_message")]
    public short? IsMessage { get; set; }
    [SugarColumn(IsIgnore = true)] public int? isShow { get; set; }
MES.Service/Modes/Purdhb.cs
MES.Service/Modes/Purdka.cs
MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MES.Service/service/GetErpParametersServer.cs
@@ -54,6 +54,8 @@
                centers.Add(messageCenter);
                break;
            default:
                throw new Exception("无法识别TableName类型");
        }
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -1,10 +1,8 @@
using System.Data;
using MES.Service.DB;
using MES.Service.Dto.@base;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using SqlSugar;
using DbType = System.Data.DbType;
@@ -49,7 +47,7 @@
                base.GetSingle(it => it.ItemBarcode == entity.barcode);
            if (mesInvItemInCDetails == null)
                throw new Exception("出现异常"); // æŠ›å‡ºå¼‚常以供前台处理
                throw new Exception("物料入库条码明细不存在"); // æŠ›å‡ºå¼‚常以供前台处理
            var itemInId = mesInvItemInCDetails.ItemInId;
            entity.id = itemInId;
@@ -162,7 +160,7 @@
            title = "采购入库单" + query.billNo + "反审核";
        }
        string ErpUrl = AppsettingsUtility.Settings.TestErpUrl;
        var ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
        var message = new MessageCenter
        {
            TableName = tableName,
@@ -177,6 +175,7 @@
            Method = "POST",
            Seq = 1,
            Data = erpParameters,
            IsMessage = 0,
            ContentType = "application/x-www-form-urlencoded"
        };
        return message;
MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
using MES.Service.DB;
using MES.Service.Modes;
using SqlSugar;
namespace MES.Service.service.Warehouse;
public class MesInvItemOutCDetailsManager : Repository<MesInvItemOutCDetails>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvItemOutCDetailsManager.cs
    #region æ•™å­¦æ–¹æ³•
    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求,业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    {
        /*********查询*********/
        var data1 = base.GetById(1); //根据ID查询
        var data2 = base.GetList(); //查询所有
        var data3 = base.GetList(it => 1 == 1); //根据条件查询
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // åˆ†é¡µæŸ¥è¯¢
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount); //返回总数
        var data6 =
            base.GetPageList(it => 1 == 1, p,
                it => SqlFunc.GetRandom()); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount); //返回总数
        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel
        {
            FieldName = typeof(MesInvItemOutCDetails).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new MesInvItemOutCDetails(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new MesInvItemOutCDetails(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new MesInvItemOutCDetails() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new MesInvItemOutCDetails(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
    }
    #endregion
}
MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -1,7 +1,10 @@
using MES.Service.DB;
using System.Data;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
using DbType = System.Data.DbType;
namespace MES.Service.service.Warehouse;
@@ -10,16 +13,190 @@
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvItemOutsManager.cs
    public bool ScanCode(WarehouseQuery query)
    {
        decimal billTypeId = 200;
        decimal transactionNo = 203;
        var count = Db.Queryable<MesInvItemOutCDetails>()
            .Where(a =>
                a.ItemBarcode == query.barcode && a.TaskNo == query.billNo)
            .Count();
        if (count > 0) throw new Exception("条码重复扫描,请核对!");
        //验证条码
        var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
            .Where(a => a.ItemBarcode == query.barcode
                        && a.Quantity > 0).Single();
        if (mesInvItemStocks == null)
            throw new Exception(query.barcode + "库存中无此条码,请核对!");
        //验证出库单mes_inv_item_outs
        var mesInvItemOuts = Db.Queryable<MesInvItemOuts>()
            .Where(d => d.ItemOutNo == query.billNo
                        && d.BillTypeId == billTypeId &&
                        d.TransactionNo == transactionNo).Single();
        //出库单的校验
        if (mesInvItemOuts == null)
            throw new Exception("出库单  " + query.billNo + " ä¸å­˜åœ¨ï¼Œè¯·ç¡®è®¤ï¼");
        //未审核的不允许继续
        if (mesInvItemOuts.Status == null || mesInvItemOuts.Status == 0)
            throw new Exception("出库单  " + query.billNo + "未审核");
        //已推送的不允许继续
        if (mesInvItemOuts.Nflag == 1)
            throw new Exception("出库单  " + query.billNo + "已经推送,无法重复推送");
        var depotCodeOut = mesInvItemOuts.DepotCode ?? "0";
        var depotsCodeStock = mesInvItemStocks.DepotsCode ?? "0";
        if (!depotCodeOut.Equals(depotsCodeStock))
        {
            // åˆ›å»ºé”™è¯¯æ¶ˆæ¯
            var errorMessage =
                $"002[条码仓库{depotsCodeStock}与申请仓库{depotCodeOut}不一致,请核对!";
            throw new Exception(errorMessage);
        }
        var StocksNum = mesInvItemStocks.Quantity;
        var sql = string.Format(
            @"select nvl(SUM(S.QUANTITY),0) - nvl(SUM(S.TL_QTY),0)
                  from MES_INV_ITEM_OUT_ITEMS S
                  LEFT JOIN mes_inv_item_outs d
                    ON S.ITEM_OUT_ID = D.ID
                 where d.item_out_no = '{0}'
                   and d.bill_type_id = {1}
                   and d.transaction_no = {2}
                   AND S.item_no = '{3}'
                   and nvl(d.status, 0) = 1
                   and nvl(d.nflag, 0) = 0", query.billNo, billTypeId,
            transactionNo,
            mesInvItemStocks.ItemNo);
        var cqty = Db.Ado.SqlQuerySingle<decimal>(sql);
        if (cqty == null)
            throw new Exception("物料" + mesInvItemStocks.ItemNo +
                                "的辅助属性与条码不一致!请检查");
        if (cqty < StocksNum) throw new Exception("请确认发料数量");
        //调用存储过程
        try
        {
            // å®šä¹‰è¾“出参数
            var outputResult = new SugarParameter("C_RESULT", null,
                DbType.Int32, ParameterDirection.Output,
                4000);
            var outputMessage = new SugarParameter("MSG", null, DbType.String,
                ParameterDirection.Output, 4000);
            // å®šä¹‰è¾“入参数
            var parameters = new List<SugarParameter>
            {
                new("p_item_barcode", query.barcode,
                    DbType.String, ParameterDirection.Input),
                new("p_bill_no", query.billNo, DbType.String,
                    ParameterDirection.Input),
                new("pi_factory", "1000", DbType.String,
                    ParameterDirection.Input),
                new("pi_company", "1000", DbType.String,
                    ParameterDirection.Input),
                new("c_user", query.userName, DbType.String,
                    ParameterDirection.Input),
                outputResult,
                outputMessage
            };
            // ä½¿ç”¨ SqlSugar æ‰§è¡Œå­˜å‚¨è¿‡ç¨‹
            Db.Ado.ExecuteCommand(
                "BEGIN MES_CG_UPDATE_BARCODES(:p_item_barcode, :p_bill_no, :pi_factory, :pi_company, :c_user, :C_RESULT, :MSG); END;",
                parameters.ToArray());
            // èŽ·å–è¾“å‡ºå‚æ•°çš„å€¼
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();
            if ("1".Equals(resultValue)) throw new Exception("条码扣除失败");
        }
        catch (Exception ex)
        {
            throw new Exception(ex.Message);
        }
        // å˜é‡ç”¨äºŽä¿å­˜æŸ¥è¯¢ç»“æžœ
        decimal? C_SQ_QTY = 0;
        decimal? C_OK_QTY = 0;
        var c_result = string.Empty;
        var C_COUNT = 0;
        sql = string.Format(@"
                SELECT SUM(C.QUANTITY) AS SQ_QTY, SUM(D.QUANTITY_OK) AS OK_QTY
                FROM MES_INV_ITEM_OUT_ITEMS C
                LEFT JOIN (
                    SELECT ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
                    FROM MES_INV_ITEM_OUT_C_DETAILS
                    GROUP BY ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO
                ) D
                ON D.ITEM_OUT_ID = C.ITEM_OUT_ID
                AND D.ITEM_NO = C.ITEM_NO
                AND D.RK_NO = C.RK_NO
                AND NVL(C.PBILL_NO, '0') = NVL(D.PBILL_NO, '0')
                WHERE C.ITEM_OUT_ID = {0}", mesInvItemOuts.Id);
        var queryResult = Db.Ado.SqlQuerySingle<dynamic>(sql);
        C_SQ_QTY = queryResult?.SQ_QTY;
        C_OK_QTY = queryResult?.OK_QTY;
        // åˆ¤æ–­é€»è¾‘
        if (C_SQ_QTY < C_OK_QTY) throw new Exception("扫描数量超过申请数量,请重新扫描!");
        if (C_SQ_QTY == C_OK_QTY) return true;
        return false;
    }
    public bool Audit(WarehouseQuery query)
    {
        // å®¡æ ¸å‰æ ¡éªŒ
        Validate(query);
        query.status = 1;
        //审核
        return Update(query);
    }
    public bool SetNFlag(WarehouseQuery query)
    {
        return Db.Updateable<MesInvItemOuts>()
            .SetColumns(s => s.Status == 1)
            .SetColumns(s => s.CheckUser == query.userName)
            .SetColumns(s => s.Nflag == 1)
            .Where(s => s.ItemOutNo == query.billNo)
            .ExecuteCommand() > 0;
    }
    public bool DeApprove(WarehouseQuery query)
    {
        query.date = null;
        query.status = 0;
        return Update(query);
    }
    private bool Update(WarehouseQuery entity)
    {
        return Db.Updateable<MesInvItemOuts>()
            .SetColumns(s => s.Status == entity.status)
            .SetColumns(s => s.CheckUser == entity.userName)
            .SetColumns(s => s.CheckDate == DateTime.Now)
            .Where(s => s.Id == query.id).ExecuteCommand() > 0;
            .Where(s => s.Id == entity.id).ExecuteCommand() > 0;
    }
@@ -218,6 +395,8 @@
                        a.CheckUser == u3.Fcode))
                .WhereIF(query.id > 0,
                    (a, e, i, u1, u3) => a.Id == query.id)
                .WhereIF(!string.IsNullOrEmpty(query.billNo),
                    (a, e, i, u1, u3) => a.ItemOutNo == query.billNo)
                .Select((a, e, i, u1, u3) => new MesInvItemOuts
                {
                    Id = a.Id,
@@ -240,6 +419,35 @@
                    Status = a.Status,
                    ItemOutNo = a.ItemOutNo
                }).ToPageList(query.PageIndex, query.Limit);
    }
    public List<MesInvItemOutCDetails> GetScanBarcode(WarehouseQuery query)
    {
        return Db.Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems,
                MesDepots>(
                (b, bar, c, d) => new
                    JoinQueryInfos(
                        JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
                        JoinType.Left, b.ItemNo == c.ItemNo &&
                                       b.Company == c.Company &&
                                       b.Factory == c.Factory,
                        JoinType.Left, b.DepotCode == d.DepotCode &&
                                       b.Company == d.Company &&
                                       b.Factory == d.Factory
                    ))
            .Where((b, bar, c, d) => b.ItemOutId == query.id)
            .Select((b, bar, c, d) => new MesInvItemOutCDetails
            {
                Quantity = b.Quantity,
                DepotSectionCode = b.DepotSectionCode,
                DepotCode = b.DepotCode,
                ItemNo = b.ItemNo,
                ItemBarcode = b.ItemBarcode,
                ItemName = c.ItemName,
                ItemModel = c.ItemModel,
                DepotName = d.DepotName,
                Unit = bar.Unit
            }).ToList();
    }
    //MESInvItemOutItems
@@ -280,8 +488,11 @@
        return results;
    }
    public List<InventoryItem> GetSumItem(WarehouseQuery query)
    public OutItemDto GetSumItem(WarehouseQuery query)
    {
        var mesInvItemOuts = base.GetSingle(it => it.ItemOutNo == query.billNo);
        if (mesInvItemOuts == null) throw new Exception("采购退货单不存在");
        var sql = string.Format(@"SELECT DEPOT ,ITEM_NO,ITEM_MODEL,
           ITEM_NAME,QTY FROM (SELECT SUM(QTY) QTY, DEPOT, ITEM_NO, ITEM_MODEL, ITEM_NAME
              FROM (SELECT f_get_section_code2('1000', '1000', b.ITEM_NO,'{0}') DEPOT,
@@ -300,11 +511,25 @@
                       AND nvl(b.QUANTITY, 0) - nvl(D.QUANTITY_OK, 0) > 0
                     ORDER BY f_get_section_code2('1000','1000',b.ITEM_NO,'{0}'),
                              A.ITEM_MODEL,A.ITEM_NAME)
             GROUP BY DEPOT, ITEM_NO, ITEM_MODEL, ITEM_NAME)", query.DepotCode,
            query.id);
             GROUP BY DEPOT, ITEM_NO, ITEM_MODEL, ITEM_NAME)",
            mesInvItemOuts.DepotCode,
            mesInvItemOuts.Id);
        var results = Db.Ado.SqlQuery<InventoryItem>(sql);
        return results;
        var mesInvItemStocks = Db.Queryable<MesInvItemStocks>()
            .Where(a => a.ItemBarcode == query.barcode).Single();
        var dto = new OutItemDto();
        dto.SumItem = results;
        if (mesInvItemStocks != null)
        {
            dto.ItemNo = mesInvItemStocks.ItemNo;
            dto.Quantity = mesInvItemStocks.Quantity;
        }
        return dto;
    }
    public List<InventoryItemDetail> SelectMaterials(WarehouseQuery query)
@@ -369,4 +594,112 @@
        return "NTL" + date + number;
    }
    public MessageCenter SaveMessageCenter(WarehouseQuery query)
    {
        var message = MesToErpParam(query);
        var executeReturnIdentity =
            Db.Insertable(message).ExecuteReturnIdentity();
        if (executeReturnIdentity > 0)
        {
            message.Id = executeReturnIdentity;
            message.Pid = executeReturnIdentity;
            return message;
        }
        throw new Exception("获取数据失败");
    }
    public MessageCenter MesToErpParam(WarehouseQuery query)
    {
        var erpParameters = "";
        var title = "";
        var tableName = "MES_INV_ITEM_OUTS_" + query.Type;
        if ("A".Equals(query.Type))
        {
            erpParameters = GetErpParameters(query.billNo);
            title = "采购退货单" + query.billNo + "审核";
        }
        else if ("B".Equals(query.Type))
        {
            erpParameters = GetDeApprovePam(query.id);
            title = "采购退货单" + query.billNo + "反审核";
        }
        var ErpUrl = AppsettingsUtility.Settings.ProductionErpUrl;
        var message = new MessageCenter
        {
            TableName = tableName,
            Url = ErpUrl,
            Status = 1,
            CreateBy = query.userName,
            Route = query.billNo,
            Title = title,
            PageName = "Warehouse/PurchaseReturn/Add?id=" + query.id +
                       "&itemOutNo=" + query.billNo,
            CreateDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
            Method = "POST",
            Seq = 1,
            Data = erpParameters,
            IsMessage = 0,
            ContentType = "application/x-www-form-urlencoded"
        };
        return message;
    }
    public bool DeApproveBefore(WarehouseQuery query)
    {
        var mesInvItemOuts = base.GetById(query.id);
        if (mesInvItemOuts == null) throw new Exception("出库单不存在");
        var nflag = mesInvItemOuts.Nflag ?? 0;
        if (nflag != 0) return true;
        return false;
    }
    private string GetDeApprovePam(decimal? id)
    {
        var sid = (int)id;
        var encodedUrl = "taskname=CGTL&mesid=" + sid +
                         "&optype=delete&datajson={}";
        return encodedUrl;
    }
    private string GetErpParameters(string? billNo)
    {
        var invItemIns = Db.Queryable<MesInvItemOuts>()
            .Single(x => x.ItemOutNo == billNo);
        //调用function函数
        var sql =
            $"SELECT F_GENERATE_DATA_INSERTED('{billNo}') FROM DUAL;";
        var jsonString = Db.Ado.SqlQuerySingle<string>(sql);
        var encodedUrl = "taskname=CGTL&mesid=" + invItemIns.Id +
                         "&optype=create&datajson=" + jsonString;
        return encodedUrl;
    }
    public List<string> GetItemOutNo()
    {
        var data5 = Db.Queryable<MesInvItemOuts>().Where(it =>
                it.BillTypeId == 200 && it.TransactionNo == 203 &&
                it.Status == 1)
            .OrderBy(it => it.Id, OrderByType.Desc)
            .ToPageList(1, 20);
        var ItemOutNos = data5.FindAll(a => a.Nflag == null || a.Nflag == 0)
            .Select(s => s.ItemOutNo).ToList();
        //
        // var ItemOutNos = data5
        //     .Select(s => s.ItemOutNo).ToList();
        return ItemOutNos;
    }
}
MES.Service/service/Warehouse/MesInvItemStocksManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
using MES.Service.DB;
using MES.Service.Modes;
using SqlSugar;
namespace MES.Service.service.Warehouse;
public class MesInvItemStocksManager : Repository<MesInvItemStocks>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvItemStocksManager.cs
    #region æ•™å­¦æ–¹æ³•
    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求,业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    {
        /*********查询*********/
        var data1 = base.GetById(1); //根据ID查询
        var data2 = base.GetList(); //查询所有
        var data3 = base.GetList(it => 1 == 1); //根据条件查询
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错
        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // åˆ†é¡µæŸ¥è¯¢
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount); //返回总数
        var data6 =
            base.GetPageList(it => 1 == 1, p,
                it => SqlFunc.GetRandom()); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount); //返回总数
        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel
        {
            FieldName = typeof(MesInvItemStocks).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new MesInvItemStocks(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new MesInvItemStocks(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new MesInvItemStocks() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new MesInvItemStocks(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
    }
    #endregion
}
MES.Service/service/WomcaaManager.cs
@@ -2,8 +2,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
using System;
using System.Security.Cryptography;
namespace MES.Service.service;
@@ -76,7 +74,6 @@
    private Womcaa MapErpCAAtoWomcaa(ErpCAA dto)
    {
       var entity = new Womcaa
        {
            Erpid = Convert.ToDecimal(dto.Id),
@@ -161,7 +158,8 @@
                Eid = Convert.ToDecimal(dto.PID)
            };
            var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
            var entity = Db.Queryable<Womcab>()
                .Where(s => s.Erpid == womcab.Erpid).Single();
            if (entity != null) womcab.Id = entity.Id;
            womcabList.Add(womcab);
MES.Service/util/AppsettingsUtility.cs
@@ -5,20 +5,15 @@
public class AppsettingsUtility
{
    private static AppSettings _appSettings;
    public static AppSettings Settings
    {
        get { return _appSettings; }
    }
    public static AppSettings Settings { get; private set; }
    public void Initial(IConfiguration configuration)
    {
        AppSettings myOwn = new AppSettings();
        var myOwn = new AppSettings();
        //注意:可以使用冒号来获取内层的配置项
        myOwn.TestErpUrl = configuration["AppSettings:TestErpUrl"];
        myOwn.ProductionErpUrl = configuration["AppSettings:ProductionErpUrl"];
        myOwn.DataBaseConn = configuration["AppSettings:DataBaseConn"];
        _appSettings = myOwn;
        Settings = myOwn;
    }
}
MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,163 @@
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
public class MesInvItemOutCDetailsController : ControllerBase
{
    private readonly MesInvItemOutCDetailsManager 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] MesInvItemOutCDetails 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] MesInvItemOutCDetails 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] MesInvItemOutCDetails 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);
        }
    }
}
MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs
@@ -13,6 +13,89 @@
{
    private readonly MesInvItemOutsManager m = new();
    [HttpPost("ScanCode")]
    public ResponseResult ScanCode(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanCode(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("GetScanBarcode")]
    public ResponseResult GetScanBarcode(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetScanBarcode(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("SaveMessageCenter")]
    public ResponseResult SaveMessageCenter(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.SaveMessageCenter(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //GetItemOutNo
    [HttpPost("GetItemOutNo")]
    public ResponseResult GetItemOutNo()
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemOutNo();
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //Audit
    [HttpPost("Audit")]
    public ResponseResult Audit(WarehouseQuery query)
@@ -34,6 +117,68 @@
        }
    }
    //SetNFlag
    [HttpPost("SetNFlag")]
    public ResponseResult SetNFlag(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.SetNFlag(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //DeApproveBefore
    [HttpPost("DeApproveBefore")]
    public ResponseResult DeApproveBefore(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeApproveBefore(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("DeApprove")]
    public ResponseResult DeApprove(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeApprove(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //SaveCombination
    [HttpPost("SaveCombination")]
    public ResponseResult SaveCombination(OutItemDto dto)
MESApplication/Controllers/Warehouse/MesInvItemStocksController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,162 @@
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
public class MesInvItemStocksController : ControllerBase
{
    private readonly MesInvItemStocksManager 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] MesInvItemStocks 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] MesInvItemStocks 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] MesInvItemStocks 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);
        }
    }
}
MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/appsettings.json
@@ -6,5 +6,10 @@
      "Microsoft.Hosting.Lifetime": "Information"
    }
  },
  "AllowedHosts": "*"
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
  }
}
MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
MESApplication/bin/Release/net8.0/publish/appsettings.json
@@ -6,5 +6,10 @@
      "Microsoft.Hosting.Lifetime": "Information"
    }
  },
  "AllowedHosts": "*"
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
  }
}