lg
2024-08-15 0e860de56fbf7ac66b9563fb946055207f09f9d6
Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/StandardPda

# Conflicts:
# MES.Service/bin/Debug/net8.0/MES.Service.dll
# MES.Service/bin/Debug/net8.0/MES.Service.pdb
# MESApplication/bin/Debug/net8.0/MES.Service.dll
# MESApplication/bin/Debug/net8.0/MES.Service.pdb
# MESApplication/bin/Debug/net8.0/MESApplication.dll
# MESApplication/bin/Debug/net8.0/MESApplication.exe
# MESApplication/bin/Debug/net8.0/MESApplication.pdb
已添加11个文件
已修改32个文件
1472 ■■■■■ 文件已修改
MES.Service/DB/Repository.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/DB/RepositoryNoEntity.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/service/PurchaseInventory.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesDepotSections.cs 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvBusiness2.cs 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemArn.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemBarcodes.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemInCDetails.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemInCItems.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemIns.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesInvItemStocks.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesQaItemsDetect01.cs 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesQaItemsDetectDetail5.cs 154 ●●●●● 补丁 | 查看 | 原始文档 | 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/BasicData/MesStaffManager.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesDepotSectionsManager.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvBusiness2Manager.cs 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/Warehouse/OpeningReceiptServer.cs 308 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs 184 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/MesInvBusiness2Controller.cs 170 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MESApplication/Controllers/Warehouse/OpeningReceiptController.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | 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/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 | 历史
MES.Service/DB/Repository.cs
@@ -5,7 +5,7 @@
public class Repository<T> : SimpleClient<T> where T : class, new()
{
    public static SqlSugarScope Db = new(new ConnectionConfig
    protected static SqlSugarScope Db = new(new ConnectionConfig
        {
            DbType = DbType.Oracle,
            ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
@@ -25,7 +25,7 @@
        if (context == null) Context = Db;
    }
    public int UseTransaction(Func<SqlSugarScope, int> action)
    protected int UseTransaction(Func<SqlSugarScope, int> action)
    {
        try
        {
MES.Service/DB/RepositoryNoEntity.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
using MES.Service.util;
using SqlSugar;
namespace MES.Service.DB;
public class RepositoryNoEntity
{
    protected static SqlSugarScope Db = new(new ConnectionConfig
        {
            DbType = DbType.Oracle,
            ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
            IsAutoCloseConnection = true
        },
        db =>
        {
            db.Aop.OnLogExecuting = (sql, pars) =>
            {
                Console.WriteLine(
                    UtilMethods.GetSqlString(DbType.Oracle, sql, pars));
            };
        });
    protected int UseTransaction(Func<SqlSugarScope, int> action)
    {
        try
        {
            Db.Ado.BeginTran(); // å¼€å§‹äº‹åŠ¡
            var affectedRows = action.Invoke(Db); // æ‰§è¡Œä¼ å…¥çš„æ“ä½œå¹¶èŽ·å–å—å½±å“çš„è¡Œæ•°
            Db.Ado.CommitTran(); // æäº¤äº‹åŠ¡
            return affectedRows; // è¿”回受影响的行数
        }
        catch (Exception)
        {
            Db.Ado.RollbackTran(); // å›žæ»šäº‹åŠ¡
            throw; // é‡æ–°æŠ›å‡ºå¼‚常
        }
    }
}
MES.Service/Dto/service/PurchaseInventory.cs
@@ -12,4 +12,6 @@
    public List<MesInvItemInCDetails>? InvItemInCDetails { get; set; }
    public List<MesInvItemInCItems>? ItemInDetails { get; set; }
    public List<MesInvItemStocks>? ItemStocks { get; set; }
}
MES.Service/Modes/MesDepotSections.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,115 @@
using SqlSugar;
namespace MES.Service.Modes;
/// <summary>
///     ä»“位信息
/// </summary>
[SugarTable("MES_DEPOT_SECTIONS")]
public class MesDepotSections
{
    /// <summary>
    ///     ID(SEQ_INV_ID)(ERPID)
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_ID", IsPrimaryKey = true)]
    public decimal DepotSectionId { get; set; }
    /// <summary>
    ///     è´§ä½ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
    public string DepotSectionCode { get; set; }
    /// <summary>
    ///     è´§ä½åç§°
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_NAME")]
    public string DepotSectionName { get; set; }
    /// <summary>
    ///     ä»“库编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_ID")]
    public decimal? DepotId { get; set; }
    /// <summary>
    ///     å‚与齐套校验(0:否,1:是)
    /// </summary>
    [SugarColumn(ColumnName = "COMPLETENESS_FLAG")]
    public short? CompletenessFlag { get; set; }
    /// <summary>
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string Description { 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 = "COMPANY")]
    public string Company { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
    /// <summary>
    ///     å¡æ¿æ•°
    /// </summary>
    [SugarColumn(ColumnName = "KB_QTY")]
    public decimal? KbQty { get; set; }
    /// <summary>
    ///     ä»“位组ID
    /// </summary>
    [SugarColumn(ColumnName = "ZUID")]
    public decimal? Zuid { get; set; }
    /// <summary>
    ///     ä»“位全名
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_NAMET")]
    public string DepotSectionNamet { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "ERPID")]
    public decimal? Erpid { get; set; }
    /// <summary>
    ///     ä»“库类别编码
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? DepotCode { get; set; }
    /// <summary>
    ///     ä»“库类别名称
    /// </summary>
    [SugarColumn(IsIgnore = true)]
    public string? DepotName { get; set; }
}
MES.Service/Modes/MesInvBusiness2.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,194 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// åº“存交易记录表
    ///</summary>
    [SugarTable("MES_INV_BUSINESS2")]
    public class MesInvBusiness2
    {
        /// <summary>
        /// ID(seq_inv_id)
        ///</summary>
         [SugarColumn(ColumnName="ID",OracleSequenceName = "SEQ_ID",IsPrimaryKey = true   )]
         public decimal Id { get; set; }
        /// <summary>
        /// çŠ¶æ€|0-未交易1-已交易
        ///</summary>
         [SugarColumn(ColumnName="STATUS"    )]
         public decimal? Status { get; set; }
        /// <summary>
        /// å•据类型ID
        ///</summary>
         [SugarColumn(ColumnName="BILL_TYPE_ID"    )]
         public decimal? BillTypeId { get; set; }
        /// <summary>
        /// äº‹åŠ¡ç±»åž‹ç¼–ç 
        ///</summary>
         [SugarColumn(ColumnName="TRANSACTION_CODE"    )]
         public string TransactionCode { get; set; }
        /// <summary>
        /// äº¤æ˜“类型|1-入库0-转库-1出库
        ///</summary>
         [SugarColumn(ColumnName="BUSINESS_TYPE"    )]
         public decimal? BusinessType { get; set; }
        /// <summary>
        /// å•据ID
        ///</summary>
         [SugarColumn(ColumnName="BILL_ID"    )]
         public decimal? BillId { get; set; }
        /// <summary>
        /// å•据编码
        ///</summary>
         [SugarColumn(ColumnName="BILL_NO"    )]
         public string BillNo { get; set; }
        /// <summary>
        /// ç”Ÿäº§è®¢å•号
        ///</summary>
         [SugarColumn(ColumnName="TASK_NO"    )]
         public string TaskNo { get; set; }
        /// <summary>
        /// å®¢æˆ·ç¼–号
        ///</summary>
         [SugarColumn(ColumnName="CUSTOMER_NO"    )]
         public string CustomerNo { get; set; }
        /// <summary>
        /// å•据行ID
        ///</summary>
         [SugarColumn(ColumnName="BILL_LINE_ID"    )]
         public decimal? BillLineId { get; set; }
        /// <summary>
        /// ç‰©æ–™æ¡ç 
        ///</summary>
         [SugarColumn(ColumnName="ITEM_BARCODE"    )]
         public string ItemBarcode { get; set; }
        /// <summary>
        /// æœ¬å¸ç‰©æ–™ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="ITEM_NO"    )]
         public string ItemNo { get; set; }
        /// <summary>
        /// å®¢æˆ·ç‰©æ–™ç¼–码
        ///</summary>
         [SugarColumn(ColumnName="C_ITEM_CODE"    )]
         public string CItemCode { get; set; }
        /// <summary>
        /// åŽ‚å®¶æ‰¹æ¬¡
        ///</summary>
         [SugarColumn(ColumnName="LOT_NO"    )]
         public string LotNo { get; set; }
        /// <summary>
        /// æ˜¯å¦çŽ¯ä¿(0:否,1:是)
        ///</summary>
         [SugarColumn(ColumnName="EP_FLAG"    )]
         public short? EpFlag { get; set; }
        /// <summary>
        /// æ•°é‡
        ///</summary>
         [SugarColumn(ColumnName="QUANTITY"    )]
         public decimal? Quantity { get; set; }
        /// <summary>
        /// æºå­åº“CODE
        ///</summary>
         [SugarColumn(ColumnName="FROM_INV_DEPOTS_CODE"    )]
         public string FromInvDepotsCode { get; set; }
        /// <summary>
        /// æºè´§ä½CODE
        ///</summary>
         [SugarColumn(ColumnName="FROM_INV_DEPOT_SECTIONS_CODE"    )]
         public string FromInvDepotSectionsCode { get; set; }
        /// <summary>
        /// ç›®çš„子库CODE
        ///</summary>
         [SugarColumn(ColumnName="TO_INV_DEPOTS_CODE"    )]
         public string ToInvDepotsCode { get; set; }
        /// <summary>
        /// ç›®çš„货位CODE
        ///</summary>
         [SugarColumn(ColumnName="TO_INV_DEPOT_SECTIONS_CODE"    )]
         public string ToInvDepotSectionsCode { get; set; }
        /// <summary>
        /// äº¤æ˜“异常信息
        ///</summary>
         [SugarColumn(ColumnName="DESCRIPTION"    )]
         public string Description { 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="ULLAGE_STAT_FLAG"    )]
         public short? UllageStatFlag { 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="ITEM_BARCODE2"    )]
         public string ItemBarcode2 { get; set; }
        /// <summary>
        /// å¡æ¿æ¡ç 
        ///</summary>
         [SugarColumn(ColumnName="ITEM_BARCODE3"    )]
         public string ItemBarcode3 { 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>
        /// é‡‡è´­è®¢å•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/MesInvItemArn.cs
MES.Service/Modes/MesInvItemBarcodes.cs
MES.Service/Modes/MesInvItemInCDetails.cs
@@ -11,7 +11,7 @@
    /// <summary>
    ///     SEQ_OUT
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID",OracleSequenceName = "SEQ_INV_ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
MES.Service/Modes/MesInvItemInCItems.cs
MES.Service/Modes/MesInvItemIns.cs
@@ -11,7 +11,8 @@
    /// <summary>
    ///     ID(SEQ_INV_ID)
    /// </summary>
    [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
    /// <summary>
MES.Service/Modes/MesInvItemStocks.cs
@@ -9,8 +9,10 @@
public class MesInvItemStocks
{
   /// <summary>
    /// SEQ_ME_ID
   /// </summary>
   [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ME_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }
   /// <summary>
MES.Service/Modes/MesQaItemsDetect01.cs
MES.Service/Modes/MesQaItemsDetectDetail5.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,154 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// æ¥æ–™æ£€éªŒä»Žè¡¨
    ///</summary>
    [SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
    public class MesQaItemsDetectDetail5
    {
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true   )]
         public decimal Id { get; set; }
        /// <summary>
        /// æ ‡å‡†å€¼ç±»åž‹
        ///</summary>
         [SugarColumn(ColumnName="FTEXT_TYPE"    )]
         public string FtextType { get; set; }
        /// <summary>
        /// æ ‡å‡†å€¼
        ///</summary>
         [SugarColumn(ColumnName="FSTAND"    )]
         public decimal? Fstand { get; set; }
        /// <summary>
        /// ä¸Šå…¬å·®
        ///</summary>
         [SugarColumn(ColumnName="FUP_ALLOW"    )]
         public string FupAllow { get; set; }
        /// <summary>
        /// ä¸‹å…¬å·®
        ///</summary>
         [SugarColumn(ColumnName="FDOWN_ALLOW"    )]
         public string FdownAllow { get; set; }
        /// <summary>
        /// æ£€éªŒæ°´å‡†
        ///</summary>
         [SugarColumn(ColumnName="SAMPLE_SIZE_NO"    )]
         public string SampleSizeNo { get; set; }
        /// <summary>
        /// æ£€éªŒæ°´å¹³
        ///</summary>
         [SugarColumn(ColumnName="FCHECK_LEVEL"    )]
         public string FcheckLevel { get; set; }
        /// <summary>
        /// æ‹’æ”¶æ°´å¹³
        ///</summary>
         [SugarColumn(ColumnName="FAC_LEVEL"    )]
         public string FacLevel { get; set; }
        /// <summary>
        /// æ£€éªŒé¡¹ç›®
        ///</summary>
         [SugarColumn(ColumnName="FCHECK_ITEM"    )]
         public string FcheckItem { get; set; }
        /// <summary>
        /// è§„格要求
        ///</summary>
         [SugarColumn(ColumnName="FSPEC_REQU"    )]
         public string FspecRequ { get; set; }
        /// <summary>
        /// æŠ½æ£€æ•°é‡
        ///</summary>
         [SugarColumn(ColumnName="CHECK_QYT"    )]
         public decimal? CheckQyt { get; set; }
        /// <summary>
        /// æ£€éªŒç»“æžœ
        ///</summary>
         [SugarColumn(ColumnName="FCHECK_RESU"    )]
         public string FcheckResu { get; set; }
        /// <summary>
        /// AC数量
        ///</summary>
         [SugarColumn(ColumnName="FAC_QTY"    )]
         public decimal? FacQty { get; set; }
        /// <summary>
        /// RE数量
        ///</summary>
         [SugarColumn(ColumnName="FRE_QTY"    )]
         public decimal? FreQty { get; set; }
        /// <summary>
        /// ä¸åˆæ ¼æ•°
        ///</summary>
         [SugarColumn(ColumnName="FNG_QTY"    )]
         public decimal? FngQty { get; set; }
        /// <summary>
        /// ä¸è‰¯çއ
        ///</summary>
         [SugarColumn(ColumnName="FNG_RATE"    )]
         public decimal? FngRate { get; set; }
        /// <summary>
        /// å·²å½•入数量
        ///</summary>
         [SugarColumn(ColumnName="FENTER_QTY"    )]
         public decimal? FenterQty { get; set; }
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="RELEASE_NO"    )]
         public string ReleaseNo { get; set; }
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="COMPANY"    )]
         public string Company { get; set; }
        /// <summary>
        ///
        ///</summary>
         [SugarColumn(ColumnName="FACTORY"    )]
         public string Factory { get; set; }
        /// <summary>
        /// æ£€éªŒé¡¹ç›®æè¿°
        ///</summary>
         [SugarColumn(ColumnName="FCHECK_ITEM_DESC"    )]
         public string FcheckItemDesc { get; set; }
        /// <summary>
        /// å·¥åºå·
        ///</summary>
         [SugarColumn(ColumnName="PROC_NO"    )]
         public string ProcNo { get; set; }
        /// <summary>
        /// å·¥ä½œä¸­å¿ƒç¼–码
        ///</summary>
         [SugarColumn(ColumnName="WORKSHOP_CENTER_CODE"    )]
         public string WorkshopCenterCode { get; set; }
        /// <summary>
        /// å•位
        ///</summary>
         [SugarColumn(ColumnName="FUNIT"    )]
         public string Funit { get; set; }
        /// <summary>
        /// ç‰¹å®šä¿®æ”¹
        ///</summary>
         [SugarColumn(ColumnName="GIVEN_MODIFY"    )]
         public short? GivenModify { get; set; }
        /// <summary>
        /// æ£€éªŒå·¥å…·
        ///</summary>
         [SugarColumn(ColumnName="FCHECK_TOOL"    )]
         public string FcheckTool { get; set; }
        /// <summary>
        /// æ›´æ–°äºº
        ///</summary>
         [SugarColumn(ColumnName="LASTUPDATE_BY"    )]
         public string LastupdateBy { get; set; }
        /// <summary>
        /// æ›´æ–°æ—¶é—´
        ///</summary>
         [SugarColumn(ColumnName="LASTUPDATE_DATE"    )]
         public DateTime? LastupdateDate { 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/BasicData/MesStaffManager.cs
@@ -141,7 +141,15 @@
            Lever = 0,
            Fcompany = "1000",
            Ffactory = "1000",
            DelFlag = 0
            DelFlag = 0,
            Ismanager = 0,
            Isacq = 0,
            ExpField9 = "1020",
            QmUser = 0,
            Status = 0,
            Isdeparture = 0,
            CheckFlag = 0,
            ExpFiel12 = 0,
        };
    }
MES.Service/service/QC/MesQaItemsDetectDetail5Manager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
namespace MES.Service.service.QC
{
public class MesQaItemsDetectDetail5Manager : Repository<MesQaItemsDetectDetail5>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesQaItemsDetectDetail5Manager.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(), OrderByType.Asc);// åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount);//返回总数
        List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel() { FieldName= typeof(MesQaItemsDetectDetail5).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
        base.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new MesQaItemsDetectDetail5() { };//测试参数
        var insertArray = new MesQaItemsDetectDetail5[] { insertData };
        base.Insert(insertData);//插入
        base.InsertRange(insertArray);//批量插入
        var id = base.InsertReturnIdentity(insertData);//插入返回自增列
        base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new MesQaItemsDetectDetail5() {  };//测试参数
        var updateArray = new MesQaItemsDetectDetail5[] { updateData };//测试参数
        base.Update(updateData);//根据实体更新
        base.UpdateRange(updateArray);//批量更新
        //base.Update(it => new MesQaItemsDetectDetail5() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        base.AsUpdateable(updateData).ExecuteCommand();  //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new MesQaItemsDetectDetail5() {  };//测试参数
        base.Delete(deldata);//根据实体删除
        base.DeleteById(1);//根据主键删除
        base.DeleteById(new int[] { 1,2});//根据主键数组删除
        base.Delete(it=>1==2);//根据条件删除
        base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
    }
    #endregion
 }
}
MES.Service/service/Warehouse/MesDepotSectionsManager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using SqlSugar;
namespace MES.Service.service.Warehouse;
public class MesDepotSectionsManager : Repository<MesDepotSections>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    public string GetSectionName(WarehouseQuery query)
    {
        var sectionName = Db.Queryable<MesDepotSections, MesDepots>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
            .Where((a, b) => a.DepotSectionCode == query.sectionCode)
            .Select((a, b) => a.DepotSectionName).Single();
        if (sectionName == null)
        {
            throw new Exception("库位编码 " + query.sectionCode + " ä¸å­˜åœ¨ï¼Œè¯·ç¡®è®¤ï¼");
        }
        return sectionName;
    }
    public MesDepotSections ScanInDepotSectionsName(WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.sectionCode))
        {
            throw new Exception("请扫库位条码!");
        }
        var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
                (a, b) =>
                    new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
            .Where((a, b) => a.DepotSectionCode == query.sectionCode)
            .Select((a, b) => new MesDepotSections
            {
                DepotSectionName = a.DepotSectionName,
                DepotCode = b.DepotCode,
                DepotName = b.DepotName
            }).First();
        if (mesDepotSections == null)
        {
            throw new Exception("库位编码" + query.sectionCode + " ä¸å­˜åœ¨ï¼Œè¯·ç¡®è®¤!");
        }
        return mesDepotSections;
    }
    public MesInvItemStocks ScanEditBarcode(WarehouseQuery entity)
    {
        if (string.IsNullOrEmpty(entity.sectionCode))
        {
            throw new Exception("请扫库位条码!");
        }
        return null;
    }
}
MES.Service/service/Warehouse/MesInvBusiness2Manager.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using MES.Service.DB;
using MES.Service.Modes;
namespace MES.Service.service.Warehouse
{
public class MesInvBusiness2Manager : Repository<MesInvBusiness2>
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„æ–¹æ³•
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvBusiness2Manager.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(), OrderByType.Asc);// åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        Console.Write(p.TotalCount);//返回总数
        List<IConditionalModel> conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’åº
        conModels.Add(new ConditionalModel() { FieldName= typeof(MesInvBusiness2).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
        base.AsQueryable().Where(x => 1 == 1).ToList();//支持了转换成queryable,我们可以用queryable实现复杂功能
        /*********插入*********/
        var insertData = new MesInvBusiness2() { };//测试参数
        var insertArray = new MesInvBusiness2[] { insertData };
        base.Insert(insertData);//插入
        base.InsertRange(insertArray);//批量插入
        var id = base.InsertReturnIdentity(insertData);//插入返回自增列
        base.AsInsertable(insertData).ExecuteCommand();//我们可以转成 Insertable实现复杂插入
        /*********更新*********/
        var updateData = new MesInvBusiness2() {  };//测试参数
        var updateArray = new MesInvBusiness2[] { updateData };//测试参数
        base.Update(updateData);//根据实体更新
        base.UpdateRange(updateArray);//批量更新
        //base.Update(it => new MesInvBusiness2() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列,其它列不更新,条件id=1
        base.AsUpdateable(updateData).ExecuteCommand();  //转成Updateable可以实现复杂的插入
        /*********删除*********/
        var deldata = new MesInvBusiness2() {  };//测试参数
        base.Delete(deldata);//根据实体删除
        base.DeleteById(1);//根据主键删除
        base.DeleteById(new int[] { 1,2});//根据主键数组删除
        base.Delete(it=>1==2);//根据条件删除
        base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//转成Deleteable实现复杂的操作
    }
    #endregion
 }
}
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -59,17 +59,19 @@
        // æŸ¥è¯¢
        var result = Db
            .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
                MesItems, MesUnit>(
                (a, d, b, c, t) => new object[]
                MesItems, MesUnit,MesQaItemsDetectDetail5>(
                (a, d, b, c, t,z) => new object[]
                {
                    JoinType.Inner, d.BillNo == a.LotNo,
                    JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
                    JoinType.Inner,
                    a.ItemNo == c.ItemNo && a.Company == c.Company &&
                    a.Factory == c.Factory,
                    JoinType.Inner, c.Fpurchaseunitid == t.Id
                    JoinType.Inner, c.Fpurchaseunitid == t.Id,
                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo
                })
            .Where((a, d, b, c, t) => a.FngHandle == "退货" &&
            .Where((a, d, b, c, t,z) => a.FngHandle == "退货" &&
                      z.FcheckResu == "不合格" &&
                                      query.ItemArnDetailIds.Contains(b.Id))
            .Select((a, d, b, c, t) => new Material
            {
MES.Service/service/Warehouse/OpeningReceiptServer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,308 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using SqlSugar;
namespace MES.Service.service.Warehouse;
public class OpeningReceiptServer : RepositoryNoEntity
{
    private const string Factory = "1000";
    private const string Company = "1000";
    private const int billTypeId = 100;
    private const int transactionNo = 601;
    public MesInvItemBarcodes ScanInBarcodeQC(WarehouseQuery query)
    {
        if (string.IsNullOrWhiteSpace(query.sectionCode))
        {
            throw new Exception("请扫库位条码!");
        }
        var depotCode = GetDepotCode(query.sectionCode);
        if (depotCode == null)
        {
            throw new Exception($"002[库位编码 {query.sectionCode} ä¸å­˜åœ¨ï¼Œè¯·ç¡®è®¤ï¼");
        }
        var checkBarcodeAlreadyReceived =
            CheckBarcodeAlreadyReceived(query.barcode);
        if (checkBarcodeAlreadyReceived > 0)
        {
            throw new Exception("条码重复扫描,请核对!");
        }
        if (CheckBarcodeInStock(query.barcode) > 0)
        {
            throw new Exception("条码已在库存中,请核对!");
        }
        var barcodeInfo = GetBarcodeInfo(query.barcode);
        if (barcodeInfo == null || barcodeInfo.ComeFlg != 0)
        {
            throw new Exception("条码不是期初条码,无法用期初入库!");
        }
        var inventoryItemInId = GetOrCreateInventoryItemInId(barcodeInfo,
            depotCode, query.userName, out string billNo);
        UseTransaction(db =>
        {
            // Insert records
            InsertInventoryDetails(inventoryItemInId, billNo, barcodeInfo,
                depotCode, query.sectionCode, query.userName);
            InsertBusinessRecord(barcodeInfo, depotCode, query.sectionCode,
                billNo,
                query.userName);
            InsertStockRecord(barcodeInfo, depotCode, query.sectionCode,
                query.userName);
            return 1;
        });
        return barcodeInfo;
    }
    public PurchaseInventory GetForm(WarehouseQuery query)
    {
        var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
            .Where(s => s.ItemBarcode == query.barcode).Count();
        if (mesInvItemBarcodes <= 0)
        {
            throw new Exception("条码不存在");
        }
        var mesInvItemInCDetails = Db.Queryable<MesInvItemInCDetails>()
            .Where(s => s.ItemBarcode == query.barcode).Single();
        PurchaseInventory entity = new PurchaseInventory
        {
            ItemIns = GetMesInvItemIns(mesInvItemInCDetails.ItemInId),
            InvItemInCDetails =
                GetMesInvItemInCDetailsList(mesInvItemInCDetails.ItemInId),
            ItemStocks = Db.Queryable<MesInvItemStocks>()
                .Where(s => s.ItemBarcode == query.barcode).ToList()
        };
        return entity;
    }
    public MesInvItemIns GetMesInvItemIns(decimal id)
    {
        return Db.Queryable<MesInvItemIns>()
            .Where(s => s.Id == id).Single();
    }
    public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal id)
    {
        return Db.Queryable<MesInvItemInCDetails, MesUnit>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Unit == b.Id.ToString()))
            .Where((a, b) => a.ItemInId == id)
            .Select((a, b) => new MesInvItemInCDetails
            {
                ItemBarcode = a.ItemBarcode,
                ItemNo = a.ItemNo,
                ItemSname = a.ItemSname,
                DepotSectionCode = a.DepotSectionCode,
                Quantity = a.Quantity,
                Unit = b.Fname,
                Remark = a.Remark
            })
            .ToList();
    }
    private void InsertInventoryDetails(decimal itemInId, string billNo,
        MesInvItemBarcodes barcodeInfo, string depotCode, string sectionCode,
        string user)
    {
        // Insert inventory details record
        var executeCommand = Db.Insertable(new MesInvItemInCDetails
        {
            ItemInId = itemInId,
            BillNo = billNo,
            ItemBarcode = barcodeInfo.ItemBarcode,
            Quantity = barcodeInfo.Quantity,
            BarcodeFlag = 1,
            EpFlag = 1,
            WorkType = 1,
            ItemNo = barcodeInfo.ItemNo,
            LotNo = barcodeInfo.LotNo,
            SuppNo = barcodeInfo.SuppNo,
            DepotCode = depotCode,
            DepotSectionCode = sectionCode,
            ItemSname = barcodeInfo.ItemSname,
            Unit = barcodeInfo.Unit,
            CreateBy = user,
            CreateDate = DateTime.Now,
            LastupdateBy = user,
            LastupdateDate = DateTime.Now,
            Remark = barcodeInfo.Memo,
            Factory = Factory,
            Company = Company,
            Ebeln = barcodeInfo.Mblnr,
            EbelnLineNo = barcodeInfo.Zeile,
            WorkNo = barcodeInfo.WorkNo,
            WorkLine = barcodeInfo.WorkLine,
            CbillNo = barcodeInfo.BillNo,
            UrgentFlag = barcodeInfo.UrgentFlag,
            BoardStyle = barcodeInfo.BoardStyle,
            TaskNo = barcodeInfo.TaskNo
        }).ExecuteCommand();
        if (executeCommand <= 0)
        {
            throw new Exception("写入失败");
        }
    }
    private decimal GetOrCreateInventoryItemInId(MesInvItemBarcodes barcodeInfo,
        string depotCode, string userName, out string billNo)
    {
        var inventory = Db.Queryable<MesInvItemIns>()
            .Where(d => d.InsDate >= DateTime.Today &&
                        d.InsDate < DateTime.Today.AddDays(1) &&
                        d.Sapstatus == 0 &&
                        d.Status == 0 &&
                        d.TransctionNo == transactionNo.ToString() &&
                        d.CbillNo == barcodeInfo.BillNo &&
                        d.SuppNo == barcodeInfo.SuppNo &&
                        d.DepotsCode == depotCode)
            .First();
        if (inventory != null)
        {
            billNo = inventory.BillNo;
            return inventory.Id;
        }
        var sql =
            $"SELECT getbillcode1('{Factory}','{Company}','QCRK') FROM DUAL;";
        billNo = Db.Ado.SqlQuerySingle<string>(sql);
        var executeReturnIdentity = Db.Insertable(new MesInvItemIns
        {
            BillNo = billNo,
            BillTypeId = billTypeId,
            InsDate = DateTime.Now,
            DepotsCode = depotCode,
            TransctionNo = transactionNo.ToString(),
            SuppNo = barcodeInfo.SuppNo,
            CreateBy = userName,
            CreateDate = DateTime.Now,
            LastupdateBy = userName,
            LastupdateDate = DateTime.Now,
            Factory = Factory,
            Company = Company,
            UrgentFlag = barcodeInfo.UrgentFlag,
            CbillNo = barcodeInfo.BillNo,
            Fstatus = 0
        }).ExecuteReturnIdentity();
        return executeReturnIdentity;
    }
    private MesInvItemBarcodes GetBarcodeInfo(string itemBarcode)
    {
        // Get barcode information
        return Db.Queryable<MesInvItemBarcodes>()
            .First(b => b.ItemBarcode == itemBarcode);
    }
    private int CheckBarcodeInStock(string itemBarcode)
    {
        // Check if the barcode is in stock
        return Db.Queryable<MesInvItemStocks>()
            .Where(stock => stock.ItemBarcode == itemBarcode).Count();
    }
    private int CheckBarcodeAlreadyReceived(string itemBarcode)
    {
        // Check if the barcode is already received
        return Db.Queryable<MesInvItemIns, MesInvItemInCDetails>(
                (ins, details) => new JoinQueryInfos(JoinType.Inner,
                    ins.Id == details.ItemInId))
            .Where((ins, details) => details.ItemBarcode == itemBarcode)
            .Count();
    }
    private string GetDepotCode(string sectionCode)
    {
        // This would be your query to get depot code based on section code
        return Db.Queryable<MesDepotSections, MesDepots>((d, t) =>
                new JoinQueryInfos(JoinType.Inner, d.Zuid.ToString() == t.Zuid))
            .Where((d, t) => d.DepotSectionCode == sectionCode)
            .Select<string>((d, t) => t.DepotCode)
            .First();
    }
    private void InsertStockRecord(MesInvItemBarcodes barcodeInfo,
        string depotCode,
        string sectionCode, string user)
    {
        var executeCommand = Db.Insertable(new MesInvItemStocks
        {
            TaskNo = barcodeInfo.TaskNo,
            ItemBarcode = barcodeInfo.ItemBarcode,
            ItemNo = barcodeInfo.ItemNo,
            LotNo = barcodeInfo.LotNo,
            Quantity = barcodeInfo.Quantity,
            EpFlag = barcodeInfo.EpFlag,
            DepotsCode = depotCode,
            DepotSectionsCode = sectionCode,
            CheckDate = barcodeInfo.CreateDate,
            IndepDate = barcodeInfo.CreateDate,
            Factory = Factory,
            Company = Company,
            BoardStyle = barcodeInfo.BoardStyle,
            WorkNo = barcodeInfo.WorkNo,
            WorkLine = barcodeInfo.WorkLine,
            SuppNo = barcodeInfo.SuppNo
        }).ExecuteCommand();
        if (executeCommand <= 0)
        {
            throw new Exception("写入失败");
        }
    }
    private void InsertBusinessRecord(MesInvItemBarcodes barcodeInfo,
        string depotCode, string sectionCode, string billNo, string user)
    {
        // Insert business record
        var executeCommand = Db.Insertable(new MesInvBusiness2
        {
            Status = 1,
            BillTypeId = billTypeId,
            TransactionCode = "601",
            BusinessType = 1,
            ItemBarcode = barcodeInfo.ItemBarcode,
            ItemNo = barcodeInfo.ItemNo,
            LotNo = barcodeInfo.LotNo,
            EpFlag = 1,
            Quantity = barcodeInfo.Quantity,
            ToInvDepotsCode = depotCode,
            ToInvDepotSectionsCode = sectionCode,
            CreateBy = user,
            CreateDate = DateTime.Now,
            LastupdateBy = user,
            LastupdateDate = DateTime.Now,
            Factory = Factory,
            Company = Company,
            TaskNo = barcodeInfo.TaskNo,
            BillNo = billNo,
            WorkNo = barcodeInfo.WorkNo,
            WorkLine = barcodeInfo.WorkLine,
            SuppNo = barcodeInfo.SuppNo
        }).ExecuteCommand();
        if (executeCommand <= 0)
        {
            throw new Exception("写入失败");
        }
    }
}
MESApplication/Controllers/Warehouse/MesDepotSectionsController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,184 @@
using System.Dynamic;
using MES.Service.Dto.service;
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 MesDepotSectionsController : ControllerBase
{
    private readonly MesDepotSectionsManager m = new();
    /***进入模版管理可以修改模版***/
    //GetSectionName
    [HttpPost("GetSectionName")]
    public ResponseResult GetSectionName(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetSectionName(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] MesDepotSections 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] MesDepotSections 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] MesDepotSections 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/MesInvBusiness2Controller.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,170 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Dynamic;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.Warehouse;
using MES.Service.util;
namespace MESApplication.Controllers.Warehouse
{
    [ApiController]
    [Route("api/[controller]")]
    public class MesInvBusiness2Controller : ControllerBase
    {
        private MesInvBusiness2Manager m = new MesInvBusiness2Manager();
        /***进入模版管理可以修改模版***/
        /// <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] MesInvBusiness2 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] MesInvBusiness2 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] MesInvBusiness2 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/OpeningReceiptController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
public class OpeningReceiptController : ControllerBase
{
    private readonly OpeningReceiptServer m = new();
    [HttpPost("ScanInBarcodeQC")]
    public ResponseResult ScanInBarcodeQC(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanInBarcodeQC(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    [HttpPost("GetForm")]
    public ResponseResult GetForm(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetForm(query);
            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/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