入库检更改部分

啊鑫

2024-08-23 b66929fcda6db58e42d164cffffceda7548c406e

入库检更改部分

 MES.Service/Dto/service/RKJDaa001.cs

@@ -9,37 +9,16 @@
public class RKJDaa001 : Page
{
    // é€æ£€æ‰¹æ¬¡
    [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; }
    [SugarColumn(ColumnName = "ITEM_IN_ID")]
    public decimal? ItemInId { get; set; }

    // ä»»åŠ¡å•å·
    [SugarColumn(ColumnName = "TASK_NO")] public string? TaskNo { get; set; }
    [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; }

    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }

    // è®¢å•æ•°é‡
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

    // ç”Ÿäº§è®¢å•
    [SugarColumn(ColumnName = "MOCODE")] public string? Mocode { get; set; }

    // è§„格型号
    [SugarColumn(ColumnName = "BOARD_MODEL")]
    public string? BoardModel { get; set; }

    // äº§å“ç±»åž‹
    [SugarColumn(ColumnName = "CBILL_NO")] public string? cbillNo { get; set; }

    // äº§çº¿ç¼–码
    [SugarColumn(ColumnName = "LINE_NO")] public string? LineNo { get; set; }


    //ITEM_NO
    [SugarColumn(ColumnName = "ITEM_NO")] public string? itemNo { get; set; }


    [SugarColumn(ColumnName = "COLOR_NAME")]
    public string? ColorName { get; set; }


    [SugarColumn(ColumnName = "BOARD_NAME")]
    public string? BoardName { get; set; }
}

 MES.Service/Dto/service/RkDaa002.cs

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

namespace MES.Service.Dto.service;

[SugarTable("V_QS_RK_DAA002")] // Specifies the table/view name
public class RkDaa002
{
    [SugarColumn(ColumnName = "BILL_NO")] public string? BillNo { get; set; }

    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

    [SugarColumn(ColumnName = "CBILL_NO")] public string? CBillNo { get; set; }

    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    [SugarColumn(ColumnName = "ITEM_IN_ID")]
    public decimal? ItemInId { get; set; }

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

    [SugarColumn(ColumnName = "ITEM_NO")] public string? ItemNo { get; set; }

    [SugarColumn(ColumnName = "ITEM_NAME")]
    public string? ItemName { get; set; }
}

 MES.Service/Modes/MesInvItemIns.cs

@@ -19,7 +19,7 @@
    ///     å…¥åº“单号
    /// </summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string BillNo { get; set; }
    public string? BillNo { get; set; }

    /// <summary>
    ///     çŠ¶æ€|0-未审核1-审核入库\结案
@@ -37,13 +37,13 @@
    ///     åŽŸå› 
    /// </summary>
    [SugarColumn(ColumnName = "REASON")]
    public string Reason { get; set; }
    public string? Reason { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string CreateBy { get; set; }
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
@@ -55,7 +55,7 @@
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
@@ -79,25 +79,25 @@
    ///     å¤‡æ³¨
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string Remark { get; set; }
    public string? Remark { get; set; }

    /// <summary>
    ///     é€è´§å•å·
    /// </summary>
    [SugarColumn(ColumnName = "PAPER_BILL_NO")]
    public string PaperBillNo { get; set; }
    public string? PaperBillNo { get; set; }

    /// <summary>
    ///     é€€æ–™äººå·¥å·
    /// </summary>
    [SugarColumn(ColumnName = "USER_NO_BACK")]
    public string UserNoBack { get; set; }
    public string? UserNoBack { get; set; }

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

    /// <summary>
    ///     å®¡æ ¸æ—¥æœŸ
@@ -109,7 +109,7 @@
    ///     ç”Ÿäº§è®¢å•å·
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }
    public string? TaskNo { get; set; }

    /// <summary>
    ///     å…¥åº“日期
@@ -121,7 +121,7 @@
    ///     æ£€éªŒç»“æžœ
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_RES")]
    public string CheckRes { get; set; }
    public string? CheckRes { get; set; }

    /// <summary>
    ///     å·²æ¡æ•°é‡
@@ -133,31 +133,31 @@
    ///     é¢†æ–™å·¥æ®µ
    /// </summary>
    [SugarColumn(ColumnName = "MMLIST")]
    public string Mmlist { get; set; }
    public string? Mmlist { get; set; }

    /// <summary>
    ///     SAP采购订单号
    /// </summary>
    [SugarColumn(ColumnName = "EBELN")]
    public string Ebeln { get; set; }
    public string? Ebeln { get; set; }

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

    /// <summary>
    ///     äº‹åŠ¡ç±»åž‹ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "TRANSCTION_NO")]
    public string TransctionNo { get; set; }
    public string? TransctionNo { get; set; }

    /// <summary>
    ///     ä¾›åº”商编码
    /// </summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { get; set; }
    public string? SuppNo { get; set; }

    /// <summary>
    ///     å…¥åº“状态
@@ -169,7 +169,7 @@
    ///     å·¥åŽ‚编码
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
    public string? Factory { get; set; }

    /// <summary>
    ///     æ˜¯å¦å·²å›žå†™SAP
@@ -181,7 +181,7 @@
    ///     SAP返回单据
    /// </summary>
    [SugarColumn(ColumnName = "SAPNO")]
    public string Sapno { get; set; }
    public string? Sapno { get; set; }

    /// <summary>
    ///     SAP返回年份
@@ -193,7 +193,7 @@
    ///     SAP返回信息
    /// </summary>
    [SugarColumn(ColumnName = "SAPTEXT")]
    public string Saptext { get; set; }
    public string? Saptext { get; set; }

    /// <summary>
    ///     ç¡®è®¤å…¥åº“日期
@@ -211,7 +211,7 @@
    ///     å®¡æ ¸å…¥åº“人
    /// </summary>
    [SugarColumn(ColumnName = "INSBY")]
    public string Insby { get; set; }
    public string? Insby { get; set; }

    /// <summary>
    ///     æ˜¯å¦æ˜¾ç¤º
@@ -223,7 +223,7 @@
    ///     å…¬å¸ä»£ç 
    /// </summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string Company { get; set; }
    public string? Company { get; set; }

    /// <summary>
    ///     æ€¥æ–™æ ‡è¯†
@@ -235,7 +235,7 @@
    ///     é‡‡è´­å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }
    public string? LineNo { get; set; }

    /// <summary>
    ///     å†²é”€äº‹åŠ¡ç±»åž‹ç¼–码
@@ -247,43 +247,43 @@
    ///     å·¥å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "TASK_LINO")]
    public string TaskLino { get; set; }
    public string? TaskLino { get; set; }

    /// <summary>
    ///     æŠ•æ–™é€šçŸ¥å•å•å·
    /// </summary>
    [SugarColumn(ColumnName = "FBILLNO")]
    public string Fbillno { get; set; }
    public string? Fbillno { get; set; }

    /// <summary>
    ///     æŠ•æ–™å•è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "FBILL_LINO")]
    public string FbillLino { get; set; }
    public string? FbillLino { get; set; }

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

    /// <summary>
    ///     å®¢æˆ·åç§°
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NAME")]
    public string CustName { get; set; }
    public string? CustName { get; set; }

    /// <summary>
    ///     IQC检验单号
    /// </summary>
    [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
    public string IqcReleaseNo { get; set; }
    public string? IqcReleaseNo { get; set; }

    /// <summary>
    ///     åˆ°è´§å•å·
    /// </summary>
    [SugarColumn(ColumnName = "CBILL_NO")]
    public string CbillNo { get; set; }
    public string? CbillNo { get; set; }

    /// <summary>
    ///     0 ç”³è¯·å•ï¼Œ1入库单标识
@@ -295,7 +295,7 @@
    ///     å…¥åº“审核人
    /// </summary>
    [SugarColumn(ColumnName = "FCHECK_USER")]
    public string FcheckUser { get; set; }
    public string? FcheckUser { get; set; }

    /// <summary>
    ///     å…¥åº“审核日期
@@ -307,7 +307,7 @@
    ///     ä»»åŠ¡æ±‡æŠ¥å•
    /// </summary>
    [SugarColumn(ColumnName = "RBILL_NO")]
    public string RbillNo { get; set; }
    public string? RbillNo { get; set; }

    //在数据库查询时忽略这个字段
    [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }

 MES.Service/Modes/MesInvTransaction.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,74 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// åº“存事务处理表
    ///</summary>
    [SugarTable("MES_INV_TRANSACTION")]
    public class MesInvTransaction
    {
        /// <summary>
        /// ID 
        ///</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/QsItemOqcReq.cs

@@ -12,52 +12,6 @@
public class QsItemOqcReq
{
    /// <summary>
    ///     å·¥å•å·
    /// </summary>
    [Column("BILL_NO")]
    [SugarColumn(ColumnName = "BILL_NO")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "工单号长度不能超出50")]
    public string? BillNo { get; set; }

    /// <summary>
    ///     åˆ›å»ºäºº
    /// </summary>
    [Column("CREATE_BY")]
    [SugarColumn(ColumnName = "CREATE_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "创建人长度不能超出100")]
    public string? CreateBy { get; set; }

    /// <summary>
    ///     åˆ›å»ºæ—¥æœŸ
    /// </summary>
    [Column("CREATE_DATE")]
    [SugarColumn(ColumnName = "CREATE_DATE")] //用于SqlSugar
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     æ£€éªŒäººå‘˜
    /// </summary>
    [Column("FCHECK_BY")]
    [SugarColumn(ColumnName = "FCHECK_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验人员长度不能超出100")]
    public string? FcheckBy { get; set; }

    /// <summary>
    ///     æ£€éªŒæ—¥æœŸ
    /// </summary>
    [Column("FCHECK_DATE")]
    [SugarColumn(ColumnName = "FCHECK_DATE")] //用于SqlSugar
    public DateTime? FcheckDate { get; set; }

    /// <summary>
    ///     æ£€éªŒç»“æžœ
    /// </summary>
    [Column("FCHECK_RESU")]
    [SugarColumn(ColumnName = "FCHECK_RESU")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验结果长度不能超出100")]
    public string? FcheckResu { get; set; }

    /// <summary>
    ///     åºåˆ—SEQ_QS_RKJ
    /// </summary>
    [Column("ID")]
@@ -66,70 +20,121 @@
    public decimal? Id { get; set; }

    /// <summary>
    ///     ç‰©æ–™ç¼–码
    /// </summary>
    [Column("ITEM_NO")]
    [SugarColumn(ColumnName = "ITEM_NO")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "物料编码长度不能超出100")]
    public string? ItemNo { get; set; }

    /// <summary>
    ///     æ›´æ–°äºº
    /// </summary>
    [Column("LASTUPDATE_BY")]
    [SugarColumn(ColumnName = "LASTUPDATE_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "更新人长度不能超出100")]
    public string? LastupdateBy { get; set; }

    /// <summary>
    ///     æ›´æ–°æ—¥æœŸ
    /// </summary>
    [Column("LASTUPDATE_DATE")]
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //用于SqlSugar
    public DateTime? LastupdateDate { get; set; }

    /// <summary>
    /// </summary>
    [Column("MODIFY1_BY")]
    [SugarColumn(ColumnName = "MODIFY1_BY")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "Modify1By长度不能超出100")]
    public string? Modify1By { get; set; }

    /// <summary>
    ///     æ£€éªŒå•å·
    /// </summary>
    [Column("RELEASE_NO")]
    [SugarColumn(ColumnName = "RELEASE_NO")] //用于SqlSugar
    [StringLength(100, ErrorMessage = "检验单号长度不能超出100")]
    /// æ£€éªŒå•å· 
    ///</summary>
    [SugarColumn(ColumnName = "RELEASE_NO")]
    public string? ReleaseNo { get; set; }

    /// <summary>
    ///     æ¨¡å…·å·
    /// </summary>
    [Column("MOID_NUM")]
    [SugarColumn(ColumnName = "MOID_NUM")] //用于SqlSugar
    [StringLength(50, ErrorMessage = "模具号长度不能超出50")]
    /// æ£€éªŒæ—¥æœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_DATE")]
    public DateTime? FcheckDate { get; set; }

    /// <summary>
    /// æ£€éªŒäººå‘˜ 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_BY")]
    public string? FcheckBy { get; set; }

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

    /// <summary>
    /// æ£€éªŒç»“æžœ 
    ///</summary>
    [SugarColumn(ColumnName = "FCHECK_RESU")]
    public string? FcheckResu { 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 = "MODIFY1_BY")]
    public string? Modify1By { get; set; }

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

    /// <summary>
    /// æ¨¡å…·å· 
    ///</summary>
    [SugarColumn(ColumnName = "MOID_NUM")]
    public string? MoidNum { get; set; }

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

    //Remarks
    [Column("Remarks")]
    [SugarColumn(ColumnName = "Remarks")] //用于SqlSugar
    [StringLength(200, ErrorMessage = "备注不能超出200")]
    /// <summary>
    ///  å®¡æ ¸æ—¶é—´
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT_DATE")]
    public DateTime? FsubmitDate { get; set; }

    /// <summary>
    ///   å®¡æ ¸çŠ¶æ€
    ///</summary>
    [SugarColumn(ColumnName = "FSUBMIT")]
    public decimal? Fsubmit { get; set; }

    /// <summary>
    /// å¤‡æ³¨ 
    ///</summary>
    [SugarColumn(ColumnName = "REMARKS")]
    public string? Remarks { get; set; }

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

    [SugarColumn(IsIgnore = true)] public string? BoardName { get; set; }
    // æ·»åŠ ä»¥ä¸‹å­—段以适应查询返回的数据
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }

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

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

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

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

    //colorName
    [SugarColumn(IsIgnore = true)] public string? ColorName { get; set; }
    [SugarColumn(IsIgnore = true)] public string? CbillNo { get; set; }

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

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

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

    [SugarColumn(IsIgnore = true)] public decimal? Quantity { get; set; }
}

 MES.Service/Modes/Womdab.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
{
    /// <summary>
    /// å·¥å•å­è¡¨
    ///</summary>
    [SugarTable("WOMDAB")]
    public class Womdab
    {
        /// <summary>
        /// è‡ªå¢žåˆ— 
        ///</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; }
    }
}

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

@@ -54,13 +54,14 @@


    //获取工单号
    public List<RKJDaa001> GetDaa001s(string lineNo)
    public List<RkDaa002> GetDaa001s(string lineNo)
    {
        var db = SqlSugarHelper.GetInstance();
        return db.Queryable<RKJDaa001>()
            .Where(t => t.LineNo == lineNo)
            .OrderBy(t => t.BillNo, OrderByType.Desc)
            .ToList();
        // return db.Queryable<RKJDaa001>()
        //     .Where(t => t.LineNo == lineNo)
        //     .OrderBy(t => t.BillNo, OrderByType.Desc)
        //     .ToList();
        return null;
    }

    //根据检验标准来计算检验个数
@@ -457,46 +458,42 @@
    {
        var db = SqlSugarHelper.GetInstance();

        var id = Convert.ToDecimal(queryObj.id);

        string[]? lineNo = null;

        if (StringUtil.IsNotNullOrEmpty(queryObj.createUser))
            lineNo = _baseService.getUserLineNo(queryObj.createUser);

        return db.Queryable<QsItemOqcReq, RKJDaa001>((a, b) =>
                new JoinQueryInfos(JoinType.Left, a.BillNo == b.BillNo))
            .WhereIF(lineNo != null && lineNo.Length > 0,
                (a, b) => lineNo.Contains(b.LineNo))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b) => a.FcheckResu == null)
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
                (a, b) => a.FcheckResu != null)
            .WhereIF(id > 0, (a, b) => a.Id == id)
            .Select((a, b) => new QsItemOqcReq
        return db
            .Queryable<QsItemOqcReq, Womdaa, MesItems, MesInvItemIns, Womdab,
                MesInvTransaction, RKJDaa001>(
                (a, da, b, c, d, ca, m) => new JoinQueryInfos(
                    JoinType.Left, da.Daa001 == a.BillNo,
                    JoinType.Left, a.ItemId == b.Id,
                    JoinType.Left, a.BillNo == c.BillNo,
                    JoinType.Left, c.CbillNo == d.Dab001,
                    JoinType.Left,
                    c.TransctionNo == ca.TransactionNo.ToString() &&
                    c.Company == ca.Company && c.Factory == ca.Factory,
                    JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo
                ))
            .Select((a, da, b, c, d, ca, m) => new QsItemOqcReq
            {
                Id = a.Id,
                ReleaseNo = a.ReleaseNo,
                BillNo = a.BillNo,
                LineName = b.LineNo,
                Quantity = b.Quantity,
                CreateBy = a.CreateBy,
                Remarks = a.Remarks,
                Id = a.Id,
                CreateDate = a.CreateDate,
                ItemNo = a.ItemNo,
                Mocode = b.Mocode,
                BoardModel = b.BoardModel,
                TaskNo = b.TaskNo,
                CreateBy = a.CreateBy,
                FcheckResu = a.FcheckResu,
                ItemNo = a.ItemNo,
                FcheckBy = a.FcheckBy,
                FcheckDate = a.FcheckDate,
                MoidNum = a.MoidNum,
                BoardName = b.BoardName,
                ColorName = b.ColorName,
                Remarks = a.Remarks
                ReleaseNo = a.ReleaseNo,
                // æ·»åŠ å…¶ä»–字段
                // å¦‚果在 QsItemOqcReq ä¸­å®šä¹‰äº†é¢å¤–字段，则需要将它们赋值
                // ä¾‹å¦‚:
                ItemName = b.ItemName,
                ItemModel = b.ItemModel,
                TaskNo = c.TaskNo,
                CbillNo = c.CbillNo,
                Dab001 = d.Dab001,
                Daa015 = da.Daa015,
                LineNo = c.LineNo,
                Quantity = m.Quantity
            }).OrderBy(a => a.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }

 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/MESApplication.xml

@@ -678,42 +678,6 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                èŽ·å–所有

 MESApplication/bin/Release/net8.0/appsettings.json

@@ -8,8 +8,8 @@
  },
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
    "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
  }
}

 MESApplication/bin/Release/net8.0/publish/MES.Service.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MES.Service.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.deps.json

@@ -1160,10 +1160,7 @@
          "SqlSugarCore": "5.1.4.158"
        },
        "runtime": {
          "MES.Service.dll": {
            "assemblyVersion": "1.0.0",
            "fileVersion": "1.0.0.0"
          }
          "MES.Service.dll": {}
        }
      }
    }

 MESApplication/bin/Release/net8.0/publish/MESApplication.dll

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.exe

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.pdb

Binary files differ

 MESApplication/bin/Release/net8.0/publish/MESApplication.xml

@@ -678,42 +678,6 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.GetList">
            <summary>
            èŽ·å–所有
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
            <summary>
            æ ¹æ®ä¸»é”®èŽ·å–
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
            <summary>
            æ ¹æ®ä¸»é”®åˆ é™¤
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
            <summary>
            æ·»åŠ  
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
            <summary>
            æ·»åŠ è¿”回自增
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
            <summary>
            ä¿®æ”¹
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
            <summary>
                èŽ·å–所有

 MESApplication/bin/Release/net8.0/publish/appsettings.json

@@ -8,8 +8,8 @@
  },
  "AllowedHosts": "*",
  "AppSettings": {
    "TestErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
    "ProductionErpUrl": "http://192.168.0.208:8066/WebService1.asmx/MesToErpinfo",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.0.107)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = xm_prd; Password=xmprd"
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.11.251)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = sg_prd; Password=sgprd"
  }
}

 MESApplication/bin/Release/net8.0/publish/web.config

@@ -8,5 +8,4 @@
      <aspNetCore processPath="dotnet" arguments=".\MESApplication.dll" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" hostingModel="inprocess" />
    </system.webServer>
  </location>
</configuration>
<!--ProjectGuid: C0B360C5-E8CC-4BC3-AAA5-3F03A2D6C0AA-->
</configuration>