更正

啊鑫

2024-08-21 6f666ab6b8515ed988646ff1a9161f2f7eb6ee12

更正

 MES.Service/Dto/webApi/ErpCAA.cs

@@ -4,8 +4,12 @@
{
    public string Id { get; set; }
    public string? Type { get; set; }

    public string? FBILLTYPE { get; set; }
    public string? FBillNo { get; set; }
    public string? FWorkShopID { get; set; }
    public string? FWorkShopID0 { get; set; }
    public string? FRoutingId { get; set; }
    public string? FREMWorkShopId { get; set; }
    public string? FStockId { get; set; }
    public string? FDate { get; set; }
    public string? FBillType { get; set; }
@@ -23,6 +27,7 @@
    public string? FMTONO { get; set; }
    public string? FLot { get; set; }
    public string? FBomId { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }
    public string? FCreateType { get; set; }
    public string? FSrcBillType { get; set; }
    public string? FSrcBillNo { get; set; }
@@ -32,9 +37,9 @@
    public string? FForceCloserId { get; set; }
    public string? FCloseType { get; set; }
    public string? FSrcSplitBillNo { get; set; }
    public string? FDESCRIPTION { get; set; }
    public string? FMemoItem { get; set; }

    public string? PLAN_ID { get; set; }
    public string? PLAN_SEQ { get; set; }
    public string? PLAN_NUM { get; set; }
    public string? planId { get; set; }
    public string? planSeq { get; set; }
    public string? planNum { get; set; }
}

 MES.Service/Dto/webApi/ErpCAB.cs

@@ -3,8 +3,8 @@
public class ErpCAB
{
    public string? FBillNo { get; set; }
    public string? FMaterialID { get; set; }
    public string? FNeedQty { get; set; }
    public string? FMaterialID2 { get; set; }
    public string? FNeedQty2 { get; set; }
    public string? FPickedQty { get; set; }
    public string? FPositionNO { get; set; }
    public string? FOwnerID { get; set; }
@@ -12,16 +12,16 @@
    public string? FLot { get; set; }
    public string? FStockID { get; set; }
    public string? FIssueType { get; set; }
    public string? F_UNW_Text_tpgy { get; set; }
    public string? FUnitID { get; set; }
    public string? FSupplyType { get; set; }
    public string? FStdQty { get; set; }
    public string? FIsKeyItem { get; set; }
    public string? FNumerator { get; set; }
    public string? FDenominator { get; set; }
    public string? FChildSupplyOrgId { get; set; }
    public string? FSUPPLYORG { get; set; }
    public string  FENTRYID { get; set; }
    public string? FID { get; set; }
    public string ID { get; set; }
    public string? PID { get; set; }

    public string? FSeq { get; set; }

    public string? FFixScrapQty { get; set; }

 MES.Service/Dto/webApi/ErpCustomer.cs

@@ -2,9 +2,6 @@

public class ErpCustomer
{
    //ERP傳輸過來的數據存儲在這裡//json格式小寫


    public string? Type { get; set; }
    public string Id { get; set; }
    public string? FNumber { get; set; }
@@ -14,8 +11,4 @@
    public string? Fmobilephone { get; set; }
    public string? Fseller { get; set; }
    public string? FForbidStatus { get; set; }

    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? Fremarks { get; set; }
}

 MES.Service/Dto/webApi/ErpDepartment.cs

@@ -17,7 +17,4 @@
    public string? FForbidStatus { get; set; }

    public string? Type { get; set; }
    public string? FParentID { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
}

 MES.Service/Dto/webApi/ErpDepots.cs

@@ -19,9 +19,4 @@
    public string? FGroup { get; set; }

    public string? Type { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? FSUPPLIERID { get; set; }
    public string? Fdeptid { get; set; }

}

 MES.Service/Dto/webApi/ErpItemType.cs

@@ -8,6 +8,4 @@
    public string? FNumber { get; set; }
    public string? FName { get; set; }
    public string? FDescription { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
}

 MES.Service/Dto/webApi/ErpItems.cs

@@ -12,9 +12,7 @@
    public double? FMaxStock { get; set; }
    public double? FMinPackCount { get; set; }
    public string? FStockId { get; set; }
    /// <summary>
    //public string? PPBOM00019124 { get; set; }
    /// </summary>
    public string? PPBOM00019124 { get; set; }
    public string? FMaterialGroup { get; set; }
    public string? FDescription { get; set; }
    public decimal? FFinishReceiptOverRate { get; set; }
@@ -30,12 +28,4 @@

    public string? FPRODUCEUNITID { get; set; }
    public string? FSUBCONUNITID { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }
    public string? FLOSSPERCENT { get; set; }
    public string? FMnemonicCode { get; set; }
    public string? FExpPeriod { get; set; }
    


}

 MES.Service/Dto/webApi/ErpOrganize.cs

ÎļþÒÑɾ³ý

 MES.Service/Dto/webApi/ErpPosition.cs

@@ -22,8 +22,7 @@
    public string? FForbidderId { get; set; }

    public string? FForbidDate { get; set; }
    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }

    /// <summary>
    ///     ç¦ç”¨çŠ¶æ€  A å¯ç”¨ B禁用
    /// </summary>

 MES.Service/Dto/webApi/ErpRohIn.cs

@@ -17,7 +17,7 @@
    public string? Facctype { get; set; }
    public string? FPurchaserId { get; set; }

   // public string? F_UNW_Remarks_zlyq { get; set; }
    public string? F_UNW_Remarks_zlyq { get; set; }

    // public string? F_UNW_GYSLXR { get; set; }
    // public string? F_UNW_LXRDH { get; set; }
@@ -26,10 +26,10 @@
    // public string? FProviderAddress { get; set; }
    public string? FSettleId { get; set; }
    public string? FChargeId { get; set; }
  //  public string? FProviderEMail { get; set; }
   // public string? F_UNW_Text_ysfs { get; set; }
    public string? FHEADNOTE { get; set; }
   // public string? F_UNW_Combo_zjmj { get; set; }
    public string? FProviderEMail { get; set; }
    public string? F_UNW_Text_ysfs { get; set; }
    public string? F_UNW_BZ { get; set; }
    public string? F_UNW_Combo_zjmj { get; set; }
    public string? FCancelStatus { get; set; }
    public string? FCancellerId { get; set; }
    public string? FCancelDate { get; set; }
@@ -43,5 +43,5 @@
    public string? FCHANGEREASON { get; set; }

    //采购订单A  é‡‡è´­è®¢å•å˜æ›´å•B    
    //public string? FBILLTYPE { get; set; }
    public string? FBILLTYPE { get; set; }
}

 MES.Service/Dto/webApi/ErpRohinData.cs

@@ -5,22 +5,20 @@
    public string id { get; set; }
    public string Eid { get; set; }
    public string? FBillNo { get; set; }
    public string? FDEMANDBILLNO { get; set; }
    public string? FSEQ { get; set; }
    public string? F_UNW_Text_xsddh { get; set; }
    public string? FMaterialId { get; set; }
    public string? FMaterialName { get; set; }
    public string? FModel { get; set; }
    public string? FUnitId { get; set; }
    public string? FQty { get; set; }
    public string? FStockUnitID { get; set; }
    public string? FPriceUnitId { get; set; }
    public string? FPriceUnitQty { get; set; }
    public string? FDeliveryDate { get; set; }
    public string? FDeliveryEarlyDate { get; set; }
    public string? FDeliveryLastDate { get; set; }
    public string? FRequireOrgId { get; set; }
    public string? FRequireDeptId { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? FReceiveDeptId { get; set; }
    public string? FSETTLEORGID { get; set; }
    public string? FGiveAway { get; set; }
    public string? Fnote { get; set; }
    public string? FEntryNote { get; set; }
    public string? FSupMatId { get; set; }
    public string? FSupMatName { get; set; }
    public string? FSUBREQBILLNO { get; set; }
@@ -45,8 +43,10 @@
    public string? FMtoNo { get; set; }
    public string? FChangeFlag { get; set; }
    public string? FDEMANDTYPE { get; set; }
    //public string? FDEMANDBILLNO { get; set; }
    public string? FDEMANDBILLNO { get; set; }
    public string? FDEMANDBILLENTRYSEQ { get; set; }
    public string? fentryid { get; set; }

    public string? PurchaseOrderLineNumber { get; set; }
    public string? Demand { get; set; }
    public string? Receiving { get; set; }
    public string? Settlement { get; set; }
}

 MES.Service/Dto/webApi/ErpStaff.cs

@@ -12,8 +12,4 @@
    public string? FStaffStartDate { get; set; }
    public string? FDescription { get; set; }
    public string? FForbidStatus { get; set; }

    public string? Fumbrella { get; set; }
    public string? FSubsidiary { get; set; }

}

 MES.Service/Dto/webApi/ErpSupplier.cs

@@ -11,9 +11,4 @@
    public string? F_UNW_LXRDH { get; set; }
    public string? FStaffId { get; set; }
    public string? FForbidStatus { get; set; }
    
    public string? Fumbrella { get; set; }
    public string? Fsubsidiary { get; set; }
    public string? Fremarks { get; set; }

}

 MES.Service/Modes/MesCustomer.cs

@@ -141,22 +141,18 @@
    public string? Fseller { get; set; }

    /// <summary>
    ///     å‚™è¨»
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "fremarks")]
    public string? fremarks { get; set; }
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }

    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
   /* /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
@@ -173,6 +169,6 @@
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }
*/

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

 MES.Service/Modes/MesDepots.cs

@@ -147,22 +147,34 @@
    public string? MaterialProperti { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }

    [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
    public string? FStockStatusType { get; set; }
    [SugarColumn(ColumnName = "FSUPPLIERID")]
    public string? FSUPPLIERID { get; set; }
    [SugarColumn(ColumnName = "Fdeptid")]
    public string? Fdeptid { get; set; }
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }

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

 MES.Service/Modes/MesInvBusiness2.cs

@@ -224,10 +224,4 @@
 /// </summary>
 [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }

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

 MES.Service/Modes/MesInvItemArnDetail.cs

@@ -217,18 +217,6 @@
    [SugarColumn(ColumnName = "CBILL_NO")]
    public string CbillNo { get; set; }

    /// <summary>
    ///     é‡‡è´­å…¥åº“数量
    /// </summary>
    [SugarColumn(ColumnName = "CG_RKQTY")]
    public decimal? CgRkqty { get; set; }

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

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

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

 MES.Service/Modes/MesInvItemBarcodes.cs

@@ -1,500 +1,497 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
using SqlSugar;

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

/// <summary>
///     ç‰©æ–™æ¡ç è¡¨
/// </summary>
[SugarTable("MES_INV_ITEM_BARCODES")]
public class MesInvItemBarcodes
{
    /// <summary>
    /// ç‰©æ–™æ¡ç è¡¨
    ///     SEQ_BARCODE_PSN_ID
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_EQBASE",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

    /// <summary>
    /// ç‰©æ–™æ¡ç  
    ///</summary>
    [SugarTable("MES_INV_ITEM_BARCODES")]
    public class MesInvItemBarcodes
    {
        /// <summary>
        /// SEQ_BARCODE_PSN_ID 
        ///</summary>
        [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
        public decimal Id { get; set; }
    [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string ItemBarcode { get; set; }

        /// <summary>
        /// ç‰©æ–™æ¡ç  
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_BARCODE")]
        public string ItemBarcode { get; set; }
    /// <summary>
    /// å®¢æˆ·æˆå“ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
    public string CProductCode { get; set; }

        /// <summary>
        /// å®¢æˆ·æˆå“ç¼–码 
        ///</summary>
        [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
        public string CProductCode { get; set; }
    /// <summary>
    /// å®¢æˆ·ç‰©æ–™æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
    public string CItemBarcode { get; set; }

        /// <summary>
        /// å®¢æˆ·ç‰©æ–™æ¡ç  
        ///</summary>
        [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
        public string CItemBarcode { get; set; }
    /// <summary>
    /// å®¢æˆ·ç‰©æ–™ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string CItemCode { get; set; }

        /// <summary>
        /// å®¢æˆ·ç‰©æ–™ç¼–码 
        ///</summary>
        [SugarColumn(ColumnName = "C_ITEM_CODE")]
        public string CItemCode { get; set; }
    /// <summary>
    /// æœ¬å¸ç‰©æ–™ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }

        /// <summary>
        /// æœ¬å¸ç‰©æ–™ç¼–码 
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_NO")]
        public string ItemNo { get; set; }
    /// <summary>
    /// åŽ‚家批次 
    ///</summary>
    [SugarColumn(ColumnName = "LOT_NO")]
    public string LotNo { get; set; }

        /// <summary>
        /// åŽ‚家批次 
        ///</summary>
        [SugarColumn(ColumnName = "LOT_NO")]
        public string LotNo { get; set; }
    /// <summary>
    /// æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

        /// <summary>
        /// æ•°é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "QUANTITY")]
        public decimal? Quantity { get; set; }
    /// <summary>
    /// æ˜¯å¦çŽ¯ä¿(0:否,1:是) 
    ///</summary>
    [SugarColumn(ColumnName = "EP_FLAG")]
    public short? EpFlag { get; set; }

        /// <summary>
        /// æ˜¯å¦çŽ¯ä¿(0:否,1:是) 
        ///</summary>
        [SugarColumn(ColumnName = "EP_FLAG")]
        public short? EpFlag { get; set; }
    /// <summary>
    /// ç”Ÿäº§å·¥å• 
    ///</summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }

        /// <summary>
        /// ç”Ÿäº§å·¥å• 
        ///</summary>
        [SugarColumn(ColumnName = "TASK_NO")]
        public string TaskNo { get; set; }
    /// <summary>
    /// åˆ›å»ºäºº 
    ///</summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string CreateBy { 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 = "CREATE_DATE")]
        public DateTime? CreateDate { get; set; }
    /// <summary>
    /// æœ€åŽæ›´æ–°äºº 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { 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 = "LASTUPDATE_DATE")]
        public DateTime? LastupdateDate { get; set; }
    /// <summary>
    /// å®¢æˆ·ç¼–号 
    ///</summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string CustNo { get; set; }

        /// <summary>
        /// å®¢æˆ·ç¼–号 
        ///</summary>
        [SugarColumn(ColumnName = "CUST_NO")]
        public string CustNo { get; set; }
    /// <summary>
    /// ç‰©æ–™æ¡ç æ³¨é‡Šè¡Œ[冗余，条码重打使用] 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
    public string ItemBarcodeText { get; set; }

        /// <summary>
        /// ç‰©æ–™æ¡ç æ³¨é‡Šè¡Œ[冗余，条码重打使用] 
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
        public string ItemBarcodeText { get; set; }
    /// <summary>
    /// åŽŸPSN物料条码 
    ///</summary>
    [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
    public string OldItemBarcode { get; set; }

        /// <summary>
        /// åŽŸPSN物料条码 
        ///</summary>
        [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
        public string OldItemBarcode { get; set; }
    /// <summary>
    /// SAP收货物料凭证号    --采购单号 
    ///</summary>
    [SugarColumn(ColumnName = "MBLNR")]
    public string Mblnr { get; set; }

        /// <summary>
        /// SAP收货物料凭证号    --采购单号 
        ///</summary>
        [SugarColumn(ColumnName = "MBLNR")]
        public string Mblnr { get; set; }
    /// <summary>
    /// SAP收货物料凭证行号  --采购单行号 
    ///</summary>
    [SugarColumn(ColumnName = "ZEILE")]
    public decimal? Zeile { get; set; }

        /// <summary>
        /// SAP收货物料凭证行号  --采购单行号 
        ///</summary>
        [SugarColumn(ColumnName = "ZEILE")]
        public decimal? Zeile { get; set; }
    /// <summary>
    /// æ”¶æ–™è¡¨ID 
    ///</summary>
    [SugarColumn(ColumnName = "ROH_IN_ID")]
    public decimal? RohInId { get; set; }

        /// <summary>
        /// æ”¶æ–™è¡¨ID 
        ///</summary>
        [SugarColumn(ColumnName = "ROH_IN_ID")]
        public decimal? RohInId { get; set; }
    /// <summary>
    /// 0为有效条码；1为无效条码 
    ///</summary>
    [SugarColumn(ColumnName = "BARCODESTATUS")]
    public short? Barcodestatus { get; set; }

        /// <summary>
        /// 0为有效条码；1为无效条码 
        ///</summary>
        [SugarColumn(ColumnName = "BARCODESTATUS")]
        public short? Barcodestatus { get; set; }
    /// <summary>
    /// åŽŸå§‹æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "OLDQTY")]
    public decimal? Oldqty { get; set; }

        /// <summary>
        /// åŽŸå§‹æ•°é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "OLDQTY")]
        public decimal? Oldqty { get; set; }
    /// <summary>
    /// ä½¿ç”¨æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "USEQTY")]
    public decimal? Useqty { get; set; }

        /// <summary>
        /// ä½¿ç”¨æ•°é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "USEQTY")]
        public decimal? Useqty { get; set; }
    /// <summary>
    /// 0在库，1在线，2作废 
    ///</summary>
    [SugarColumn(ColumnName = "LOCATION")]
    public short? Location { get; set; }

        /// <summary>
        /// 0在库，1在线，2作废 
        ///</summary>
        [SugarColumn(ColumnName = "LOCATION")]
        public short? Location { get; set; }
    /// <summary>
    /// å•ä½ 
    ///</summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string Unit { get; set; }

        /// <summary>
        /// å•ä½ 
        ///</summary>
        [SugarColumn(ColumnName = "UNIT")]
        public string Unit { get; set; }
    /// <summary>
    /// é‡é‡ï¼ˆå•ä½ï¼šå…¬æ–¤ï¼‰ 
    ///</summary>
    [SugarColumn(ColumnName = "WEIGHT_UNIT")]
    public decimal? WeightUnit { get; set; }

        /// <summary>
        /// é‡é‡ï¼ˆå•ä½ï¼šå…¬æ–¤ï¼‰ 
        ///</summary>
        [SugarColumn(ColumnName = "WEIGHT_UNIT")]
        public decimal? WeightUnit { get; set; }
    /// <summary>
    /// å•ä»· 
    ///</summary>
    [SugarColumn(ColumnName = "PRICE")]
    public decimal? Price { get; set; }

        /// <summary>
        /// å•ä»· 
        ///</summary>
        [SugarColumn(ColumnName = "PRICE")]
        public decimal? Price { get; set; }
    /// <summary>
    /// åŽŸæ¡ç æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
    public decimal? OldBarQuantity { get; set; }

        /// <summary>
        /// åŽŸæ¡ç æ•°é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
        public decimal? OldBarQuantity { get; set; }
    /// <summary>
    /// æ±‡æ€»æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "SUM_BARCODE")]
    public string SumBarcode { get; set; }

        /// <summary>
        /// æ±‡æ€»æ¡ç  
        ///</summary>
        [SugarColumn(ColumnName = "SUM_BARCODE")]
        public string SumBarcode { get; set; }
    /// <summary>
    /// ç”Ÿäº§æ—¥æœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "LOT_DATE")]
    public string LotDate { get; set; }

        /// <summary>
        /// ç”Ÿäº§æ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "LOT_DATE")]
        public string LotDate { get; set; }
    /// <summary>
    /// æ¨¡å· 
    ///</summary>
    [SugarColumn(ColumnName = "MOCODE")]
    public string Mocode { get; set; }

        /// <summary>
        /// æ¨¡å· 
        ///</summary>
        [SugarColumn(ColumnName = "MOCODE")]
        public string Mocode { get; set; }
    /// <summary>
    /// æ¥æº 
    ///</summary>
    [SugarColumn(ColumnName = "MEMO")]
    public string Memo { get; set; }

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

        /// <summary>
        /// ä¾›åº”商编码 
        ///</summary>
        [SugarColumn(ColumnName = "SUPP_NO")]
        public string SuppNo { get; set; }
    /// <summary>
    /// æ¡£ä½ä½Žå€¼ 
    ///</summary>
    [SugarColumn(ColumnName = "SPOSTION")]
    public string Spostion { get; set; }

        /// <summary>
        /// æ¡£ä½ä½Žå€¼ 
        ///</summary>
        [SugarColumn(ColumnName = "SPOSTION")]
        public string Spostion { get; set; }
    /// <summary>
    /// æ¡£ä½é«˜å€¼ 
    ///</summary>
    [SugarColumn(ColumnName = "EPOSTION")]
    public string Epostion { get; set; }

        /// <summary>
        /// æ¡£ä½é«˜å€¼ 
        ///</summary>
        [SugarColumn(ColumnName = "EPOSTION")]
        public string Epostion { get; set; }
    /// <summary>
    /// ç‰©æ–™ç®€ç§° 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_SNAME")]
    public string ItemSname { get; set; }

        /// <summary>
        /// ç‰©æ–™ç®€ç§° 
        ///</summary>
        [SugarColumn(ColumnName = "ITEM_SNAME")]
        public string ItemSname { get; set; }
    /// <summary>
    /// æ˜¯å¦å·²å†»ç»“,1冻结 
    ///</summary>
    [SugarColumn(ColumnName = "VISABLE")]
    public short? Visable { get; set; }

        /// <summary>
        /// æ˜¯å¦å·²å†»ç»“,1冻结 
        ///</summary>
        [SugarColumn(ColumnName = "VISABLE")]
        public short? Visable { get; set; }
    /// <summary>
    /// ä¾›åº”商批次 
    ///</summary>
    [SugarColumn(ColumnName = "TR_LOTNO")]
    public string TrLotno { get; set; }

        /// <summary>
        /// ä¾›åº”商批次 
        ///</summary>
        [SugarColumn(ColumnName = "TR_LOTNO")]
        public string TrLotno { get; set; }
    /// <summary>
    /// å†»ç»“时间 
    ///</summary>
    [SugarColumn(ColumnName = "FLEZZ_DATE")]
    public DateTime? FlezzDate { get; set; }

        /// <summary>
        /// å†»ç»“时间 
        ///</summary>
        [SugarColumn(ColumnName = "FLEZZ_DATE")]
        public DateTime? FlezzDate { get; set; }
    /// <summary>
    /// å†»ç»“原因 
    ///</summary>
    [SugarColumn(ColumnName = "FLEZZ_REASON")]
    public string FlezzReason { get; set; }

        /// <summary>
        /// å†»ç»“原因 
        ///</summary>
        [SugarColumn(ColumnName = "FLEZZ_REASON")]
        public string FlezzReason { get; set; }
    /// <summary>
    /// å†»ç»“人 
    ///</summary>
    [SugarColumn(ColumnName = "FLEZZ_BY")]
    public string FlezzBy { get; set; }

        /// <summary>
        /// å†»ç»“人 
        ///</summary>
        [SugarColumn(ColumnName = "FLEZZ_BY")]
        public string FlezzBy { get; set; }

        /// <summary>
        /// å»¶é•¿ä¿è´¨æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "DELANY_MONTH")]
        public decimal? DelanyMonth { get; set; }
    /// <summary>
    /// å»¶é•¿ä¿è´¨æœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "DELANY_MONTH")]
    public decimal? DelanyMonth { get; set; }

        /// <summary>
        /// æœ€å°åŒ…装标识 
        ///</summary>
        [SugarColumn(ColumnName = "MINPACK_FLAG")]
        public short? MinpackFlag { get; set; }
    /// <summary>
    /// æœ€å°åŒ…装标识 
    ///</summary>
    [SugarColumn(ColumnName = "MINPACK_FLAG")]
    public short? MinpackFlag { get; set; }

        /// <summary>
        /// æ‰“印ID，用来区分打印次数 
        ///</summary>
        [SugarColumn(ColumnName = "PRINT_ID")]
        public string PrintId { get; set; }
    /// <summary>
    /// æ‰“印ID，用来区分打印次数 
    ///</summary>
    [SugarColumn(ColumnName = "PRINT_ID")]
    public string PrintId { get; set; }

        /// <summary>
        /// çŽ¯ä¿é¡¹ç›® 
        ///</summary>
        [SugarColumn(ColumnName = "EP_ITEM")]
        public string EpItem { get; set; }
    /// <summary>
    /// çŽ¯ä¿é¡¹ç›® 
    ///</summary>
    [SugarColumn(ColumnName = "EP_ITEM")]
    public string EpItem { get; set; }

        /// <summary>
        /// å·¥åŽ‚编号 
        ///</summary>
        [SugarColumn(ColumnName = "FACTORY")]
        public string Factory { 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 = "COMPANY")]
    public string Company { get; set; }

        /// <summary>
        /// å¡æ¿ç¼–码 
        ///</summary>
        [SugarColumn(ColumnName = "CB_NO")]
        public string CbNo { get; set; }
    /// <summary>
    /// å¡æ¿ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "CB_NO")]
    public string CbNo { get; set; }

        /// <summary>
        /// åŽ‚家生产线 
        ///</summary>
        [SugarColumn(ColumnName = "LINFLINE")]
        public string Linfline { get; set; }
    /// <summary>
    /// åŽ‚家生产线 
    ///</summary>
    [SugarColumn(ColumnName = "LINFLINE")]
    public string Linfline { get; set; }

        /// <summary>
        /// æœ‰æ•ˆæœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "VALID_TIME")]
        public DateTime? ValidTime { get; set; }
    /// <summary>
    /// æœ‰æ•ˆæœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "VALID_TIME")]
    public DateTime? ValidTime { get; set; }

        /// <summary>
        /// è´¨æ£€ç»“æžœ 
        ///</summary>
        [SugarColumn(ColumnName = "IQC_STATUS")]
        public string IqcStatus { get; set; }
    /// <summary>
    /// è´¨æ£€ç»“æžœ 
    ///</summary>
    [SugarColumn(ColumnName = "IQC_STATUS")]
    public string IqcStatus { get; set; }

        /// <summary>
        /// å°è½¦æ¡ç  
        ///</summary>
        [SugarColumn(ColumnName = "FCAR")]
        public string Fcar { get; set; }
    /// <summary>
    /// å°è½¦æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "FCAR")]
    public string Fcar { get; set; }

        /// <summary>
        /// æ¯›é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "GWEIGHT")]
        public string Gweight { get; set; }
    /// <summary>
    /// æ¯›é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "GWEIGHT")]
    public string Gweight { get; set; }

        /// <summary>
        /// å‡€é‡ 
        ///</summary>
        [SugarColumn(ColumnName = "NWEIGHT")]
        public string Nweight { get; set; }
    /// <summary>
    /// å‡€é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "NWEIGHT")]
    public string Nweight { get; set; }

        /// <summary>
        /// ä¿è´¨æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "EXT_DATE")]
        public decimal? ExtDate { get; set; }
    /// <summary>
    /// ä¿è´¨æœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "EXT_DATE")]
    public decimal? ExtDate { get; set; }

        /// <summary>
        /// ä¾›åº”商、赠品、客供料、委外 
        ///</summary>
        [SugarColumn(ColumnName = "BARCODETYPE")]
        public string Barcodetype { get; set; }
    /// <summary>
    /// ä¾›åº”商、赠品、客供料、委外 
    ///</summary>
    [SugarColumn(ColumnName = "BARCODETYPE")]
    public string Barcodetype { get; set; }

        /// <summary>
        /// ä¾›åº”商名称 
        ///</summary>
        [SugarColumn(ColumnName = "SUPP_NAME")]
        public string SuppName { get; set; }
    /// <summary>
    /// ä¾›åº”商名称 
    ///</summary>
    [SugarColumn(ColumnName = "SUPP_NAME")]
    public string SuppName { get; set; }

        /// <summary>
        /// åˆ°è´§å•å·/入库单号 
        ///</summary>
        [SugarColumn(ColumnName = "BILL_NO")]
        public string BillNo { get; set; }
    /// <summary>
    /// åˆ°è´§å•å·/入库单号 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string BillNo { get; set; }

        /// <summary>
        /// æ€¥æ–™æ ‡è¯† 
        ///</summary>
        [SugarColumn(ColumnName = "URGENT_FLAG")]
        public short? UrgentFlag { get; set; }
    /// <summary>
    /// æ€¥æ–™æ ‡è¯† 
    ///</summary>
    [SugarColumn(ColumnName = "URGENT_FLAG")]
    public short? UrgentFlag { get; set; }

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

        /// <summary>
        /// äº§å“åž‹å· 
        ///</summary>
        [SugarColumn(ColumnName = "BOARD_STYLE")]
        public string BoardStyle { get; set; }
    /// <summary>
    /// äº§å“åž‹å· 
    ///</summary>
    [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string BoardStyle { get; set; }

        /// <summary>
        /// æ¥æ–™æ—¥æœŸ 
        ///</summary>
        [SugarColumn(ColumnName = "INS_DATE")]
        public DateTime? InsDate { get; set; }
    /// <summary>
    /// æ¥æ–™æ—¥æœŸ 
    ///</summary>
    [SugarColumn(ColumnName = "INS_DATE")]
    public DateTime? InsDate { get; set; }

        /// <summary>
        /// åˆ°è´§å•è¡Œå· 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_LINE")]
        public decimal? WorkLine { get; set; }
    /// <summary>
    /// åˆ°è´§å•è¡Œå· 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_LINE")]
    public decimal? WorkLine { get; set; }

        /// <summary>
        /// ä¸è‰¯åŽŸå›  
        ///</summary>
        [SugarColumn(ColumnName = "MEMO_BAD")]
        public string MemoBad { get; set; }
    /// <summary>
    /// ä¸è‰¯åŽŸå›  
    ///</summary>
    [SugarColumn(ColumnName = "MEMO_BAD")]
    public string MemoBad { get; set; }

        /// <summary>
        /// ä»»åŠ¡å•å· 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_NO")]
        public string WorkNo { get; set; }
    /// <summary>
    /// ä»»åŠ¡å•å· 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_NO")]
    public string WorkNo { get; set; }

        /// <summary>
        /// æ¡ç æ¥æºæ ‡è¯†ï¼Œ0-初期物料,1-采购入库，2、生产退料，3、其它入库，4-客供料,5-在库分料，6-制程条码 
        ///</summary>
        [SugarColumn(ColumnName = "COME_FLG")]
        public short? ComeFlg { get; set; }
    /// <summary>
    /// æ¡ç æ¥æºæ ‡è¯†ï¼Œ0-初期物料,1-采购入库，2、生产退料，3、其它入库，4-客供料,5-在库分料，6-制程条码 
    ///</summary>
    [SugarColumn(ColumnName = "COME_FLG")]
    public short? ComeFlg { get; set; }

        /// <summary>
        /// ç”Ÿäº§çº¿ä½“ 
        ///</summary>
        [SugarColumn(ColumnName = "LINE_NO")]
        public string LineNo { get; set; }
    /// <summary>
    /// ç”Ÿäº§çº¿ä½“ 
    ///</summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }

        /// <summary>
        /// ä¸å°æ¬¡æ•° 
        ///</summary>
        [SugarColumn(ColumnName = "SILK_PQTY")]
        public decimal? SilkPqty { get; set; }
    /// <summary>
    /// ä¸å°æ¬¡æ•° 
    ///</summary>
    [SugarColumn(ColumnName = "SILK_PQTY")]
    public decimal? SilkPqty { get; set; }

        /// <summary>
        /// ä¸å°æ¬¡æ•°æ¯” 
        ///</summary>
        [SugarColumn(ColumnName = "SILK")]
        public string Silk { get; set; }
    /// <summary>
    /// ä¸å°æ¬¡æ•°æ¯” 
    ///</summary>
    [SugarColumn(ColumnName = "SILK")]
    public string Silk { get; set; }

        /// <summary>
        /// ä¸å°æ´¾å·¥ä»Žè¡¨ID 
        ///</summary>
        [SugarColumn(ColumnName = "SILK_ID")]
        public decimal? SilkId { get; set; }
    /// <summary>
    /// ä¸å°æ´¾å·¥ä»Žè¡¨ID 
    ///</summary>
    [SugarColumn(ColumnName = "SILK_ID")]
    public decimal? SilkId { get; set; }

        /// <summary>
        /// å·²æŠ¥å·¥æ ‡è¯† 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_FLG")]
        public decimal? WorkFlg { get; set; }
    /// <summary>
    /// å·²æŠ¥å·¥æ ‡è¯† 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_FLG")]
    public decimal? WorkFlg { get; set; }

        /// <summary>
        /// æœ€åŽå·¥åº 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_LAST")]
        public decimal? WorkLast { get; set; }
    /// <summary>
    /// æœ€åŽå·¥åº 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_LAST")]
    public decimal? WorkLast { get; set; }

        /// <summary>
        /// 0-未合并打印，1-合并打印 
        ///</summary>
        [SugarColumn(ColumnName = "HBDY")]
        public decimal? Hbdy { get; set; }
    /// <summary>
    /// 0-未合并打印，1-合并打印 
    ///</summary>
    [SugarColumn(ColumnName = "HBDY")]
    public decimal? Hbdy { get; set; }

        /// <summary>
        /// 0-有效条码，1-合并拆分的条码，无效 
        ///</summary>
        [SugarColumn(ColumnName = "HBDYTM")]
        public decimal? Hbdytm { get; set; }
    /// <summary>
    /// 0-有效条码，1-合并拆分的条码，无效 
    ///</summary>
    [SugarColumn(ColumnName = "HBDYTM")]
    public decimal? Hbdytm { get; set; }

        /// <summary>
        /// æŠ¥å·¥æ—¶é—´ 
        ///</summary>
        [SugarColumn(ColumnName = "WORK_FLGTIME")]
        public string WorkFlgtime { get; set; }
    /// <summary>
    /// æŠ¥å·¥æ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_FLGTIME")]
    public string WorkFlgtime { get; set; }

        /// <summary>
        /// é‡‡è´­è®¢å•ID 
        ///</summary>
        [SugarColumn(ColumnName = "EBELN_K3ID")]
        public decimal? EbelnK3id { 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; }
    /// <summary>
    /// é‡‡è´­è®¢å•è¡ŒID 
    ///</summary>
    [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }

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

        /// <summary>
        /// ç”Ÿäº§å·¥åºID 
        ///</summary>
        [SugarColumn(ColumnName = "GX_ID")]
        public decimal? GxId { get; set; }
    /// <summary>
    /// ç”Ÿäº§å·¥åºID 
    ///</summary>
    [SugarColumn(ColumnName = "GX_ID")]
    public decimal? GxId { get; set; }

        /// <summary>
        /// ç»„织id 
        ///</summary>
        [SugarColumn(ColumnName = "ORG_NAME")]
        public string OrgName { get; set; }
    /// <summary>
    /// ç»„织id 
    ///</summary>
    [SugarColumn(ColumnName = "ORG_NAME")]
    public string OrgName { get; set; }

        /// <summary>
        /// è´§ä¸»id 
        ///</summary>
        [SugarColumn(ColumnName = "ORG_OWNER")]
        public string OrgOwner { get; set; }
    }
    /// <summary>
    /// è´§ä¸»id 
    ///</summary>
    [SugarColumn(ColumnName = "ORG_OWNER")]
    public string OrgOwner { get; set; }
}

 MES.Service/Modes/MesInvItemInCDetails.cs

@@ -13,31 +13,31 @@
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
        IsPrimaryKey = true)]
    public decimal? Id { get; set; }
    public decimal Id { get; set; }

    /// <summary>
    ///     å…¥åº“单id
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
    public decimal? ItemInId { get; set; }
    public decimal ItemInId { get; set; }

    /// <summary>
    ///     ç‰©æ–™æ¡ç PSN
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string? ItemBarcode { get; set; }
    public string ItemBarcode { get; set; }

    /// <summary>
    ///     å®¢æˆ·ç‰©æ–™ç¼–码（无条码手工录入，有条码为冗余字段）
    /// </summary>
    [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string? CItemCode { get; set; }
    public string CItemCode { get; set; }

    /// <summary>
    ///     å®¢æˆ·ç‰©æ–™æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
    public string? CItemBarcode { get; set; }
    public string CItemBarcode { get; set; }

    /// <summary>
    ///     éªŒæ”¶æ•°é‡
@@ -61,7 +61,7 @@
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    public string CreateBy { get; set; }

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

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
@@ -91,13 +91,13 @@
    ///     æœ¬å¸ç‰©æ–™ç¼–码（无条码手工录入，有条码为冗余字段）
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string? ItemNo { get; set; }
    public string ItemNo { get; set; }

    /// <summary>
    ///     åŽ‚家批次
    /// </summary>
    [SugarColumn(ColumnName = "LOT_NO")]
    public string? LotNo { get; set; }
    public string LotNo { get; set; }

    /// <summary>
    ///     æ˜¯å¦å…±ç®¡ç‰©æ–™(0:否，1:是)
@@ -109,13 +109,13 @@
    ///     å®¢æˆ·ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string? CustNo { get; set; }
    public string CustNo { get; set; }

    /// <summary>
    ///     æ£€éªŒç»“æžœ
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_RES")]
    public string? CheckRes { get; set; }
    public string CheckRes { get; set; }

    /// <summary>
    ///     è¿›è´§æ•°é‡
@@ -127,7 +127,7 @@
    ///     æ£€éªŒçŠ¶æ€
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_STATES")]
    public string? CheckStates { get; set; }
    public string CheckStates { get; set; }

    /// <summary>
    ///     å¼ºåˆ¶å…¥åº“标记0无，1-强制入库  é€€æ–™å•ä½¿ç”¨
@@ -139,31 +139,31 @@
    ///     ä»“库编码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_CODE")]
    public string? DepotCode { get; set; }
    public string DepotCode { get; set; }

    /// <summary>
    ///     è´§ä½ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
    public string? DepotSectionCode { get; set; }
    public string DepotSectionCode { get; set; }

    /// <summary>
    ///     ç‰¹è®°äº‹é¡¹
    /// </summary>
    [SugarColumn(ColumnName = "REMARK")]
    public string? Remark { get; set; }
    public string Remark { get; set; }

    /// <summary>
    ///     ç‰©æ–™æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE2")]
    public string? ItemBarcode2 { get; set; }
    public string ItemBarcode2 { get; set; }

    /// <summary>
    ///     æ–°æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE3")]
    public string? ItemBarcode3 { get; set; }
    public string ItemBarcode3 { get; set; }

    /// <summary>
    ///     ä½¿ç”¨æ•°é‡
@@ -181,7 +181,7 @@
    ///     ç‰©æ–™ç®€ç§°
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_SNAME")]
    public string? ItemSname { get; set; }
    public string ItemSname { get; set; }

    /// <summary>
    ///     æ¡£ä½ä½Žå€¼
@@ -205,7 +205,7 @@
    ///     å•ä½
    /// </summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string? Unit { get; set; }
    public string Unit { get; set; }

    /// <summary>
    ///     æ˜¯å¦æ£€éªŒ
@@ -217,19 +217,19 @@
    ///     é‡‡è´­è®¢å•
    /// </summary>
    [SugarColumn(ColumnName = "EBELN")]
    public string? Ebeln { get; set; }
    public string Ebeln { get; set; }

    /// <summary>
    ///     ç”Ÿäº§æ—¥æœŸ
    /// </summary>
    [SugarColumn(ColumnName = "LOT_DATE")]
    public string? LotDate { get; set; }
    public string LotDate { get; set; }

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

    /// <summary>
    ///     å…¥åº“审核标志
@@ -241,25 +241,25 @@
    ///     åˆ†åŽ‚编码
    /// </summary>
    [SugarColumn(ColumnName = "FACTORY")]
    public string? Factory { get; set; }
    public string Factory { get; set; }

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

    /// <summary>
    ///     å¡æ¿ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CB_NO")]
    public string? CbNo { get; set; }
    public string CbNo { get; set; }

    /// <summary>
    ///     ç®±å·
    /// </summary>
    [SugarColumn(ColumnName = "BOX_NO")]
    public string? BoxNo { get; set; }
    public string BoxNo { get; set; }

    /// <summary>
    ///     ä»“库ID
@@ -277,7 +277,7 @@
    ///     è¡Œå·
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NUM")]
    public string? LineNum { get; set; }
    public string LineNum { get; set; }

    /// <summary>
    ///     æ‰«ç æ•°é‡
@@ -289,7 +289,7 @@
    ///     é”€å”®è®¢å•
    /// </summary>
    [SugarColumn(ColumnName = "VGBEL")]
    public string? Vgbel { get; set; }
    public string Vgbel { get; set; }

    /// <summary>
    ///     é”€å”®è®¢å•è¡Œå·
@@ -301,7 +301,7 @@
    ///     ä»»åŠ¡å•å·
    /// </summary>
    [SugarColumn(ColumnName = "WORK_NO")]
    public string? WorkNo { get; set; }
    public string WorkNo { get; set; }

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

    /// <summary>
    ///     æ€¥æ–™æ ‡è¯†
@@ -325,7 +325,7 @@
    ///     äº§å“åž‹å·
    /// </summary>
    [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string? BoardStyle { get; set; }
    public string BoardStyle { get; set; }

    /// <summary>
    ///     ä»»åŠ¡å•è¡Œå·
@@ -337,41 +337,19 @@
    ///     ç”Ÿäº§å·¥å•
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string? TaskNo { get; set; }
    public string TaskNo { get; set; }

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

    /// <summary>
    ///     ä»»åŠ¡æ±‡æŠ¥å•
    /// </summary>
    [SugarColumn(ColumnName = "RBILL_NO")]
    public string? RbillNo { 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; }

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

    // æ·»åŠ çš„字段，并且它们不属于数据库表
    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }

 MES.Service/Modes/MesInvItemInCItems.cs

@@ -145,22 +145,4 @@
 /// </summary>
 [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { 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; }

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

 MES.Service/Modes/MesInvItemOutCDetails.cs

@@ -235,12 +235,6 @@
    [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }

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

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

 MES.Service/Modes/MesInvItemStocks.cs

@@ -200,10 +200,4 @@
    /// </summary>
    [SugarColumn(ColumnName = "LINE_K3ID")]
    public decimal? LineK3id { get; set; }

    /// <summary>
    ///     é‡‡è´­è®¢å•è¡Œid
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_ID")]
    public decimal? ItemId { get; set; }
}

 MES.Service/Modes/MesItemType.cs

@@ -83,16 +83,7 @@
    /// </summary>
    [SugarColumn(ColumnName = "PGROUP")]
    public string? Pgroup { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }

    /// <summary>
    ///     æè¿°
    /// </summary>

 MES.Service/Modes/MesItems.cs

@@ -167,8 +167,8 @@
    /// <summary>
    ///     ç‰©æ–™åˆ†ç±»ç¼–号
    /// </summary>
  /*  [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }*/
    [SugarColumn(ColumnName = "PPBOM00019124")]
    public string? Ppbom00019124 { get; set; }

    /// <summary>
    ///     ç‰©æ–™åˆ†ç»„
@@ -265,27 +265,6 @@

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

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }

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

    [SugarColumn(ColumnName = "FMnemonicCode")]

    public string? FMnemonicCode { get; set; }

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

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

 MES.Service/Modes/MesPosition.cs

@@ -62,15 +62,29 @@
    public string? Fforbidstatus { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }

    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }

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

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

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


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

 MES.Service/Modes/MesQaItemsDetect01.cs

@@ -328,28 +328,4 @@
 /// </summary>
 [SugarColumn(ColumnName = "FMRMODE")]
    public string Fmrmode { 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; }

    /// <summary>
    ///     è´¨é‡å®¡æ ¸æ ‡è¯†
    /// </summary>
    [SugarColumn(ColumnName = "QUALITY_AUDIT")]
    public decimal QualityAudit { get; set; }

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

 MES.Service/Modes/MesRohIn.cs

@@ -228,6 +228,12 @@
    public string? CheckBy { get; set; }

    /// <summary>
    ///     å®¡æ ¸æ ‡è¯†
    /// </summary>
    [SugarColumn(ColumnName = "CHECK_FALG")]
    public short? CheckFalg { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "changereason")]

 MES.Service/Modes/MesRohInData.cs

@@ -347,16 +347,4 @@
    /// </summary>
    [SugarColumn(ColumnName = "SETTLEMENT")]
    public string? Settlement { get; set; }

    /// <summary>
    ///     éœ€æ±‚部门
    /// </summary>
    [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
    public string? DemandDepartment { get; set; }

    /// <summary>
    ///     æ”¶æ–™éƒ¨é—¨
    /// </summary>
    [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
    public string? ReceivingDepartment { get; set; }
}

 MES.Service/Modes/MesStaff.cs

@@ -147,15 +147,4 @@
    public string FforbidStatus { get; set; }

    [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }

}

 MES.Service/Modes/MesSupplier.cs

@@ -143,32 +143,32 @@
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "TYPE")]
    public string? type { get; set; }
    [SugarColumn(ColumnName = "REMARK1")]
    public string? Remark1 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2
    /// </summary>
    [SugarColumn(ColumnName = "fremarks")]
    public string? fremarks { get; set; }
    [SugarColumn(ColumnName = "REMARK2")]
    public string? Remark2 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段3
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    [SugarColumn(ColumnName = "REMARK3")]
    public string? Remark3 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段4
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }
    [SugarColumn(ColumnName = "REMARK4")]
    public string? Remark4 { get; set; }

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段5
    /// </summary>
   /* [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }*/
    [SugarColumn(ColumnName = "REMARK5")]
    public string? Remark5 { get; set; }

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

 MES.Service/Modes/Organize.cs

@@ -1,40 +1,37 @@
using System;
using System.Collections.Generic;
using System.Linq;
using SqlSugar;
namespace MES.Service.Modes
using SqlSugar;

namespace MES.Service.Modes;

/// <summary>
/// </summary>
[SugarTable("ORGANIZE")]
public class Organize
{
    /// <summary>
    /// ç»„织
    ///</summary>
    [SugarTable("ORGANIZE")]
    public class Organize
    {
        /// <summary>
        /// ç¼–码 
        ///</summary>
         [SugarColumn(ColumnName="FNUMBER"    )]
         public string Fnumber { get; set; }
        /// <summary>
        /// åç§° 
        ///</summary>
         [SugarColumn(ColumnName="FNAME"    )]
         public string Fname { get; set; }
        /// <summary>
        ///  
        ///</summary>
        // [SugarColumn(ColumnName="ID"    )]
        [SugarColumn(IsPrimaryKey = true)]
        public string Id { get; set; }
        /// <summary>
        /// ç¦ç”¨çŠ¶æ€ 
        ///</summary>
         [SugarColumn(ColumnName="FFORBIDSTATUS"    )]
         public string Fforbidstatus { get; set; }
        /// <summary>
        /// æ“ä½œç±»åž‹ 
        ///</summary>
         [SugarColumn(ColumnName="TYPE"    )]
         public string Type { get; set; }
    }
}
    ///
    /// </summary>
    [SugarColumn(ColumnName = "ID")]
    public decimal? Id { get; set; }

    /// <summary>
    /// ç»„织英文
    /// </summary>
    [SugarColumn(ColumnName = "FNUMBER")]
    public string Fnumber { get; set; }

    /// <summary>
    ///     ç»„织名
    /// </summary>
    [SugarColumn(ColumnName = "FNAME")]
    public string Fname { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "FFORBIDSTATUS")]
    public string Fforbidstatus { get; set; }

    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "TYPE")]
    public string Type { get; set; }
}

 MES.Service/Modes/Purdkb.cs

@@ -139,10 +139,4 @@
    /// </summary>
    [SugarColumn(ColumnName = "DKB018")]
    public string Dkb018 { get; set; }

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

 MES.Service/Modes/SysDepartment.cs

@@ -136,20 +136,8 @@
    /// <summary>
    ///     è‡ªå®šä¹‰å­—段1
    /// </summary>
    [SugarColumn(ColumnName = "FParentID")]
    public string? FParentID { get; set; }

    /// <summary>
    ///     ä½¿ç”¨çµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "FSubsidiary")]
    public string? FSubsidiary { get; set; }
    /// <summary>
    ///     å‰µå»ºçµ„ç¹”
    /// </summary>
    [SugarColumn(ColumnName = "Fumbrella")]
    public string? Fumbrella { get; set; }

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

    /// <summary>
    ///     è‡ªå®šä¹‰å­—段2

 MES.Service/Modes/Womcab.cs

@@ -154,14 +154,14 @@
    public string? Denominator { get; set; }

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

    /// <summary>
    ///     åˆ†æ¯
    ///     å˜åŠ¨æŸè€—率
    /// </summary>
    [SugarColumn(ColumnName = "SCRAPRATE")]
    public string? Scraprate { get; set; }
    public decimal? SCRAPRATE { 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/BasicData/MesCustomerManager.cs

@@ -120,9 +120,6 @@

    private MesCustomer GetSysDepartment(ErpCustomer customer)
    {

        //ERP傳輸的接口數據轉換為MES數據庫字段

        return new MesCustomer
        {
            Id = Convert.ToDecimal(customer.Id),
@@ -133,11 +130,6 @@
            Telf1 = customer.Fmobilephone,
            Fseller = customer.Fseller,
            Fforbidstatus = customer.FForbidStatus,
            fremarks =customer.Fremarks,
            FSubsidiary =customer.FSubsidiary,
            Fumbrella = customer.Fumbrella,
            CreateDate=DateTime.Now,
            LastupdateDate=DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/MesDepotsManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -114,12 +113,6 @@
            Depottype = depots.FStockProperty,
            IsNg = depots.FForbidStatus,
            Zuid = depots.FGroup,
            FSubsidiary = depots.FSubsidiary,
            Fumbrella = depots.Fumbrella,
            FSUPPLIERID   = depots.FSUPPLIERID,
            Fdeptid = depots.Fdeptid,
            CreateDate=DateTime.Now,
            LastupdateDate=DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/MesItemTypeManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;

@@ -58,10 +57,6 @@
            Tcode = department.FNumber,
            Tname = department.FName,
            Description = department.FDescription,
            FSubsidiary = department.FSubsidiary,
            Fumbrella = department.Fumbrella,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/MesItemsManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
@@ -16,7 +15,8 @@
                        && c.Company == query.Company
                        && c.ItemNo == query.ItemNo).First();
    }
    


    public bool Save(ErpItems item)
    {
        var entity = GetMesItems(item);
@@ -138,6 +138,7 @@
            Highlimit = item.FMaxStock,
            PrdPack = item.FMinPackCount,
            DepotCode = item.FStockId,
            Ppbom00019124 = item.PPBOM00019124,
            Fmaterialgroup = item.FMaterialGroup,
            Remarks = item.FDescription,
            Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -152,13 +153,6 @@
            ProductionWorkshop = item.FWorkShopId,
            ProduceUnit = item.FPRODUCEUNITID,
            SubconUnit = item.FSUBCONUNITID,
            FSubsidiary = item.FSubsidiary,
            Fumbrella = item.Fumbrella,
            FLOSSPERCENT  = item.FLOSSPERCENT ,
            FMnemonicCode = item.FMnemonicCode,
            FExpPeriod = item.FExpPeriod,
            LastupdateDate=DateTime.Now,
            CreateDate=DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/MesPositionManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -103,8 +102,6 @@
            PositionDescription = position.FDESCRIPTIONS,
            Department = position.FDept,
            Fforbidstatus = position.FForbidStatus,
            FSubsidiary = position.FSubsidiary,
            Fumbrella = position.Fumbrella,
            CreationDate = position.FCreateDate != null
                ? DateTime.ParseExact(position.FCreateDate,
                    "yyyy-MM-dd HH:mm:ss", null)

 MES.Service/service/BasicData/MesRohInManager.cs

@@ -14,18 +14,25 @@
    {
        var rohInErpRohIn = rohIn.ErpRohIn;
        var mesRohIn = GetMesRohIn(rohInErpRohIn);
        var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
        var mesRohInDatas =
            GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);

        return UseTransaction(db =>
        {
            switch (rohInErpRohIn.Type)
            {
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                // case "2":
                //     return InsertData(db, mesRohIn, mesRohInDatas,
                //         rohInErpRohIn.FBILLTYPE)
                //         ? 1
                //         : 0;
                case "3":
                    return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
                case "2":
                case "4":
                    return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
                        ? 1
                        : 0;
                default:
                    throw new NotImplementedException(
                        $"type没有{rohInErpRohIn.Type}这个类型");
@@ -140,13 +147,13 @@
        mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
        mesRohIn.QtyAcceptance = rohIn.Facctype;
        mesRohIn.Purchaser = rohIn.FPurchaserId;
        //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
        mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
        mesRohIn.SettlementParty = rohIn.FSettleId;
        mesRohIn.PaymentParty = rohIn.FChargeId;
       // mesRohIn.Email = rohIn.FProviderEMail;
      //  mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
      mesRohIn.Remarks = rohIn.FHEADNOTE;
      //  mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
        mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
        mesRohIn.Remarks = rohIn.F_UNW_BZ;
        mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;

@@ -185,12 +192,13 @@
                EbelnK3id = Convert.ToDecimal(s.id),
                ErpId = Convert.ToDecimal(s.Eid),
                BillNo = s.FBillNo,
                SalesOrderId=s.FDEMANDBILLNO,
                OrderLineId=s.FSEQ,
                SalesOrderId = s.F_UNW_Text_xsddh,
                ItemId = s.FMaterialId,
                PurchaseUnit = s.FUnitId,
                PurchaseQty = Convert.ToDecimal(s.FQty),
                InventoryUnit = s.FStockUnitID,
                PricingUnit = s.FPriceUnitId,
                PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
                DeliveryDate = s.FDeliveryDate != null
                    ? DateTime.ParseExact(s.FDeliveryDate,
                        "yyyy-MM-dd HH:mm:ss", null)
@@ -204,7 +212,7 @@
                        "yyyy-MM-dd HH:mm:ss", null)
                    : null,
                IsGift = s.FGiveAway,
                Remarks = s.Fnote,
                Remarks = s.FEntryNote,
                SupplierItemCode = s.FSupMatId,
                SupplierItemName = s.FSupMatName,
                OutsourcingOrderId = s.FSUBREQBILLNO,
@@ -238,15 +246,10 @@
                DemandSource = s.FDEMANDTYPE,
                DemandDocumentId = s.FDEMANDBILLNO,
                DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
                DemandOrg = s.FRequireOrgId,
                ReceivingOrg = s.FReceiveOrgId,
                SettlementOrg = s.FSETTLEORGID,
                PurchaseOrderLineNumber = s.FSEQ,
                Demand =s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                Settlement =s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId
                PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
                Demand = s.Demand,
                Receiving = s.Receiving,
                Settlement = s.Settlement
            };

            var single = rohInDataManager.GetSingle(it =>

 MES.Service/service/BasicData/MesStaffManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -119,11 +118,7 @@
            PositionName = staff.FPost,
            PhoneNumber = staff.FMobile,
            Remark = staff.FDescription,
            FforbidStatus = staff.FForbidStatus,
            FSubsidiary = staff.FSubsidiary,
            Fumbrella = staff.Fumbrella,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            FforbidStatus = staff.FForbidStatus
        };

        if (staff.FStaffStartDate != null)
@@ -142,7 +137,7 @@
            Fcode = staff.FStaffNumber,
            Fname = staff.FName,
            Fpassword = "8+()./,", // åˆå§‹å¯†ç 
            Fsystem = "夏蒙",
            Fsystem = "上格",
            Lever = 0,
            Fcompany = "1000",
            Ffactory = "1000",

 MES.Service/service/BasicData/MesSupplierManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -128,12 +127,6 @@
            Telf1 = supplier.F_UNW_LXRDH,
            Fstaffid = supplier.FStaffId,
            Fforbidstatus = supplier.FForbidStatus,
            type= supplier.Type,
            fremarks = supplier.Fremarks,
            FSubsidiary = supplier.Fsubsidiary,
            Fumbrella = supplier.Fumbrella,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/MesUnitManager.cs

@@ -131,8 +131,6 @@
            Fprecision = unit.FPrecision,
            Fdescription = unit.FDescription,
            Fforbidstatus = unit.FForbidStatus,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/BasicData/OrganizeManager.cs

ÎļþÒÑɾ³ý

 MES.Service/service/BasicData/SysDepartmentManager.cs

@@ -1,5 +1,4 @@
using Castle.Core.Resource;
using MES.Service.DB;
using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -118,11 +117,6 @@
            Depextr2 = department.FGroup,
            Depextr3 = department.FWIPStockID,
            Depextr4 = department.FForbidStatus,
            FParentID= department.FParentID,
            FSubsidiary = department.FSubsidiary,
            Fumbrella = department.Fumbrella,
            CreateDate = DateTime.Now,
            LastupdateDate = DateTime.Now,
            Company = "1000",
            Factory = "1000"
        };

 MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs

@@ -25,7 +25,7 @@
                (c, t, u) => new object[]
                {
                    JoinType.Left,
                    c.ItemId == t.Id && c.Company == t.Company &&
                    c.ItemNo == t.ItemNo && c.Company == t.Company &&
                    c.Factory == t.Factory,
                    JoinType.Left,
                    t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
@@ -63,9 +63,9 @@
                (a, d, b, c, t, z) => new object[]
                {
                    JoinType.Inner, d.BillNo == a.LotNo,
                    JoinType.Inner, d.Id == b.Mid && b.ItemId == a.ItemId,
                    JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
                    JoinType.Inner,
                    a.ItemId == c.Id && a.Company == c.Company &&
                    a.ItemNo == c.ItemNo && a.Company == c.Company &&
                    a.Factory == c.Factory,
                    JoinType.Inner, c.Fpurchaseunitid == t.Id,
                    JoinType.Inner, z.ReleaseNo == a.ReleaseNo

 MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs

@@ -120,7 +120,7 @@
        var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
                (g, c, d) => new JoinQueryInfos(
                    JoinType.Left,
                    g.ItemId == c.Id && g.Company == c.Company &&
                    g.ItemNo == c.ItemNo && g.Company == c.Company &&
                    g.Factory == c.Factory, JoinType.Inner,
                    d.Id == Convert.ToDecimal(c.ItemUnit)
                )
@@ -234,7 +234,7 @@
            MesInvItemArnDetail>(
            (g, c, d, a) => new JoinQueryInfos(
                JoinType.Left,
                g.ItemId == c.Id && g.Company == c.Company &&
                g.ItemNo == c.ItemNo && g.Company == c.Company &&
                g.Factory == c.Factory, JoinType.Inner,
                d.Id == Convert.ToDecimal(c.ItemUnit),
                JoinType.Inner,

 MES.Service/service/Warehouse/MesInvItemMovesManager.cs

@@ -171,7 +171,7 @@
    private List<MesInvItemOutItems> GetItemOutItems(WarehouseQuery query)
    {
        var sql = string.Format(
            "SELECT C.ITEM_NO,C.QUANTITY, C.REMARK,C.REMARK,S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK,NVL(ST.QUANTITY, 0) WLKC  FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U  ON U.ID = S.ITEM_UNIT  LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE  LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS  GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO  LEFT JOIN MES_INV_ITEM_MOVES A ON A.ID = C.ITEM_OUT_ID left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE   FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
            "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK,         C.REMARK,         S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK,         NVL(ST.QUANTITY, 0)      WLKC  FROM MES_INV_ITEM_OUT_ITEMS C           JOIN MES_ITEMS S ON C.ITEM_ID = S.ID           LEFT JOIN MES_UNIT U                     ON U.ID = S.ITEM_UNIT           LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE           LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE           LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK                      FROM MES_INV_ITEM_MOVES_C_DETAILS                   GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO         LEFT JOIN MES_INV_ITEM_MOVES A         ON A.ID = C.ITEM_OUT_ID       left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE                 FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
            query.id);

        return Db.Ado.SqlQuery<MesInvItemOutItems>(sql);

 MES.Service/service/Warehouse/MesInvItemOutsManager.cs

@@ -142,12 +142,12 @@
                SELECT SUM(C.QUANTITY) AS SQ_QTY, SUM(D.QUANTITY_OK) AS OK_QTY
                FROM MES_INV_ITEM_OUT_ITEMS C
                LEFT JOIN (
                    SELECT ITEM_OUT_ID, ITEM_NO,ITEM_ID, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
                    SELECT ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
                    FROM MES_INV_ITEM_OUT_C_DETAILS
                    GROUP BY ITEM_OUT_ID, ITEM_NO,ITEM_ID, PBILL_NO, RK_NO
                    GROUP BY ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO
                ) D
                ON D.ITEM_OUT_ID = C.ITEM_OUT_ID
                AND D.ITEM_ID = C.ITEM_ID
                AND D.ITEM_NO = C.ITEM_NO
                AND D.RK_NO = C.RK_NO
                AND NVL(C.PBILL_NO, '0') = NVL(D.PBILL_NO, '0')
                WHERE C.ITEM_OUT_ID = {0}", mesInvItemOuts.Id);
@@ -227,24 +227,22 @@
            FROM MES_INV_ITEM_OUT_ITEMS C
            LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY,
                              ITEM_NO,
                              ITEM_ID,
                              PBILL_NO,
                              RK_NO,
                              WORK_LINE
                         FROM MES_INV_ITEM_OUT_ITEMS
                        GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE,RK_NO) U
              ON U.ITEM_ID = C.ITEM_ID
                        GROUP BY ITEM_NO, PBILL_NO, WORK_LINE,RK_NO) U
              ON U.ITEM_NO = C.ITEM_NO
             AND U.WORK_LINE = C.WORK_LINE
             AND U.PBILL_NO = C.PBILL_NO
             AND U.RK_NO = C.RK_NO
            LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY,
                              ITEM_NO,
                              ITEM_ID,
                              EBELN,
                              WORK_LINE,BILL_NO
                         FROM MES_INV_ITEM_IN_C_ITEMS
                        GROUP BY ITEM_NO, EBELN, WORK_LINE,BILL_NO) s1
              ON S1.ITEM_ID = C.ITEM_ID
              ON S1.ITEM_NO = C.ITEM_NO
             AND S1.WORK_LINE = C.WORK_LINE
             AND S1.EBELN = C.PBILL_NO
                AND S1.BILL_NO = C.RK_NO
@@ -260,7 +258,7 @@

            // åˆ¤æ–­è¡Œæ˜¯å¦é‡å¤
            var cf_Num = Db.Queryable<MesInvItemOutItems>()
                .Where(s1 => s1.ItemId == item.ItemId &&
                .Where(s1 => s1.ItemNo == item.ItemNo &&
                             s1.WorkLine == item.WorkLine &&
                             s1.PbillNo == item.PbillNo &&
                             s1.ItemOutId == mesInvItemOuts.Id &&
@@ -431,7 +429,7 @@
                (b, bar, c, d) => new
                    JoinQueryInfos(
                        JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
                        JoinType.Left, b.ItemId == c.Id &&
                        JoinType.Left, b.ItemNo == c.ItemNo &&
                                       b.Company == c.Company &&
                                       b.Factory == c.Factory,
                        JoinType.Left, b.DepotCode == d.DepotCode &&
@@ -465,16 +463,16 @@
               NVL(s1.RK_QTY, 0) - NVL(KT_QTY, 0) KT_QTY,
               R.DEPOT_SECTION_CODE, S.ITEM_MODEL, S.ITEM_NAME,
               K.CGB014, Q.STAFF_NAME, R.DEPOT_CODE
        FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID
                 LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO
        FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_NO = S.ITEM_NO
                 LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
                            FROM MES_INV_ITEM_OUT_ITEMS
                            GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO) U
                           ON U.ITEM_ID = C.ITEM_ID AND U.WORK_LINE = C.WORK_LINE
                            GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
                           ON U.ITEM_NO = C.ITEM_NO AND U.WORK_LINE = C.WORK_LINE
                               AND U.PBILL_NO = C.PBILL_NO AND U.RK_NO = C.RK_NO
                 LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY, ITEM_NO,ITEM_ID, EBELN, WORK_LINE, BILL_NO
                 LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY, ITEM_NO, EBELN, WORK_LINE, BILL_NO
                            FROM mes_inv_item_in_c_details
                            GROUP BY ITEM_NO,ITEM_ID, EBELN, WORK_LINE, BILL_NO) s1
                           ON S1.ITEM_ID = C.ITEM_ID AND S1.WORK_LINE = C.WORK_LINE
                            GROUP BY ITEM_NO, EBELN, WORK_LINE, BILL_NO) s1
                           ON S1.ITEM_NO = C.ITEM_NO AND S1.WORK_LINE = C.WORK_LINE
                               AND S1.EBELN = C.PBILL_NO AND S1.BILL_NO = C.RK_NO
                 LEFT JOIN MES_ROH_IN_DATA K
                           ON K.BILL_NO = C.PBILL_NO AND C.WORK_LINE = K.PURCHASE_ORDER_LINE_NUMBER
@@ -482,10 +480,10 @@
                 left join MES_STAFF Q on H.PURCHASER = Q.STAFF_NAME
                 LEFT JOIN MES_SUPPLIER T ON H.SUPPLIER = T.ID
                 LEFT JOIN (select *
                            from (SELECT row_number() over (partition by DEPOT_CODE,ITEM_ID, EBELN order by CREATE_DATE) rn, DEPOT_CODE, DEPOT_SECTION_CODE,ITEM_ID
                            from (SELECT row_number() over (partition by DEPOT_CODE, ITEM_NO, EBELN order by CREATE_DATE) rn, DEPOT_CODE, DEPOT_SECTION_CODE, ITEM_NO,
                                         EBELN FROM mes_inv_item_in_c_details
                                  where EBELN is not null)
                            where rn = 1 and ROWNUM = 1) R ON R.ITEM_ID = C.ITEM_ID) where 1=1 {0}",
                            where rn = 1 and ROWNUM = 1) R ON R.ITEM_NO = C.ITEM_NO) where 1=1 {0}",
            where);
        var results = Db.Ado.SqlQuery<MESInvItemOutItems>(sql);
        return results;
@@ -501,13 +499,13 @@
              FROM (SELECT f_get_section_code2('1000', '1000', b.ITEM_NO,'{0}') DEPOT,
                           B.ITEM_NO, A.ITEM_MODEL,A.ITEM_NAME,to_char(nvl(b.QUANTITY, 0) - nvl(D.QUANTITY_OK, 0),'FM9999999990.00') QTY
                      FROM MES_INV_ITEM_OUT_ITEMS B LEFT JOIN mes_ITEMS A
                        ON B.ITEM_ID = A.ID LEFT JOIN (SELECT ITEM_OUT_ID,
                                       ITEM_NO,ITEM_ID,PBILL_NO,SUM(QUANTITY) QUANTITY_OK,RK_NO
                        ON B.ITEM_NO = A.ITEM_NO LEFT JOIN (SELECT ITEM_OUT_ID,
                                       ITEM_NO,PBILL_NO,SUM(QUANTITY) QUANTITY_OK,RK_NO
                                  FROM MES_INV_ITEM_OUT_C_DETAILS
                                 WHERE ITEM_OUT_ID = {1}
                                 GROUP BY ITEM_OUT_ID,ITEM_NO,ITEM_ID,PBILL_NO,RK_NO) D
                                 GROUP BY ITEM_OUT_ID,ITEM_NO,PBILL_NO,RK_NO) D
                        ON D.ITEM_OUT_ID = B.ITEM_OUT_ID
                       AND D.ITEM_ID = B.ITEM_ID
                       AND D.ITEM_NO = B.ITEM_NO
                       AND D.PBILL_NO = B.PBILL_NO
                       AND D.RK_NO = B.RK_NO
                     WHERE B.ITEM_OUT_ID = {1}
@@ -547,21 +545,21 @@
                               to_char(b.CREATE_DATE, 'yyyy-mm-dd') as CREATE_DATE
                        from mes_inv_item_in_c_details b
                                 left join mes_inv_item_ins a on b.item_in_id = a.id
                                 LEFT JOIN (select s.item_no,s.item_id, s.work_line, s.Work_no,
                                 LEFT JOIN (select s.item_no, s.work_line, s.Work_no,
                                                   sum(s.quantity) quantity, S.RK_NO
                                            from mes_inv_item_out_c_details s
                                            group by s.item_no,s.item_id, s.work_line, s.work_no, S.RK_NO) s1
                                            group by s.item_no, s.work_line, s.work_no, S.RK_NO) s1
                                           ON NVL(B.work_LINE, '0') = NVL(s1.work_LINE, '0')
                                               and B.work_no = s1.work_no
                                               and B.item_id = s1.item_id
                                               and B.item_no = s1.item_no
                                               AND B.BILL_NO = S1.RK_NO
                                 LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO
                                 LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
                                            FROM MES_INV_ITEM_OUT_ITEMS
                                            GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO) U
                                           ON U.ITEM_ID = B.ITEM_ID
                                            GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
                                           ON U.ITEM_NO = B.ITEM_NO
                                               AND U.WORK_LINE = B.WORK_LINE
                                               AND U.PBILL_NO = B.WORK_NO AND U.RK_NO = B.BILL_NO
                                 left join mes_items s2 on b.item_id = s2.id
                                 left join mes_items s2 on b.item_no = s2.item_no
                                 left join purdha da on da.dha001 = b.cbill_no
                        WHERE A.BILL_NO LIKE 'Q%'
                          AND A.CBILL_NO like 'L%'

 MES.Service/service/Warehouse/OpeningReceiptServer.cs

@@ -77,13 +77,13 @@
        return entity;
    }

    public MesInvItemIns GetMesInvItemIns(decimal? id)
    public MesInvItemIns GetMesInvItemIns(decimal id)
    {
        return Db.Queryable<MesInvItemIns>()
            .Where(s => s.Id == id).Single();
    }

    public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal? id)
    public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal id)
    {
        return Db.Queryable<MesInvItemInCDetails, MesUnit>((a, b) =>
                new JoinQueryInfos(JoinType.Inner, a.Unit == b.Id.ToString()))
@@ -136,8 +136,7 @@
            CbillNo = barcodeInfo.BillNo,
            UrgentFlag = barcodeInfo.UrgentFlag,
            BoardStyle = barcodeInfo.BoardStyle,
            TaskNo = barcodeInfo.TaskNo,
            ItemId = barcodeInfo.ItemId,
            TaskNo = barcodeInfo.TaskNo
        }).ExecuteCommand();

        if (executeCommand <= 0) throw new Exception("写入失败");
@@ -245,8 +244,7 @@
            BoardStyle = barcodeInfo.BoardStyle,
            WorkNo = barcodeInfo.WorkNo,
            WorkLine = barcodeInfo.WorkLine,
            SuppNo = barcodeInfo.SuppNo,
            ItemId = barcodeInfo.ItemId,
            SuppNo = barcodeInfo.SuppNo
        }).ExecuteCommand();

        if (executeCommand <= 0) throw new Exception("写入失败");
@@ -279,8 +277,7 @@
            BillNo = billNo,
            WorkNo = barcodeInfo.WorkNo,
            WorkLine = barcodeInfo.WorkLine,
            SuppNo = barcodeInfo.SuppNo,
            ItemId = barcodeInfo.ItemId,
            SuppNo = barcodeInfo.SuppNo
        }).ExecuteCommand();

        if (executeCommand <= 0) throw new Exception("写入失败");

 MES.Service/service/WomcaaManager.cs

@@ -23,7 +23,9 @@
    {
        var womErpCaa = wom.ErpCaa;
        var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
        var mesWomcabs =MapErpCABtoWomcab(wom.ErpCabs);
        var mesWomcabs =
            MapErpCABtoWomcab(wom.ErpCabs);

        return UseTransaction(db =>
        {
            switch (womErpCaa.Type)
@@ -32,7 +34,6 @@
                    return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
                case "2":
                case "4":
                case "5":
                    return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
                        ? 1
                        : 0;
@@ -47,9 +48,11 @@
        List<Womcab> mesWomcabs)
    {
        if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);

        if (mesWomcabs.Count > 0)
            db.Deleteable<Womcab>()
                .Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();

        var orUpdate = base.Insert(mesWomcaa);
        var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
        if (orUpdate && baOrUpdate) return true;
@@ -75,7 +78,9 @@
        {
            Erpid = Convert.ToDecimal(dto.Id),
            Caa001 = dto.FBillNo,
            Caa021 = dto.FWorkShopID,
            Caa021 = dto.FWorkShopID0,
            RoutingId = dto.FRoutingId,
            WorkShopId = dto.FREMWorkShopId,
            DepotCode = dto.FStockId,
            CreateDate = dto.FDate,
            Caa004 = dto.FBillType,
@@ -95,6 +100,7 @@
            Mtono = dto.FMTONO,
            Lot = dto.FLot,
            Caa013 = dto.FBomId,
            Caa015 = dto.F_UNW_Text_xsddh,
            CreateType = dto.FCreateType,
            SrcBillType = dto.FSrcBillType,
            SrcBillNo = dto.FSrcBillNo,
@@ -104,10 +110,10 @@
            ForceCloserid = dto.FForceCloserId,
            CloseType = dto.FCloseType,
            SrcSplitBillno = dto.FSrcSplitBillNo,
            Caa016 = dto.FDESCRIPTION,
            Caa018 = Convert.ToDecimal(dto.PLAN_ID),
            Caa019 = Convert.ToDecimal(dto.PLAN_SEQ),
            Caa020 = dto.PLAN_NUM
            Caa016 = dto.FMemoItem,
            Caa018 = Convert.ToDecimal(dto.planId),
            Caa019 = Convert.ToDecimal(dto.planSeq),
            Caa020 = dto.planNum
        };

        var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -124,12 +130,12 @@
        {
            var womcab = new Womcab
            {
                Erpid = Convert.ToDecimal(dto.FENTRYID),
                Erpid = Convert.ToDecimal(dto.ID),
                Cab001 = dto.FBillNo,
                Cab002 = dto.FSeq,
                Cab003 = dto.FMaterialID,
                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
                    ? Convert.ToDecimal(dto.FNeedQty)
                Cab003 = dto.FMaterialID2,
                Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
                    ? Convert.ToDecimal(dto.FNeedQty2)
                    : null,
                Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
                    ? Convert.ToDecimal(dto.FPickedQty)
@@ -140,6 +146,7 @@
                Lot = dto.FLot,
                DepotCode = dto.FStockID,
                IssueType = dto.FIssueType,
                Cab008 = dto.F_UNW_Text_tpgy,
                Cab009 = dto.FUnitID,
                SupplyType = dto.FSupplyType,
                Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
@@ -148,7 +155,9 @@
                Cab014 = dto.FIsKeyItem,
                Numerator = dto.FNumerator,
                Denominator = dto.FDenominator,
                Eid = Convert.ToDecimal(dto.FID)
                Eid = Convert.ToDecimal(dto.PID),
                SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
                SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
            };

            var entity = Db.Queryable<Womcab>()

 MESApplication/Controllers/BasicData/OrganizeController.cs

ÎļþÒÑɾ³ý

 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/Debug/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>
                èŽ·å–所有