生产领料单

啊鑫

2024-08-28 481e4bef4be32a5a9754d01faf80bf0bc4e14951

生产领料单

 MES.Service/DB/OracleSQLHelper.cs

@@ -9,10 +9,11 @@
/// </summary>
public class OracleSQLHelper
{
    private readonly string ConnectionString =AppsettingsUtility.Settings.DataBaseConn;

    private readonly string _connectionString;
    
    private readonly string ConnectionString =
        AppsettingsUtility.Settings.DataBaseConn;

    public OracleSQLHelper()
    {
        _connectionString = ConnectionString;

 MES.Service/Dto/service/MaterialReceipt.cs

@@ -4,12 +4,9 @@

public class MaterialReceipt
{
  

    public List<MesInvItemOutItems>? ItemsList { get; set; }
  
    public List<MesInvItemOutCDetails>? InvItemoutCDetails { get; set; }

    public MesInvItemOuts? ItemOuts { get; set; }


}

 MES.Service/Dto/service/WarehouseQuery.cs

 MES.Service/Modes/MesBarcodeType.cs

@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
using SqlSugar;

namespace MES.Service.Modes;

    /// <summary>
    /// æ¡ç ç±»åž‹è¡¨
    ///</summary>
@@ -15,200 +13,238 @@
        ///</summary>
         [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true   )]
         public decimal Id { get; set; }

        /// <summary>
        /// ä½¿ç”¨åœºæ‰€ 
        ///</summary>
         [SugarColumn(ColumnName="USE_SITE"    )]
         public string UseSite { get; set; }

        /// <summary>
        /// æ¡ç ç±»åž‹åç§° 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_TYPE_NAME"    )]
         public string BarcodeTypeName { get; set; }

        /// <summary>
        /// ç åˆ¶ 
        ///</summary>
         [SugarColumn(ColumnName="CODE"    )]
         public string Code { get; set; }

        /// <summary>
        /// æ¡ç çº¸å®½ 
        ///</summary>
         [SugarColumn(ColumnName="PAPER_WIDTH"    )]
         public decimal? PaperWidth { get; set; }

        /// <summary>
        /// æ¡ç çº¸é«˜ 
        ///</summary>
         [SugarColumn(ColumnName="PAPER_HEIGHT"    )]
         public decimal? PaperHeight { get; set; }

        /// <summary>
        /// æ¡ç å¼€å§‹ä½ç½®X 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_BEGIN_POSITION_X"    )]
         public decimal? BarcodeBeginPositionX { get; set; }

        /// <summary>
        /// æ¡ç å¼€å§‹ä½ç½®Y 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_BEGIN_POSITION_Y"    )]
         public decimal? BarcodeBeginPositionY { get; set; }

        /// <summary>
        /// ä¸€å¼ æ¡ç çº¸ä¸Šæ¡ç ä¸ªæ•° 
        ///</summary>
         [SugarColumn(ColumnName="PAPER_NUM"    )]
         public decimal? PaperNum { get; set; }

        /// <summary>
        /// ä¸€å¼ æ¡ç çº¸ä¸Šæ¯è¡Œæ¡ç ä¸ªæ•° 
        ///</summary>
         [SugarColumn(ColumnName="PAPER_ROW_NUM"    )]
         public decimal? PaperRowNum { get; set; }

        /// <summary>
        /// ä¸€å¼ æ¡ç çº¸ä¸Šæ¡ç åˆ—æ•° 
        ///</summary>
         [SugarColumn(ColumnName="PAPER_COLUMN_NUM"    )]
         public decimal? PaperColumnNum { get; set; }

        /// <summary>
        /// æ¡ç æµæ°´å·å¾ªçŽ¯ç±»åž‹(控制条码流水号) 
        ///</summary>
         [SugarColumn(ColumnName="CYCLE_TYPE"    )]
         public string CycleType { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆ(0-无效,1-有效) 
        ///</summary>
         [SugarColumn(ColumnName="AVAILABLE_FLAG"    )]
         public decimal? AvailableFlag { get; set; }

        /// <summary>
        /// æ¡ç é«˜åº¦ 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_HEIGHT"    )]
         public decimal? BarcodeHeight { get; set; }

        /// <summary>
        /// æ¡ç å­—体方向 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_ORIENTATION"    )]
         public string BarcodeOrientation { get; set; }

        /// <summary>
        /// æ¡ç æ‰“印注释行(1-打印，0-不打印) 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_INTERPRETATION"    )]
         public decimal? BarcodeInterpretation { get; set; }

        /// <summary>
        /// æ¡ç æ‰“印注释行打在条码上方(1-打印在条码上方，0-不打印在条码上方) 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_INTERPRETATION_ABOVE"    )]
         public decimal? BarcodeInterpretationAbove { 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="BARCODE_WIDTH"    )]
         public decimal? BarcodeWidth { get; set; }

        /// <summary>
        /// [改变条码默认参数]模块（窄条）宽 
        ///</summary>
         [SugarColumn(ColumnName="BY_W"    )]
         public decimal? ByW { get; set; }

        /// <summary>
        /// [改变条码默认参数]宽条与窄条的比例 
        ///</summary>
         [SugarColumn(ColumnName="BY_R"    )]
         public decimal? ByR { get; set; }

        /// <summary>
        /// [改变条码默认参数]条码高度 
        ///</summary>
         [SugarColumn(ColumnName="BY_H"    )]
         public decimal? ByH { get; set; }

        /// <summary>
        /// ç‚¹æ•°/毫米 
        ///</summary>
         [SugarColumn(ColumnName="JM"    )]
         public string Jm { get; set; }

        /// <summary>
        /// è™šæ‹Ÿæ•°æ®æ ‡å¿—(1-是，0－否) 
        ///</summary>
         [SugarColumn(ColumnName="JVM_DATA_FLAG"    )]
         public decimal? JvmDataFlag { get; set; }

        /// <summary>
        /// è™šæ‹Ÿæ•°æ®æµæ°´å·ä½æ•° 
        ///</summary>
         [SugarColumn(ColumnName="JVM_SERIAL_DIGIT"    )]
         public decimal? JvmSerialDigit { get; set; }

        /// <summary>
        /// è™šæ‹Ÿæ•°æ®æ¡ç é•¿åº¦ 
        ///</summary>
         [SugarColumn(ColumnName="JVM_BARCODE_LENGTH"    )]
         public decimal? JvmBarcodeLength { get; set; }

        /// <summary>
        /// æ‰“印命令 
        ///</summary>
         [SugarColumn(ColumnName="PRINT_COMMAND"    )]
         public string PrintCommand { get; set; }

        /// <summary>
        /// æ‰“印命令开始 
        ///</summary>
         [SugarColumn(ColumnName="PRINT_COMMAND_BEGIN"    )]
         public string PrintCommandBegin { get; set; }

        /// <summary>
        /// æ‰“印命令结束 
        ///</summary>
         [SugarColumn(ColumnName="PRINT_COMMAND_END"    )]
         public string PrintCommandEnd { get; set; }

        /// <summary>
        /// æ¡ç æ³¨é‡Šè¡Œæ•° 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_INTERPRETATION_ROW"    )]
         public decimal? BarcodeInterpretationRow { get; set; }

        /// <summary>
        /// æ¡ç å€¼å¸¦ç‰©æ–™ç¼–码 
        ///</summary>
         [SugarColumn(ColumnName="BARCODE_ITEM"    )]
         public decimal? BarcodeItem { get; set; }

        /// <summary>
        /// æ¡ç ç±»åž‹ç¼–码 
        ///</summary>
         [SugarColumn(ColumnName="TYPE_CODE"    )]
         public decimal TypeCode { get; set; }

        /// <summary>
        /// æ˜¯å¦ä½¿ç”¨ 
        ///</summary>
         [SugarColumn(ColumnName="ISUSED"    )]
         public short? Isused { get; set; }

        /// <summary>
        /// æ‰“印模板 
        ///</summary>
         [SugarColumn(ColumnName="MBTYPE"    )]
         public decimal? Mbtype { 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="ORDER_NUM"    )]
         public decimal? OrderNum { get; set; }
    }
}

 MES.Service/Modes/MesDepTaskInfo.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,346 @@
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
///     éƒ¨é—¨ç”Ÿäº§è®¢å•ä¿¡æ¯è¡¨
/// </summary>
[SugarTable("MES_DEP_TASK_INFO")]
public class MesDepTaskInfo
{
 /// <summary>
 ///     éƒ¨é—¨ç”Ÿäº§è®¢å•ID
 /// </summary>
 [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
    public decimal Id { get; set; }

 /// <summary>
 ///     è®¢å•ç¼–号
 /// </summary>
 [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }

 /// <summary>
 ///     ERP物料编号
 /// </summary>
 [SugarColumn(ColumnName = "ERP_ITEM_NO")]
    public string ErpItemNo { get; set; }

 /// <summary>
 ///     å·¥å•æ•°é‡
 /// </summary>
 [SugarColumn(ColumnName = "PLAN_QTY")]
    public decimal? PlanQty { get; set; }

 /// <summary>
 ///     å·²ç”Ÿäº§é‡
 /// </summary>
 [SugarColumn(ColumnName = "COMPLETE_QTY")]
    public decimal? CompleteQty { get; set; }

 /// <summary>
 ///     å¤‡æŸæ•°é‡
 /// </summary>
 [SugarColumn(ColumnName = "BACKUP_QTY")]
    public decimal? BackupQty { get; set; }

 /// <summary>
 ///     ä¸‹è½½æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "DOWN_TIME")]
    public DateTime? DownTime { get; set; }

 /// <summary>
 ///     è®¡åˆ’开始时间
 /// </summary>
 [SugarColumn(ColumnName = "PLAN_BEGIN_TIME")]
    public DateTime? PlanBeginTime { get; set; }

 /// <summary>
 ///     è®¡åˆ’结束时间
 /// </summary>
 [SugarColumn(ColumnName = "PLAN_FINISH_TIME")]
    public DateTime? PlanFinishTime { get; set; }

 /// <summary>
 ///     å®žé™…完工时间
 /// </summary>
 [SugarColumn(ColumnName = "REAL_FINISH_TIME")]
    public DateTime? RealFinishTime { get; set; }

 /// <summary>
 ///     ç”Ÿäº§çŠ¶æ€(待产\生产\挂起\完工)
 /// </summary>
 [SugarColumn(ColumnName = "PRODUCE_STATE")]
    public string ProduceState { get; set; }

 /// <summary>
 ///     å®žé™…开工时间
 /// </summary>
 [SugarColumn(ColumnName = "REAL_BEGIN_TIME")]
    public DateTime? RealBeginTime { get; set; }

 /// <summary>
 ///     æ˜¯å¦æŒ‚èµ·
 /// </summary>
 [SugarColumn(ColumnName = "HANG_UP")]
    public string HangUp { get; set; }

 /// <summary>
 ///     ä»“库编号
 /// </summary>
 [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string DepotCode { get; set; }

 /// <summary>
 ///     æŠ¥åºŸæ•°é‡
 /// </summary>
 [SugarColumn(ColumnName = "DISCARD_QTY")]
    public decimal? DiscardQty { get; set; }

 /// <summary>
 ///     å§‹æ”¶æ–™æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "FIRST_ITEM_RECEIPT_TIME")]
    public DateTime? FirstItemReceiptTime { get; set; }

 /// <summary>
 ///     å§‹é½æ–™æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "FIRST_ITEM_READY_TIME")]
    public DateTime? FirstItemReadyTime { get; set; }

 /// <summary>
 ///     å®¢æˆ·ç¼–号
 /// </summary>
 [SugarColumn(ColumnName = "CUST_NO")]
    public string CustNo { get; set; }

 /// <summary>
 ///     å‡ºè´§åŒ…装方式
 /// </summary>
 [SugarColumn(ColumnName = "PACK_SHIP_TYPE")]
    public string PackShipType { get; set; }

 /// <summary>
 ///     åŒ…装注意事项
 /// </summary>
 [SugarColumn(ColumnName = "PACK_SHIP_MEMO")]
    public string PackShipMemo { get; set; }

 /// <summary>
 ///     æ˜¯å¦å·²æŽ’产
 /// </summary>
 [SugarColumn(ColumnName = "ISSCHEME")]
    public short? Isscheme { get; set; }

 /// <summary>
 ///     æ¡ç ç±»åž‹ID
 /// </summary>
 [SugarColumn(ColumnName = "BARCODE_TYPE_ID")]
    public decimal? BarcodeTypeId { get; set; }

 /// <summary>
 ///     å‘布状态
 /// </summary>
 [SugarColumn(ColumnName = "ISSUE_STATUS")]
    public short? IssueStatus { get; set; }

 /// <summary>
 ///     çŠ¶æ€ï¼ˆ0=排产未发布、1=排产已发布、2=已领料、3=已生产、4=暂停、8=已完工、9=异常）
 /// </summary>
 [SugarColumn(ColumnName = "FLAG")]
    public short? Flag { get; set; }

 /// <summary>
 ///     é¢†æ–™æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "MAT_DATE")]
    public DateTime? MatDate { get; set; }

 /// <summary>
 ///     å·¥ä½œä¸­å¿ƒ
 /// </summary>
 [SugarColumn(ColumnName = "WORKCENTER_NO")]
    public string WorkcenterNo { get; set; }

 /// <summary>
 ///     å·²ä¸‹è½½è®¢å•æ ‡è¯†Y-已下载,N-未下载
 /// </summary>
 [SugarColumn(ColumnName = "DOWN_FLAG")]
    public short? DownFlag { get; set; }

 /// <summary>
 ///     çŽ¯ä¿ä»£ç 
 /// </summary>
 [SugarColumn(ColumnName = "ROHSE_CODE")]
    public string RohseCode { get; set; }

 /// <summary>
 ///     å®¢æˆ·PO
 /// </summary>
 [SugarColumn(ColumnName = "CUST_PO")]
    public string CustPo { get; set; }

 /// <summary>
 ///     å®¢æˆ·åž‹å·
 /// </summary>
 [SugarColumn(ColumnName = "CUST_STYLE")]
    public string CustStyle { get; set; }

 /// <summary>
 ///     äº§å“æ‰“印固定值
 /// </summary>
 [SugarColumn(ColumnName = "PROC_PRINT_VALUE")]
    public string ProcPrintValue { 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 = "MEMO")]
    public string Memo { get; set; }

 /// <summary>
 ///     å®¡æ‰¹çŠ¶æ€
 /// </summary>
 [SugarColumn(ColumnName = "FCHECK_STATUS")]
    public string FcheckStatus { get; set; }

 /// <summary>
 ///     å®¡æ ¸äºº
 /// </summary>
 [SugarColumn(ColumnName = "FCHECK_BY")]
    public string FcheckBy { get; set; }

 /// <summary>
 ///     å®¡æ ¸æ—¥æœŸ
 /// </summary>
 [SugarColumn(ColumnName = "FCHECK_DATE")]
    public DateTime? FcheckDate { 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 = "DATA_FROM")]
    public string DataFrom { get; set; }

 /// <summary>
 ///     ç”Ÿäº§è®¢å•è¡¨å¤´ID
 /// </summary>
 [SugarColumn(ColumnName = "MOID")]
    public decimal? Moid { get; set; }

 /// <summary>
 ///     ç‰©æ–™ID
 /// </summary>
 [SugarColumn(ColumnName = "PARTID")]
    public decimal? Partid { get; set; }

 /// <summary>
 ///     ERP工单状态 çŠ¶æ€ï¼ˆNA-开立/FM-锁定/OP-审核/CL-关闭）
 /// </summary>
 [SugarColumn(ColumnName = "STATUS")]
    public string Status { get; set; }

 /// <summary>
 ///     ç”Ÿäº§å·¥å•
 /// </summary>
 [SugarColumn(ColumnName = "MOCODE")]
    public string Mocode { get; set; }

 /// <summary>
 ///     åˆ›å»ºæ—¥æœŸ
 /// </summary>
 [SugarColumn(ColumnName = "CREATEDATE")]
    public DateTime? Createdate { get; set; }

 /// <summary>
 ///     é¢œè‰²
 /// </summary>
 [SugarColumn(ColumnName = "COLOR_NAME")]
    public string ColorName { get; set; }

 /// <summary>
 ///     å…³é—­æ—¶é—´
 /// </summary>
 [SugarColumn(ColumnName = "CLOSETIME")]
    public DateTime? Closetime { get; set; }

 /// <summary>
 ///     ç‰©æ–™ç¼–号
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }

 /// <summary>
 ///     ä»Žè¡¨ID
 /// </summary>
 [SugarColumn(ColumnName = "MODID")]
    public decimal? Modid { get; set; }

 /// <summary>
 ///     æœ€æ–°ä¸‹è½½æ›´æ–°æ ‡è¯†
 /// </summary>
 [SugarColumn(ColumnName = "UPDATE_FLG")]
    public decimal? UpdateFlg { get; set; }

 /// <summary>
 ///     ç”Ÿäº§å·¥å•è¡Œå·
 /// </summary>
 [SugarColumn(ColumnName = "MOCODE_LINE")]
    public decimal? MocodeLine { get; set; }

 /// <summary>
 ///     ä¸å°æ€»æ•°
 /// </summary>
 [SugarColumn(ColumnName = "SILK_QTY")]
    public decimal? SilkQty { get; set; }

 /// <summary>
 ///     ä¸å°å•ä»·
 /// </summary>
 [SugarColumn(ColumnName = "SILK_PRICE")]
    public decimal? SilkPrice { get; set; }

 /// <summary>
 ///     ç‰©æ–™ID
 /// </summary>
 [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }
}

 MES.Service/Modes/MesInvBusiness2.cs

 MES.Service/Modes/MesInvItemArn.cs

 MES.Service/Modes/MesInvItemBarcodes.cs

@@ -472,7 +472,6 @@
    public decimal? LineK3id { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

 MES.Service/Modes/MesInvItemInCItems.cs

 MES.Service/Modes/MesInvItemMoves.cs

 MES.Service/Modes/MesInvItemOutCDetails.cs

@@ -239,4 +239,6 @@
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
    [SugarColumn(IsIgnore = true)] public string? Unit { get; set; }

    [SugarColumn(IsIgnore = true)] public string DepotSectionName { get; set; }
}

 MES.Service/Modes/MesInvItemOutItems.cs

@@ -87,11 +87,13 @@
    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; }
@@ -179,7 +181,7 @@
    public decimal? Allocateid { get; set; }

    /// <summary>
    ///     é¢†æ–™ç¼–号
    ///     é¢†æ–™ç¼–号/生产工单
    /// </summary>
    [SugarColumn(ColumnName = "PBILL_NO")]
    public string? PbillNo { get; set; }
@@ -208,7 +210,17 @@
    [SugarColumn(ColumnName = "TL_QTY")]
    public decimal? TlQty { get; set; }

    [SugarColumn(ColumnName = "ITEM_ID")] public decimal? ItemId { get; set; }
    /// <summary>
    ///     ç‰©æ–™ID
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }

    /// <summary>
    ///     ç‰©æ–™æŠ•æ–™å•ID
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_DABID")]
    public decimal? ItemDabid { get; set; }

    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }

 MES.Service/Modes/MesInvTransaction.cs

@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
using SqlSugar;

namespace MES.Service.Modes;

    /// <summary>
    /// åº“存事务处理表
    ///</summary>
@@ -15,60 +13,70 @@
        ///</summary>
         [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true   )]
         public decimal Id { get; set; }

        /// <summary>
        /// äº‹åŠ¡ç±»åž‹ 
        ///</summary>
         [SugarColumn(ColumnName="TRANSACTION_NAME"    )]
         public string TransactionName { get; set; }

        /// <summary>
        /// å¤‡æ³¨ 
        ///</summary>
         [SugarColumn(ColumnName="REMARK"    )]
         public string Remark { 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>
        /// å•æ®ID 
        ///</summary>
         [SugarColumn(ColumnName="BUSINESS_ID"    )]
         public decimal? BusinessId { get; set; }

        /// <summary>
        /// äº¤æ˜“类型|1-入库0-转库-1出库 
        ///</summary>
         [SugarColumn(ColumnName="BUSINESS_TYPE"    )]
         public decimal? BusinessType { get; set; }

        /// <summary>
        /// äº‹åŠ¡ç¼–码 
        ///</summary>
         [SugarColumn(ColumnName="TRANSACTION_NO"    )]
         public decimal? TransactionNo { get; set; }

        /// <summary>
        /// åˆ†åŽ‚编码 
        ///</summary>
         [SugarColumn(ColumnName="FACTORY"    )]
         public string Factory { get; set; }

        /// <summary>
        /// å…¬å¸ä»£ç  
        ///</summary>
         [SugarColumn(ColumnName="COMPANY"    )]
         public string Company { get; set; }
    }
}

 MES.Service/Modes/MesItems.cs

@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;

namespace MES.Service.Modes
{
namespace MES.Service.Modes;

    /// <summary>
    /// ç‰©æ–™ä¿¡æ¯
    ///</summary>
@@ -318,5 +315,4 @@
        public decimal? ItemId { get; set; }

        [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    }
}

 MES.Service/Modes/MesQaItemsDetect01.cs

 MES.Service/Modes/MesQaItemsDetectDetail5.cs

 MES.Service/Modes/MesRfPrnbarcode.cs

@@ -1,7 +1,7 @@
using SqlSugar;

namespace MES.Service.Modes
{
namespace MES.Service.Modes;

    /// <summary>
    /// æ‰‹æŒæ¡ç æ‰“印暂存表
    ///</summary>
@@ -151,5 +151,4 @@
        ///</summary>
        [SugarColumn(ColumnName = "CREATE_DATE")]
        public DateTime? CreateDate { get; set; }
    }
}

 MES.Service/Modes/Organize.cs

@@ -8,7 +8,6 @@
public class Organize
{
    /// <summary>
    ///
    /// </summary>
    [SugarColumn(ColumnName = "ID")]
    public decimal? Id { get; set; }

 MES.Service/Modes/Purdhb.cs

 MES.Service/Modes/Purdka.cs

 MES.Service/Modes/QsItemOqcReq.cs

@@ -1,4 +1,3 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;

@@ -74,7 +73,6 @@
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "MODIFY1_BY")]
    public string? Modify1By { get; set; }

 MES.Service/Modes/QsQaItemXj.cs

@@ -75,7 +75,6 @@
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "MODIFY1_BY")]
    public string? Modify1By { get; set; }
@@ -99,19 +98,16 @@
    public string? MoidNum { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT_BY")]
    public string? FsubmitBy { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT_DATE")]
    public DateTime? FsubmitDate { get; set; }

    /// <summary>
    ///  
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT")]
    public decimal? Fsubmit { get; set; }

 MES.Service/Modes/Womdab.cs

@@ -1,9 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
using SqlSugar;

namespace MES.Service.Modes;

    /// <summary>
    /// å·¥å•å­è¡¨
    ///</summary>
@@ -15,110 +13,135 @@
        ///</summary>
         [SugarColumn(ColumnName="ID"    )]
         public decimal? Id { get; set; }

        /// <summary>
        /// PID 
        ///</summary>
         [SugarColumn(ColumnName="PID"    )]
         public decimal? Pid { get; set; }

        /// <summary>
        /// å·¥å•å•å· 
        ///</summary>
         [SugarColumn(ColumnName="DAB001"    )]
         public string Dab001 { get; set; }

        /// <summary>
        /// åºå· 
        ///</summary>
         [SugarColumn(ColumnName="DAB002"    )]
         public string Dab002 { get; set; }

        /// <summary>
        /// ææ–™ç¼–码 
        ///</summary>
         [SugarColumn(ColumnName="DAB003"    )]
         public string Dab003 { get; set; }

        /// <summary>
        /// ææ–™åç§° 
        ///</summary>
         [SugarColumn(ColumnName="DAB004"    )]
         public string Dab004 { get; set; }

        /// <summary>
        /// ææ–™è§„æ ¼ 
        ///</summary>
         [SugarColumn(ColumnName="DAB005"    )]
         public string Dab005 { get; set; }

        /// <summary>
        /// éœ€é¢†ç”¨é‡ 
        ///</summary>
         [SugarColumn(ColumnName="DAB006"    )]
         public decimal? Dab006 { get; set; }

        /// <summary>
        /// å·²é¢†ç”¨é‡ 
        ///</summary>
         [SugarColumn(ColumnName="DAB007"    )]
         public decimal? Dab007 { get; set; }

        /// <summary>
        /// å·¥è‰º 
        ///</summary>
         [SugarColumn(ColumnName="DAB008"    )]
         public string Dab008 { get; set; }

        /// <summary>
        /// å•ä½ 
        ///</summary>
         [SugarColumn(ColumnName="DAB009"    )]
         public string Dab009 { get; set; }

        /// <summary>
        /// ææ–™ç±»åž‹ 
        ///</summary>
         [SugarColumn(ColumnName="DAB010"    )]
         public string Dab010 { get; set; }

        /// <summary>
        /// ä¸»æ–™ 
        ///</summary>
         [SugarColumn(ColumnName="DAB011"    )]
         public string Dab011 { get; set; }

        /// <summary>
        /// ç»„成用量 
        ///</summary>
         [SugarColumn(ColumnName="DAB012"    )]
         public decimal? Dab012 { get; set; }

        /// <summary>
        /// åº•æ•° 
        ///</summary>
         [SugarColumn(ColumnName="DAB013"    )]
         public decimal? Dab013 { get; set; }

        /// <summary>
        /// æ˜¯å¦æ›¿æ–™ 
        ///</summary>
         [SugarColumn(ColumnName="DAB014"    )]
         public string Dab014 { get; set; }

        /// <summary>
        /// ç‚¹ä½ 
        ///</summary>
         [SugarColumn(ColumnName="DAB015"    )]
         public string Dab015 { get; set; }

        /// <summary>
        /// æŠ•æ–™å•å· 
        ///</summary>
         [SugarColumn(ColumnName="DAB016"    )]
         public string Dab016 { get; set; }

        /// <summary>
        /// ä»“库编码 
        ///</summary>
         [SugarColumn(ColumnName="DAB017"    )]
         public string Dab017 { get; set; }

        /// <summary>
        /// ä»“库名称 
        ///</summary>
         [SugarColumn(ColumnName="DAB018"    )]
         public string Dab018 { get; set; }

        /// <summary>
        /// é¢†æ–™æ–¹å¼ 
        ///</summary>
         [SugarColumn(ColumnName="DAB019"    )]
         public string Dab019 { get; set; }

        /// <summary>
        /// å›ºå®šæŸè€— 
        ///</summary>
         [SugarColumn(ColumnName="SCRAPQTY"    )]
         public decimal? Scrapqty { get; set; }
    }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "ERP_ID")]
    public decimal? ErpId { get; set; }
}

 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/service/QC/XJService.cs

@@ -102,7 +102,7 @@
                    Id = b.Id,
                    ItemNo = b.ItemNo,
                    ItemName = b.ItemName,
                    ItemModel = b.ItemModel,
                    ItemModel = b.ItemModel
                }).ToList();
    }


 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs

@@ -28,7 +28,8 @@
                    c.ItemNo == t.ItemNo && c.Company == t.Company &&
                    c.Factory == t.Factory,
                    JoinType.Left,
                    t.Fpurchaseunitid == u.Id.ToString() && t.Factory == u.Factory &&
                    t.Fpurchaseunitid == u.Id.ToString() &&
                    t.Factory == u.Factory &&
                    t.Company == u.Company
                })
            .Where((c, t, u) => c.Mid == query.id)

 MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs

@@ -81,30 +81,22 @@

    public MesInvItemOutCDetails GetOutList(WarehouseQuery query)
    {



        var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
            .Where(s => s.ItemBarcode == query.barcode).Count();

        if (mesInvItemBarcodes <= 0)
        {
            throw new Exception("条码不存在");
        }
        if (mesInvItemBarcodes <= 0) throw new Exception("条码不存在");

        var mesInvItemOutCDetails = Db.Queryable<MesInvItemOutCDetails>()
            .Where(s => s.ItemBarcode == query.barcode && s.Receive == 0).Count();
            .Where(s => s.ItemBarcode == query.barcode && s.Receive == 0)
            .Count();



        if (mesInvItemOutCDetails <= 0)
        {
            throw new Exception("条码不符合接收条件,请检查！");
        }
        if (mesInvItemOutCDetails <= 0) throw new Exception("条码不符合接收条件,请检查！");



        var entity = Db.Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>((a, b, c) =>
        var entity = Db
            .Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>(
                (a, b, c) =>
                  new JoinQueryInfos(JoinType.Left, a.ItemOutId == b.Id,
                                    JoinType.Left, a.ItemNo == c.ItemNo))
              .Where((a, b, c) => a.ItemBarcode == query.barcode)
@@ -118,9 +110,7 @@
              }).First();

        if (entity == null)
        {
            throw new Exception("出库条码" + query.barcode + " ä¸å­˜åœ¨ï¼Œè¯·ç¡®è®¤!");
        }


        return entity;
@@ -132,19 +122,16 @@
        var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
            .Where(s => s.ItemBarcode == query.barcode).Count();

        if (mesInvItemBarcodes <= 0)
        {
            throw new Exception("条码不存在");
        }
        if (mesInvItemBarcodes <= 0) throw new Exception("条码不存在");

        var mesInvItemOutCDetails = Db.Queryable<MesInvItemOutCDetails>()
            .Where(s => s.ItemBarcode == query.barcode).First();

        MaterialReceipt entity = new MaterialReceipt
        var entity = new MaterialReceipt
        {
            InvItemoutCDetails = GetMesInvItemOutCDetails(mesInvItemOutCDetails.PbillNo),
            InvItemoutCDetails =
                GetMesInvItemOutCDetails(mesInvItemOutCDetails.PbillNo),
            ItemOuts = GetMesInvItemOuts(mesInvItemOutCDetails.PbillNo)

        };

        return entity;
@@ -154,40 +141,30 @@
    public MesInvItemOutCDetails confirmReceipt(WarehouseQuery query)
    {
        if (string.IsNullOrWhiteSpace(query.barcode))
        {
            throw new Exception("请扫出库条码！");
        }

        if (string.IsNullOrWhiteSpace(query.billNo))
        {
            throw new Exception("出库单据不能为空！");
        }




        var barcodeInfo = GetBarcodeInfo(query.barcode);


        if (barcodeInfo.Receive == 1)
        {
            throw new Exception("此条码已经接收,请检查！");
        }
        if (barcodeInfo.Receive == 1) throw new Exception("此条码已经接收,请检查！");


        UseTransaction(db =>
        {

            var count = db.Updateable<MesInvItemOutCDetails>()
             .SetColumns(s => s.Receive == 1)
             .Where(s => s.ItemBarcode == barcodeInfo.ItemBarcode).ExecuteCommand();
                .Where(s => s.ItemBarcode == barcodeInfo.ItemBarcode)
                .ExecuteCommand();

            return 1;
        });

        return barcodeInfo;
    }



    public List<MesInvItemOutCDetails> GetMesInvItemOutCDetails(string billno)
@@ -203,12 +180,10 @@
    }



    private MesInvItemOutCDetails GetBarcodeInfo(string itemBarcode)
    {
        // Get barcode information
        return Db.Queryable<MesInvItemOutCDetails>()
            .First(b => b.ItemBarcode == itemBarcode);
    }

}

 MES.Service/service/Warehouse/MesInvItemOutsManager.cs

@@ -3,6 +3,7 @@
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Newtonsoft.Json;
using SqlSugar;
using DbType = System.Data.DbType;

@@ -12,6 +13,114 @@
{
    //当前类已经继承了 Repository å¢žã€åˆ ã€æŸ¥ã€æ”¹çš„方法
    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvItemOutsManager.cs

    public List<MesInvItemOuts> GetProductionPickPage(WarehouseQuery query)
    {
        return Db.Queryable<MesInvItemOuts, MesDepots>((a, o) =>
                new JoinQueryInfos(
                    JoinType.Left,
                    o.DepotCode == a.DepotCode && a.Company == o.Company &&
                    a.Factory == o.Factory
                ))
            .Where((a, o) => a.BillTypeId == 200 &&
                             a.TransactionNo == 201 &&
                             a.Factory == "1000" &&
                             a.Company == "1000" &&
                             a.IsVisual == 1)
            .WhereIF(query.status != null, (a, o) => a.Status == query.status)
            .WhereIF(query.id != null, (a, o) => a.Id == query.id)
            .Select((a, o) => new MesInvItemOuts
            {
                Id = a.Id,
                Sapstatus = a.Sapstatus,
                OutDate = a.OutDate,
                CheckDate = a.CheckDate,
                BoardItem = a.BoardItem,
                WorkNo = a.WorkNo,
                OutPart = a.OutPart,
                PbillNo = a.PbillNo,
                OutType = a.OutType,
                CreateBy = a.CreateBy,
                Status = a.Status,
                CheckUser = a.CheckUser,
                ItemOutNo = a.ItemOutNo,
                DepotName = o.DepotName // éœ€è¦åŠ¨æ€æ·»åŠ çš„字段
            })
            .ToPageList(query.PageIndex, query.Limit);
    }

    public MaterialReceipt GetProductionPick(WarehouseQuery query)
    {
        var form = new MaterialReceipt();
        if (query.id != null)
        {
            var mesInvItemOutsList = GetProductionPickPage(query);
            if (mesInvItemOutsList.Count <= 0) return form;

            form.ItemOuts = mesInvItemOutsList[0];
            form.ItemsList = getProductionItemsList(query);
            form.InvItemoutCDetails = GetProductionDetails(query);
        }

        return form;
    }

    private List<MesInvItemOutItems> getProductionItemsList(
        WarehouseQuery query)
    {
        return Db.Queryable<MesInvItemOutItems, MesItems, MesDepTaskInfo>(
                (c, s, f) => new JoinQueryInfos(
                    JoinType.Inner, c.ItemNo == s.ItemNo,
                    JoinType.Left, f.TaskNo == c.TaskNo && f.ItemNo == c.ItemNo
                ))
            .Where((c, s, f) => c.ItemOutId == query.id)
            .OrderBy(c => c.Id)
            .Select((c, s, f) => new MesInvItemOutItems
            {
                Id = c.Id,
                ItemNo = c.ItemNo,
                Quantity = c.Quantity,
                TaskNo = c.TaskNo,
                Remark = c.Remark,
                ItemName = s.ItemName, // åŠ¨æ€å­—段
                ItemModel = s.ItemModel, // åŠ¨æ€å­—段
                ItemUnit = SqlFunc.Subqueryable<MesItems>()
                    .Where(si => si.ItemUnit == s.ItemUnit)
                    .Select(si =>
                        SqlFunc.MappingColumn<string>(
                            "F_GETUNITNAME(si.Item_Unit)")) // åŠ¨æ€å­—段
            })
            .ToList();
    }

    private List<MesInvItemOutCDetails> GetProductionDetails(
        WarehouseQuery query)
    {
        return Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>(
                (b, c, d) => new JoinQueryInfos(
                    JoinType.Left,
                    b.ItemNo == c.ItemNo && b.Company == c.Company &&
                    b.Factory == c.Factory,
                    JoinType.Left,
                    d.DepotCode == b.DepotCode && b.Company == d.Company &&
                    b.Factory == d.Factory
                ))
            .Where((b, c, d) => b.ItemOutId == query.id)
            .Select((b, c, d) => new MesInvItemOutCDetails
            {
                ForceOutFlag = b.ForceOutFlag,
                DepotSectionCode = b.DepotSectionCode,
                ItemNo = b.ItemNo,
                Quantity = b.Quantity,
                ItemBarcode = b.ItemBarcode,
                ItemName = c.ItemName,
                ItemModel = c.ItemModel,
                DepotName = d.DepotName,
                DepotCode = b.DepotCode
            })
            .ToList();
    }

    public bool ScanCode(WarehouseQuery query)
    {
@@ -703,4 +812,157 @@

        return ItemOutNos;
    }
    //生产领料单审核前校验


    public MessageCenter SaveProductionMessageCenter(WarehouseQuery entity)
    {
        var message = ProductionMesToErpParam(entity);

        var executeReturnIdentity =
            Db.Insertable(message).ExecuteReturnIdentity();
        if (executeReturnIdentity > 0)
        {
            message.Id = executeReturnIdentity;
            message.Pid = executeReturnIdentity;
            return message;
        }

        throw new Exception("获取数据失败");
    }

    private MessageCenter ProductionMesToErpParam(WarehouseQuery query)
    {
        var erpParameters = "";
        var title = "";
        var tableName = "INV_ITEM_OUTS_" + query.Type;
        if ("A".Equals(query.Type))
        {
            erpParameters =
                GetProductionErpParameters(query.billNo, query.userName);
            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/ProductionPick/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;
    }

    private string GetProductionErpParameters(string? queryBillNo,
        string? userName)
    {
        userName ??= "system";
        var mesInvItemOuts = Db.Queryable<MesInvItemOuts>()
            .Where(it => it.ItemOutNo == queryBillNo)
            .First();

        if (mesInvItemOuts == null) throw new Exception("领料单号不存在");

        var womcaa = Db.Queryable<Womcaa>()
            .Where(it => it.Caa020 == mesInvItemOuts.WorkNo)
            .First();

        if (womcaa == null) throw new Exception("任务单号不存在");

        var Departmentcode = Db.Queryable<SysDepartment, MesInvItemOuts>(
                (a, b) =>
                    new JoinQueryInfos(JoinType.Left,
                        a.Departmentname == b.OutPart
                    )).Where((a, b) =>
                b.OutPart == mesInvItemOuts.OutPart &&
                b.ItemOutNo == queryBillNo).Select(a => a.Departmentcode)
            .First();

        if (string.IsNullOrEmpty(Departmentcode))
            throw new Exception("部门信息不存在");

        // æ£€æŸ¥é¢†æ–™å•çŠ¶æ€
        if (mesInvItemOuts.Status == 1) throw new Exception("领料单已审核，不能重复推送");

        var C_OUT_ITEMS = Db
            .Queryable<MesInvItemOutItems, Womdab, Womdaa, Womcaa, Womcab>(
                (c, b, d, e, f) =>
                    new JoinQueryInfos(
                        JoinType.Left, b.Id == c.ItemDabid,
                        JoinType.Left, d.Id == b.Pid,
                        JoinType.Left, e.Caa001 == d.Daa021,
                        JoinType.Left, f.Eid == e.Erpid
                    ))
            .Where((c, b, d, e, f) => c.ItemOutId == mesInvItemOuts.Id)
            .Select((c, b, d, e, f) => new
            {
                c.Id,
                c.ItemNo,
                c.Quantity,
                c.DepotCode,
                c.DepotSectionCode,
                c.ItemId,
                erpId = b.ErpId,
                e.Caa015,
                f.PositionNo
            }).ToList();

        var scllentryList = new List<dynamic>();

        foreach (var item in C_OUT_ITEMS)
        {
            var sql =
                "SELECT FNAME FROM MES_UNIT WHERE ID = (SELECT ITEM_UNIT FROM MES_ITEMS WHERE ID = '" +
                item.ItemId + "')";
            var C_ITEM_UNIT = Db.Ado.SqlQuerySingle<string>(sql);

            scllentryList.Add(new
            {
                FMaterialId = item.ItemNo,
                FUnitID = C_ITEM_UNIT,
                FAppQty = item.Quantity,
                FActualQty = item.Quantity,
                FStockId = item.DepotCode,
                FPPBomEntryId = item.erpId,
                F_UNW_Text_xsddh = item.Caa015,
                F_UNW_TEXT_WZH = item.PositionNo,
                F_MES_ENTRYID = item.Id
            });
        }

        var dataJson = new
        {
            F_MES_ID = mesInvItemOuts.Id,
            FDate = mesInvItemOuts.CreateBy,
            FPickerId = userName,
            F_UNW_LargeText_BZ = " ",
            F_UNW_KH = " ",
            F_UNW_DDSL = womcaa.Caa012,
            F_UNW_Text_CZG = userName,
            scllentry = scllentryList
        };

        return "taskname=SCLL&mesid=" + mesInvItemOuts.Id +
               "&optype=create&datajson=" +
               JsonConvert.SerializeObject(
                   dataJson);
    }

    public bool AuditProduction(WarehouseQuery query)
    {
        query.status = 1;
        //审核
        return Update(query);
    }
}

 MES.Service/service/Warehouse/OrganizeService.cs

@@ -1,4 +1,5 @@
using System.Data;
using System.Dynamic;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -28,10 +29,7 @@
        var printCommandResult = Db.Queryable<MesBarcodeType>()
            .Where(t => t.TypeCode == 108)
            .First();
        if (printCommandResult == null)
        {
            throw new Exception("模版ID为空，请设置打印格式！");
        }
        if (printCommandResult == null) throw new Exception("模版ID为空，请设置打印格式！");

        var cPrintCommand = printCommandResult.Mbtype;
        var cBid = printCommandResult.Id;
@@ -41,40 +39,21 @@
                s.ItemNo == query.ItemNo && s.Factory == "1000" &&
                s.Company == "1000")
            .First();
        if (cMesItems == null)
        {
            throw new Exception("物料信息不存在该物料编码，请维护！");
        }
        if (cMesItems == null) throw new Exception("物料信息不存在该物料编码，请维护！");

        if (string.IsNullOrEmpty(query.ItemNo))
        {
            throw new Exception("请录入物料编码");
        }
        if (string.IsNullOrEmpty(query.ItemNo)) throw new Exception("请录入物料编码");

        if (string.IsNullOrEmpty(query.ItemModel))
        {
            throw new Exception("请输入完物料编码后，点击确认生成规格！");
        }

        if (string.IsNullOrEmpty(query.OrgName))
        {
            throw new Exception("请录入组织");
        }
        if (string.IsNullOrEmpty(query.OrgName)) throw new Exception("请录入组织");

        if (string.IsNullOrEmpty(query.OrgOwner))
        {
            throw new Exception("请录入货主");
        }
        if (string.IsNullOrEmpty(query.OrgOwner)) throw new Exception("请录入货主");

        if (string.IsNullOrEmpty(query.ItemNum))
        {
            throw new Exception("请录入物料数量");
        }
        if (string.IsNullOrEmpty(query.ItemNum)) throw new Exception("请录入物料数量");

        if (string.IsNullOrEmpty(query.Printnumn))
        {
            throw new Exception("请录入条码数量");
        }

        var cId =
            Db.Ado.GetInt(
@@ -89,7 +68,7 @@
                .Where(it => it.CreateDate < DateTime.Now.AddDays(-10))
                .ExecuteCommand();

            for (int i = 1; i <= int.Parse(query.Printnumn); i++)
            for (var i = 1; i <= int.Parse(query.Printnumn); i++)
            {
                var cIndate = DateTime.Now.ToString("yyyyMMdd");

@@ -104,19 +83,12 @@
                        query.ItemNo + cIndate, query.ItemNo + cIndate, 0);
                    serial = barcodeResult.Value;
                    poBarcodeComand = barcodeResult.Msg;
                    if (!string.IsNullOrEmpty(poBarcodeComand))
                    {
                        return null;
                    }
                    if (!string.IsNullOrEmpty(poBarcodeComand)) return null;

                    if (string.IsNullOrEmpty(serial))
                    {
                        cBarcode2 = "9";
                    }
                    else
                    {
                        cBarcode2 = "9" + serial[1..];
                    }
                    itemBarcode = query.ItemNo + cIndate + cBarcode2;
                }
                else
@@ -135,10 +107,7 @@
                            query.ItemNo + cIndate, query.ItemNo + cIndate, 0);
                        serial = barcodeResult.Value;
                        poBarcodeComand = barcodeResult.Msg;
                        if (!string.IsNullOrEmpty(poBarcodeComand))
                        {
                            return null;
                        }
                        if (!string.IsNullOrEmpty(poBarcodeComand)) return null;

                        cBarcode2 = "9" + serial.Substring(1);
                        itemBarcode = query.ItemNo + cIndate +
@@ -155,7 +124,6 @@
                        s.Company == "1000")
                    .Count();
                if (cCount == 0)
                {
                    // Insert new barcode
                    Db.Insertable(new MesInvItemBarcodes
                    {
@@ -174,7 +142,6 @@
                        OrgName = query.OrgName,
                        OrgOwner = query.OrgOwner
                    }).ExecuteCommand();
                }

                // Insert record into MES_RF_PRNBARCODE
                Db.Insertable(new MesRfPrnbarcode
@@ -196,7 +163,7 @@
                    Strp11 = poBarcode,
                    Strp12 = query.ItemName ?? " ",
                    Strp15 = query.OrgName ?? " ",
                    Strp16 = query.OrgOwner ?? " ",
                    Strp16 = query.OrgOwner ?? " "
                }).ExecuteCommand();
            }

@@ -254,7 +221,7 @@
            var resultValue = outputResult.Value?.ToString();
            var messageValue = outputMessage.Value?.ToString();

            dynamic m = new System.Dynamic.ExpandoObject();
            dynamic m = new ExpandoObject();
            m.Value = resultValue;
            m.Msg = messageValue;


 MESApplication/Controllers/BasicData/MesItemsController.cs

 MESApplication/Controllers/Warehouse/MesInvItemOutCDetailsController.cs

@@ -18,10 +18,8 @@
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetOutItemList")]

    public ResponseResult GetOutItemList(WarehouseQuery query)
    {

        try
        {
            dynamic resultInfos = new ExpandoObject();
@@ -37,9 +35,6 @@
        {
            return ResponseResult.ResponseError(ex);
        }



    }

    /// <summary>
@@ -47,7 +42,6 @@
    /// </summary>
    /// <param name="query"></param>
    /// <returns></returns>

    [HttpPost("GetFormList")]
    public ResponseResult GetFormList(WarehouseQuery query)
    {
@@ -92,7 +86,6 @@
            return ResponseResult.ResponseError(ex);
        }
    }



    /***进入模版管理可以修改模版***/

 MESApplication/Controllers/Warehouse/MesInvItemOutsController.cs

@@ -13,6 +13,89 @@
{
    private readonly MesInvItemOutsManager m = new();

    //GetProductionPick
    [HttpPost("GetProductionPick")]
    public ResponseResult GetProductionPick(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetProductionPick(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //GetProductionPickPage
    [HttpPost("GetProductionPickPage")]
    public ResponseResult GetProductionPickPage(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetProductionPickPage(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //AuditProduction
    [HttpPost("AuditProduction")]
    public ResponseResult AuditProduction(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.AuditProduction(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    //MesToErp
    [HttpPost("SaveProductionMessageCenter")]
    public ResponseResult SaveProductionMessageCenter(WarehouseQuery entity)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.SaveProductionMessageCenter(entity);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    [HttpPost("ScanCode")]
    public ResponseResult ScanCode(WarehouseQuery entity)

 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