生产领料

啊鑫

2024-09-03 44abd42a36a8265fb6f91849df7a5a05383b3c63

生产领料

 MES.Service/Modes/MesInvBusiness2.cs

@@ -8,220 +8,226 @@
[SugarTable("MES_INV_BUSINESS2")]
public class MesInvBusiness2
{
   /// <summary>
   ///     ID(seq_inv_id)
   /// </summary>
   [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
    /// <summary>
    ///     ID(seq_inv_id)
    /// </summary>
    [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
        IsPrimaryKey = true)]
    public decimal Id { get; set; }

   /// <summary>
   ///     çŠ¶æ€|0-未交易1-已交易
   /// </summary>
   [SugarColumn(ColumnName = "STATUS")]
    /// <summary>
    /// çŠ¶æ€|0-未交易1-已交易 
    ///</summary>
    [SugarColumn(ColumnName = "STATUS")]
    public decimal? Status { get; set; }

   /// <summary>
   ///     å•æ®ç±»åž‹ID
   /// </summary>
   [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    /// <summary>
    /// å•æ®ç±»åž‹ID 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_TYPE_ID")]
    public decimal? BillTypeId { get; set; }

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

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

   /// <summary>
   ///     å•æ®ID
   /// </summary>
   [SugarColumn(ColumnName = "BILL_ID")]
    /// <summary>
    /// å•æ®ID 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_ID")]
    public decimal? BillId { get; set; }

   /// <summary>
   ///     å•æ®ç¼–码
   /// </summary>
   [SugarColumn(ColumnName = "BILL_NO")]
    public string BillNo { get; set; }
    /// <summary>
    /// å•æ®ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_NO")]
    public string? BillNo { 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 = "CUSTOMER_NO")]
    public string CustomerNo { get; set; }
    /// <summary>
    /// å®¢æˆ·ç¼–号 
    ///</summary>
    [SugarColumn(ColumnName = "CUSTOMER_NO")]
    public string? CustomerNo { get; set; }

   /// <summary>
   ///     å•æ®è¡ŒID
   /// </summary>
   [SugarColumn(ColumnName = "BILL_LINE_ID")]
    /// <summary>
    /// å•æ®è¡ŒID 
    ///</summary>
    [SugarColumn(ColumnName = "BILL_LINE_ID")]
    public decimal? BillLineId { get; set; }

   /// <summary>
   ///     ç‰©æ–™æ¡ç 
   /// </summary>
   [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string ItemBarcode { get; set; }
    /// <summary>
    /// ç‰©æ–™æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE")]
    public string? ItemBarcode { 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 = "C_ITEM_CODE")]
    public string CItemCode { get; set; }
    /// <summary>
    /// å®¢æˆ·ç‰©æ–™ç¼–码 
    ///</summary>
    [SugarColumn(ColumnName = "C_ITEM_CODE")]
    public string? CItemCode { get; set; }

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

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

   /// <summary>
   ///     æ•°é‡
   /// </summary>
   [SugarColumn(ColumnName = "QUANTITY")]
    /// <summary>
    /// æ•°é‡ 
    ///</summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

   /// <summary>
   ///     æºå­åº“CODE
   /// </summary>
   [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
    public string FromInvDepotsCode { get; set; }
    /// <summary>
    /// æºå­åº“CODE 
    ///</summary>
    [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
    public string? FromInvDepotsCode { get; set; }

   /// <summary>
   ///     æºè´§ä½CODE
   /// </summary>
   [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
    public string FromInvDepotSectionsCode { get; set; }
    /// <summary>
    /// æºè´§ä½CODE 
    ///</summary>
    [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
    public string? FromInvDepotSectionsCode { get; set; }

   /// <summary>
   ///     ç›®çš„子库CODE
   /// </summary>
   [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
    public string ToInvDepotsCode { get; set; }
    /// <summary>
    /// ç›®çš„子库CODE 
    ///</summary>
    [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
    public string? ToInvDepotsCode { get; set; }

   /// <summary>
   ///     ç›®çš„货位CODE
   /// </summary>
   [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
    public string ToInvDepotSectionsCode { get; set; }
    /// <summary>
    /// ç›®çš„货位CODE 
    ///</summary>
    [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
    public string? ToInvDepotSectionsCode { get; set; }

   /// <summary>
   ///     äº¤æ˜“异常信息
   /// </summary>
   [SugarColumn(ColumnName = "DESCRIPTION")]
    public string Description { get; set; }
    /// <summary>
    /// äº¤æ˜“异常信息 
    ///</summary>
    [SugarColumn(ColumnName = "DESCRIPTION")]
    public string? Description { 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")]
    /// <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")]
    /// <summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

   /// <summary>
   ///     è¶…损统计标识
   /// </summary>
   [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
    /// <summary>
    /// è¶…损统计标识 
    ///</summary>
    [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
    public short? UllageStatFlag { get; set; }

   /// <summary>
   ///     åˆ†åŽ‚编码
   /// </summary>
   [SugarColumn(ColumnName = "FACTORY")]
    public string Factory { get; set; }
    /// <summary>
    /// åˆ†åŽ‚编码 
    ///</summary>
    [SugarColumn(ColumnName = "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 = "ITEM_BARCODE2")]
    public string ItemBarcode2 { get; set; }
    /// <summary>
    /// ç®±å·æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE2")]
    public string? ItemBarcode2 { get; set; }

   /// <summary>
   ///     å¡æ¿æ¡ç 
   /// </summary>
   [SugarColumn(ColumnName = "ITEM_BARCODE3")]
    public string ItemBarcode3 { get; set; }
    /// <summary>
    /// å¡æ¿æ¡ç  
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_BARCODE3")]
    public string? ItemBarcode3 { 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>
   ///     ä»»åŠ¡å•è¡Œå·
   /// </summary>
   [SugarColumn(ColumnName = "WORK_LINE")]
    /// <summary>
    /// ä»»åŠ¡å•è¡Œå· 
    ///</summary>
    [SugarColumn(ColumnName = "WORK_LINE")]
    public decimal? WorkLine { get; set; }

   /// <summary>
   ///     ä¾›åº”商
   /// </summary>
   [SugarColumn(ColumnName = "SUPP_NO")]
    public string SuppNo { get; set; }
    /// <summary>
    /// ä¾›åº”商 
    ///</summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string? SuppNo { 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>
   ///     é‡‡è´­è®¢å•id
   /// </summary>
   [SugarColumn(ColumnName = "EBELN_K3ID")]
    /// <summary>
    /// é‡‡è´­è®¢å•id 
    ///</summary>
    [SugarColumn(ColumnName = "EBELN_K3ID")]
    public decimal? EbelnK3id { get; set; }

   /// <summary>
   ///     é‡‡è´­è®¢å•è¡Œid
   /// </summary>
   [SugarColumn(ColumnName = "LINE_K3ID")]
    /// <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/MesInvItemBarcodes.cs

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

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

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

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

    /// <summary>
    ///     æœ¬å¸ç‰©æ–™ç¼–码
    /// </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>
    ///     æ•°é‡
@@ -67,13 +67,13 @@
    ///     ç”Ÿäº§å·¥å•
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string TaskNo { get; set; }
    public string? TaskNo { get; set; }

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

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

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
@@ -97,25 +97,25 @@
    ///     å®¢æˆ·ç¼–号
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string CustNo { get; set; }
    public string? CustNo { get; set; }

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

    /// <summary>
    ///     åŽŸPSN物料条码
    /// </summary>
    [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
    public string OldItemBarcode { get; set; }
    public string? OldItemBarcode { get; set; }

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

    /// <summary>
    ///     SAP收货物料凭证行号  --采购单行号
@@ -157,7 +157,7 @@
    ///     å•ä½
    /// </summary>
    [SugarColumn(ColumnName = "UNIT")]
    public string Unit { get; set; }
    public string? Unit { get; set; }

    /// <summary>
    ///     é‡é‡ï¼ˆå•ä½ï¼šå…¬æ–¤ï¼‰
@@ -181,49 +181,49 @@
    ///     æ±‡æ€»æ¡ç 
    /// </summary>
    [SugarColumn(ColumnName = "SUM_BARCODE")]
    public string SumBarcode { get; set; }
    public string? SumBarcode { get; set; }

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

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

    /// <summary>
    ///     æ¥æº
    /// </summary>
    [SugarColumn(ColumnName = "MEMO")]
    public string Memo { get; set; }
    public string? Memo { get; set; }

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

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

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

    /// <summary>
    ///     ç‰©æ–™ç®€ç§°
    /// </summary>
    [SugarColumn(ColumnName = "ITEM_SNAME")]
    public string ItemSname { get; set; }
    public string? ItemSname { get; set; }

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

    /// <summary>
    ///     å†»ç»“时间
@@ -247,13 +247,13 @@
    ///     å†»ç»“原因
    /// </summary>
    [SugarColumn(ColumnName = "FLEZZ_REASON")]
    public string FlezzReason { get; set; }
    public string? FlezzReason { get; set; }

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

    /// <summary>
    ///     å»¶é•¿ä¿è´¨æœŸ
@@ -271,37 +271,37 @@
    ///     æ‰“印ID，用来区分打印次数
    /// </summary>
    [SugarColumn(ColumnName = "PRINT_ID")]
    public string PrintId { get; set; }
    public string? PrintId { get; set; }

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

    /// <summary>
    ///     å·¥åŽ‚编号
    /// </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 = "LINFLINE")]
    public string Linfline { get; set; }
    public string? Linfline { get; set; }

    /// <summary>
    ///     æœ‰æ•ˆæœŸ
@@ -313,25 +313,25 @@
    ///     è´¨æ£€ç»“æžœ
    /// </summary>
    [SugarColumn(ColumnName = "IQC_STATUS")]
    public string IqcStatus { get; set; }
    public string? IqcStatus { get; set; }

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

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

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

    /// <summary>
    ///     ä¿è´¨æœŸ
@@ -343,19 +343,19 @@
    ///     ä¾›åº”商、赠品、客供料、委外
    /// </summary>
    [SugarColumn(ColumnName = "BARCODETYPE")]
    public string Barcodetype { get; set; }
    public string? Barcodetype { get; set; }

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

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

    /// <summary>
    ///     æ€¥æ–™æ ‡è¯†
@@ -367,13 +367,13 @@
    ///     é¢œè‰²
    /// </summary>
    [SugarColumn(ColumnName = "COLOR_NAME")]
    public string ColorName { get; set; }
    public string? ColorName { get; set; }

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

    /// <summary>
    ///     æ¥æ–™æ—¥æœŸ
@@ -391,13 +391,13 @@
    ///     ä¸è‰¯åŽŸå› 
    /// </summary>
    [SugarColumn(ColumnName = "MEMO_BAD")]
    public string MemoBad { get; set; }
    public string? MemoBad { get; set; }

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

    /// <summary>
    ///     æ¡ç æ¥æºæ ‡è¯†ï¼Œ0-初期物料,1-采购入库，2、生产退料，3、其它入库，4-客供料,5-在库分料，6-制程条码
@@ -409,7 +409,7 @@
    ///     ç”Ÿäº§çº¿ä½“
    /// </summary>
    [SugarColumn(ColumnName = "LINE_NO")]
    public string LineNo { get; set; }
    public string? LineNo { get; set; }

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

    /// <summary>
    ///     ä¸å°æ´¾å·¥ä»Žè¡¨ID
@@ -457,7 +457,7 @@
    ///     æŠ¥å·¥æ—¶é—´
    /// </summary>
    [SugarColumn(ColumnName = "WORK_FLGTIME")]
    public string WorkFlgtime { get; set; }
    public string? WorkFlgtime { get; set; }

    /// <summary>
    ///     é‡‡è´­è®¢å•ID
@@ -486,11 +486,11 @@
    ///     ç»„织id
    /// </summary>
    [SugarColumn(ColumnName = "ORG_NAME")]
    public string OrgName { get; set; }
    public string? OrgName { get; set; }

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

 MES.Service/Modes/MesInvItemOutCDetails.cs

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

    /// <summary>
    ///     å‡ºåº“单id
    /// </summary>
    /// å‡ºåº“单id 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_OUT_ID")]
    public decimal? ItemOutId { get; set; }

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

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

    /// <summary>
    ///     æœ¬å¸ç‰©æ–™ç¼–码（无条码手工录入，有条码为冗余字段）
    /// </summary>
    /// æœ¬å¸ç‰©æ–™ç¼–码（无条码手工录入，有条码为冗余字段） 
    ///</summary>
    [SugarColumn(ColumnName = "ITEM_NO")]
    public string ItemNo { get; set; }

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

    /// <summary>
    ///     æ•°é‡ï¼ˆæ— æ¡ç æ‰‹å·¥å½•å…¥ï¼Œæœ‰æ¡ç ä¸ºå†—余字段）
    /// </summary>
    /// æ•°é‡ï¼ˆæ— æ¡ç æ‰‹å·¥å½•å…¥ï¼Œæœ‰æ¡ç ä¸ºå†—余字段） 
    ///</summary>
    [SugarColumn(ColumnName = "QUANTITY")]
    public decimal? Quantity { get; set; }

    /// <summary>
    ///     æŒªæ–™æ ‡å¿—（0－否，1－是）
    /// </summary>
    /// æŒªæ–™æ ‡å¿—（0－否，1－是） 
    ///</summary>
    [SugarColumn(ColumnName = "FORCE_OUT_FLAG")]
    public decimal? ForceOutFlag { get; set; }

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

    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
    /// </summary>
    /// åˆ›å»ºæ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    /// æœ€åŽæ›´æ–°äºº 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string LastupdateBy { get; set; }

    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
    /// </summary>
    /// æœ€åŽæ›´æ–°æ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
    public DateTime? LastupdateDate { get; set; }

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

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

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

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

    /// <summary>
    ///     å…æ£€æ ‡è¯†(0-否，1-是)
    /// </summary>
    /// å…æ£€æ ‡è¯†(0-否，1-是) 
    ///</summary>
    [SugarColumn(ColumnName = "FORCE_EXEMPT_FLAG")]
    public short? ForceExemptFlag { get; set; }

    /// <summary>
    ///     æŠ•æ–™æ‰¹æ¬¡
    /// </summary>
    /// æŠ•æ–™æ‰¹æ¬¡ 
    ///</summary>
    [SugarColumn(ColumnName = "PRD_LOT_NO")]
    public string PrdLotNo { get; set; }

    /// <summary>
    ///     æ˜¯å¦åšæŽ¥æ”¶æ£€æŸ¥
    /// </summary>
    /// æ˜¯å¦åšæŽ¥æ”¶æ£€æŸ¥ 
    ///</summary>
    [SugarColumn(ColumnName = "CHECK_STATUS")]
    public short? CheckStatus { get; set; }

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

    /// <summary>
    ///     å…¬å¸ç¼–号
    /// </summary>
    /// å…¬å¸ç¼–号 
    ///</summary>
    [SugarColumn(ColumnName = "COMPANY")]
    public string Company { get; set; }

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

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

    /// <summary>
    ///     åŒ…装批次
    /// </summary>
    /// åŒ…装批次 
    ///</summary>
    [SugarColumn(ColumnName = "TASK_PACK")]
    public string TaskPack { get; set; }

    /// <summary>
    ///     å¡æ¿
    /// </summary>
    /// å¡æ¿ 
    ///</summary>
    [SugarColumn(ColumnName = "KB_NO")]
    public string KbNo { get; set; }

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

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

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

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

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

    /// <summary>
    ///     é¢†æ–™å•å·/委外订单
    /// </summary>
    /// é¢†æ–™å•å·/委外订单 
    ///</summary>
    [SugarColumn(ColumnName = "PBILL_NO")]
    public string PbillNo { get; set; }

    /// <summary>
    ///     æŽ¥æ”¶æ ‡è¯†/1已接收
    /// </summary>
    /// æŽ¥æ”¶æ ‡è¯†/1已接收 
    ///</summary>
    [SugarColumn(ColumnName = "RECEIVE")]
    public decimal? Receive { get; set; }

    /// <summary>
    ///     æŽ¥æ”¶æ—¶é—´
    /// </summary>
    /// æŽ¥æ”¶æ—¶é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "RTIME")]
    public DateTime? Rtime { get; set; }

    /// <summary>
    ///     æŽ¥æ”¶äºº
    /// </summary>
    /// æŽ¥æ”¶äºº 
    ///</summary>
    [SugarColumn(ColumnName = "RCV_BY")]
    public string RcvBy { get; set; }

    /// <summary>
    ///     æŽ¥æ”¶è½¦é—´
    /// </summary>
    /// æŽ¥æ”¶è½¦é—´ 
    ///</summary>
    [SugarColumn(ColumnName = "RCV_PART")]
    public string RcvPart { get; set; }

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

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

    /// <summary>
    ///     é‡‡è´­è®¢å•è¡Œid
    /// </summary>
    /// é‡‡è´­è®¢å•è¡Œid 
    ///</summary>
    [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/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/Warehouse/MesInvItemBarcodesManager.cs

@@ -1,5 +1,7 @@
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;

namespace MES.Service.service.Warehouse;
@@ -10,69 +12,667 @@

    //这里面写的代码不会给覆盖,如果要重新生成请删除 MesInvItemBarcodesManager.cs

    #region ç”Ÿäº§é¢†æ–™æ¡ç éªŒè¯

    #region æ•™å­¦æ–¹æ³•

    /// <summary>
    ///     ä»“储方法满足不了复杂业务需求，业务代码请在这里面定义方法
    /// </summary>
    public void Study()
    //生产领料条码验证合理性
    private bool PdaProdPickItemCkBar(string cBarcode, string cDaa001)
    {
        /*********查询*********/

        var data1 = base.GetById(1); //根据ID查询
        var data2 = base.GetList(); //查询所有
        var data3 = base.GetList(it => 1 == 1); //根据条件查询  
        //var data4 = base.GetSingle(it => 1 == 1);//根据条件查询一条,如果超过一条会报错

        var p = new PageModel { PageIndex = 1, PageSize = 2 }; // åˆ†é¡µæŸ¥è¯¢
        var data5 = base.GetPageList(it => 1 == 1, p);
        Console.Write(p.TotalCount); //返回总数

        var data6 =
            base.GetPageList(it => 1 == 1, p,
                it => SqlFunc.GetRandom()); // åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
        Console.Write(p.TotalCount); //返回总数

        var conModels = new List<IConditionalModel>(); //组装条件查询作为条件实现 åˆ†é¡µæŸ¥è¯¢åŠ æŽ’序
        conModels.Add(new ConditionalModel
        try
        {
            FieldName = typeof(MesInvItemBarcodes).GetProperties()[0].Name,
            ConditionalType = ConditionalType.Equal, FieldValue = "1"
        }); //id=1
        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
            // 1. æ£€æŸ¥æ¡ç æ˜¯å¦ä¸ºç©º
            if (string.IsNullOrEmpty(cBarcode))
            {
                throw new Exception("请输入条码！");
            }

        AsQueryable().Where(x => 1 == 1)
            .ToList(); //支持了转换成queryable,我们可以用queryable实现复杂功能
            // 2. æ£€æŸ¥æ¡ç æ˜¯å¦å­˜åœ¨äºŽ MesInvItemBarcodes è¡¨ä¸­
            int tempNum = Db.Queryable<MesInvItemBarcodes>()
                .Where(it => it.ItemBarcode == cBarcode)
                .Count();
            if (tempNum == 0)
            {
                throw new Exception("条码不存在！");
            }

            // 3. æ£€æŸ¥æ¡ç æ˜¯å¦å­˜åœ¨äºŽ MesInvItemStocks è¡¨ä¸­
            tempNum = Db.Queryable<MesInvItemStocks>()
                .Where(it => it.ItemBarcode == cBarcode)
                .Count();
            if (tempNum == 0)
            {
                throw new Exception("库存中无此条码！");
            }

        /*********插入*********/
        var insertData = new MesInvItemBarcodes(); //测试参数
        var insertArray = new[] { insertData };
        base.Insert(insertData); //插入
        base.InsertRange(insertArray); //批量插入
        var id = base.InsertReturnIdentity(insertData); //插入返回自增列
        AsInsertable(insertData).ExecuteCommand(); //我们可以转成 Insertable实现复杂插入
            // 4. èŽ·å– MesInvItemBarcodes çš„数据
            var mesInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
                .Where(it => it.ItemBarcode == cBarcode)
                .First();
            if (mesInvItemBarcodes == null)
            {
                throw new Exception("条码不存在！");
            }

            // 5. æ£€æŸ¥æ¡ç æ•°é‡æ˜¯å¦ä¸º 0
            if (mesInvItemBarcodes.Quantity == 0)
            {
                throw new Exception("此条码数量为0！");
            }

        /*********更新*********/
        var updateData = new MesInvItemBarcodes(); //测试参数
        var updateArray = new[] { updateData }; //测试参数
        base.Update(updateData); //根据实体更新
        base.UpdateRange(updateArray); //批量更新
        //base.Update(it => new MesInvItemBarcodes() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// åªæ›´æ–°ClassName列和CreateTime列，其它列不更新，条件id=1
        AsUpdateable(updateData).ExecuteCommand(); //转成Updateable可以实现复杂的插入
            // 6. æ£€æŸ¥æ¡ç çŠ¶æ€
            if (mesInvItemBarcodes.Barcodestatus == 1 ||
                mesInvItemBarcodes.Hbdytm == 1)
            {
                throw new Exception("无效条码！");
            }

            // 7. æ£€æŸ¥æ¡ç æ˜¯å¦è¢«å†»ç»“
            if (mesInvItemBarcodes.Visable == 1)
            {
                throw new Exception("条码冻结！");
            }

        /*********删除*********/
        var deldata = new MesInvItemBarcodes(); //测试参数
        base.Delete(deldata); //根据实体删除
        base.DeleteById(1); //根据主键删除
        base.DeleteById(new[] { 1, 2 }); //根据主键数组删除
        base.Delete(it => 1 == 2); //根据条件删除
        AsDeleteable().Where(it => 1 == 2)
            .ExecuteCommand(); //转成Deleteable实现复杂的操作
            // 8. æ£€æŸ¥æ¡ç æ˜¯å¦ä½œåºŸ
            if (mesInvItemBarcodes.Location == 2)
            {
                throw new Exception("条码作废！");
            }

            // 9. æ£€æŸ¥æŠ•æ–™å•æ˜¯å¦éœ€è¦æ­¤ç‰©æ–™
            tempNum = Db.Queryable<Womdab>()
                .Where(it =>
                    it.Dab001 == cDaa001 && it.Dab003 ==
                    mesInvItemBarcodes.ItemId.ToString())
                .Count();
            if (tempNum == 0)
            {
                throw new Exception("投料单不需要此物料！");
            }

            string sql =
                "SELECT COUNT(1) FROM WOMDAB WHERE DAB001='" + cDaa001 +
                "' AND  DAB003='" + mesInvItemBarcodes.ItemId +
                "' AND DAB017=(SELECT DEPOTS_CODE    FROM MES_INV_ITEM_STOCKS WHERE ITEM_BARCODE='" +
                cBarcode + "')";

            // 10. æ£€æŸ¥å‘料仓库是否正确
            tempNum = Db.Ado.SqlQuerySingle<int>(sql);
            if (tempNum == 0)
            {
                throw new Exception("发料仓库有误！");
            }

            // 11. æˆåŠŸï¼Œè¿”回结果
            return true;
        }
        catch (Exception ex)
        {
            // æ•èŽ·å¼‚常并重新抛出
            throw new Exception($"报错: {ex.Message}");
        }
    }

    public decimal? GetBarCodesQuan(WarehouseQuery query)
    {
        if (!PdaProdPickItemCkBar(query.barcode, query.daa001))
        {
            return null;
        }

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

        if (invItemBarcodes == null)
        {
            throw new Exception("条码不存在！");
        }

        return invItemBarcodes.Quantity;
    }

    //生产领料保存
    public string PrcRfPdaProdPickItem3(WarehouseQuery query)
    {
        var (factory, company) = UserUtil.GetFactory(query.userName);
        var param = new ProdPickParams
        {
            CUser = query.userName,
            CBarcode = query.barcode,
            CDaa001 = query.daa001,
            CNum = query.Num,
            PiFactory = factory,
            PiCompany = company
        };

        // æ£€æŸ¥å‘料数量是否合法
        if (param.CNum <= 0)
        {
            throw new Exception("发料数量不能小于等于0！");
        }

        // æ£€æŸ¥æ¡ç æ˜¯å¦å­˜åœ¨
        param.CInvItemBarcodes = Db.Queryable<MesInvItemBarcodes>()
            .Where(it => it.ItemBarcode == param.CBarcode)
            .First();
        if (param.CInvItemBarcodes == null)
        {
            throw new Exception("条码不存在！");
        }

        // æ£€æŸ¥æ¡ç æ˜¯å¦å·²å…¥åº“
        param.CInvItemStocks = Db.Queryable<MesInvItemStocks>()
            .Where(it => it.ItemBarcode == param.CBarcode)
            .First();
        if (param.CInvItemStocks == null)
        {
            throw new Exception("条码未入库！");
        }

        // æ£€æŸ¥å·¥å•å·æ˜¯å¦å­˜åœ¨
        param.CWomdaa = Db.Queryable<Womdaa>()
            .Where(it => it.Daa001 == param.CDaa001)
            .First();
        if (param.CWomdaa == null)
        {
            throw new Exception("不存在此工单！");
        }

        // æ£€æŸ¥å‘料数量是否超出条码数量
        if (param.CNum > param.CInvItemBarcodes.Quantity)
        {
            throw new Exception("发料数量不能大于条码数量！");
        }

        // æ£€æŸ¥æ¡ç åˆæ³•æ€§
        if (!PdaProdPickItemCkBar(param.CBarcode, param.CDaa001))
        {
            return null;
        }

        // è®¡ç®—剩余可发数量
        decimal? tempNum = CalculateRemainingQuantity(param.CDaa001,
            param.CInvItemBarcodes.ItemId);
        if (param.CNum > tempNum)
        {
            throw new Exception("发料数量不能大于对应物料的未发料数量！");
        }

        // å·¥å•éƒ¨é—¨åç§°
        param.CDepart = Db.Queryable<SysDepartment>()
            .Where(dep => dep.Id.ToString() == param.CWomdaa.Daa013)
            .Select(dep => dep.Departmentname)
            .First();

        // ç”Ÿæˆæ–°æ¡ç 
        param.NewBarcode = GenerateNewBarcode(param.CBarcode);

        UseTransaction(db =>
        {
            // å¯¹å‡ºåº“单的操作
            var (outId, outBill) = HandleInventoryOut(db, param);
            param.COutId = outId;
            param.OutBill = outBill;

            // æ›´æ–°æ¡ç æ•°æ®
            UpdateBarcodeData(db, param);

            // ç”Ÿæˆæ‰“印条码并插入到 mes_rf_prnbarcode
            GenerateAndInsertPrintBarcode(db, param);

            return 1;
        });

        return "001";
    }

    private void UpdateBarcodeData(SqlSugarScope db, ProdPickParams param)
    {
        // æ›´æ–°æ¡ç æ•°æ®
        db.Updateable<MesInvItemBarcodes>()
            .SetColumns(it => new MesInvItemBarcodes
                { Oldqty = it.Quantity, Quantity = it.Quantity - param.CNum })
            .Where(it => it.ItemBarcode == param.CBarcode)
            .ExecuteCommand();

        // æ’入新的条码记录
        db.Insertable(new MesInvItemBarcodes
        {
            ItemNo = param.CInvItemBarcodes.ItemNo,
            ItemId = param.CInvItemBarcodes.ItemId,
            CreateBy = param.CUser,
            CreateDate = DateTime.Now,
            TaskNo = param.CDaa001,
            WorkNo = param.CWomdaa.Daa021,
            SuppNo = param.CInvItemBarcodes.SuppNo,
            Mblnr = param.CInvItemBarcodes.Mblnr,
            Zeile = param.CInvItemBarcodes.Zeile,
            Factory = param.CInvItemBarcodes.Factory,
            Company = param.CInvItemBarcodes.Company,
            EbelnK3id = param.CInvItemBarcodes.EbelnK3id,
            LineK3id = param.CInvItemBarcodes.LineK3id,
            Quantity = param.CNum,
            Oldqty = param.CNum,
            ItemBarcode = param.NewBarcode,
            Unit = param.CInvItemBarcodes.Unit,
            LotDate = param.CInvItemBarcodes.LotDate,
            Memo = "生产领料",
            ItemSname = param.CInvItemBarcodes.ItemSname,
            TrLotno = param.CInvItemBarcodes.TrLotno,
            BillNo = param.CInvItemBarcodes.BillNo,
            InsDate = param.CInvItemBarcodes.InsDate,
            WorkLine = param.CInvItemBarcodes.WorkLine,
            ComeFlg = 6,
            OldItemBarcode = param.CBarcode
        }).ExecuteCommand();

        // æ›´æ–°æ¡ç åº“å­˜
        db.Updateable<MesInvItemStocks>()
            .SetColumns(it => new MesInvItemStocks
                { Quantity = it.Quantity - param.CNum })
            .Where(it => it.ItemBarcode == param.CBarcode)
            .ExecuteCommand();

        // æ’入出库条码明细表
        db.Insertable(new MesInvItemOutCDetails
        {
            ItemOutId = param.COutId,
            ItemNo = param.CInvItemBarcodes.ItemNo,
            ItemId = param.CInvItemBarcodes.ItemId,
            CreateBy = param.CUser,
            CreateDate = DateTime.Now,
            DepotCode = param.CInvItemStocks.DepotsCode,
            DepotSectionCode = param.CInvItemStocks.DepotSectionsCode,
            TaskNo = param.CDaa001,
            WorkNo = param.CWomdaa.Daa021,
            SuppNo = param.CInvItemBarcodes.SuppNo,
            PbillNo = param.OutBill,
            Factory = param.PiFactory,
            Company = param.PiCompany,
            EbelnK3id = param.CInvItemStocks.EbelnK3id,
            LineK3id = param.CInvItemStocks.LineK3id,
            Quantity = param.CNum,
            ItemBarcode = param.NewBarcode
        }).ExecuteCommand();

        // æ’入到 MesInvBusiness2 è¡¨
        db.Insertable(new MesInvBusiness2
        {
            Status = 1,
            BillTypeId = 200,
            ItemNo = param.CInvItemBarcodes.ItemNo,
            ItemId = param.CInvItemBarcodes.ItemId,
            CreateBy = param.CUser,
            CreateDate = DateTime.Now,
            TaskNo = param.CDaa001,
            WorkNo = param.CWomdaa.Daa021,
            SuppNo = param.CInvItemBarcodes.SuppNo,
            Factory = param.PiFactory,
            Company = param.PiCompany,
            EbelnK3id = param.CInvItemStocks.EbelnK3id,
            LineK3id = param.CInvItemStocks.LineK3id,
            Quantity = param.CNum,
            ItemBarcode = param.CBarcode
        }).ExecuteCommand();
    }

    private void GenerateAndInsertPrintBarcode(SqlSugarScope db,
        ProdPickParams param)
    {
        string cSupName = null;
        if (!string.IsNullOrEmpty(param.CInvItemBarcodes.SuppNo))
        {
            cSupName = db.Queryable<MesSupplier>()
                .Where(it => it.SuppNo == param.CInvItemBarcodes.SuppNo)
                .Select(it => it.SuppName)
                .First();
        }

        int cId =
            db.Ado.GetInt(
                "SELECT F_GETSEQNEXTVALUE('MES_RF_PRNBARCODE') FROM dual");

        // æ’入打印条码记录
        db.Insertable(new MesRfPrnbarcode
        {
            Id = cId,
            Forder = "1",
            Fno = "1",
            CreateDate = DateTime.Now,
            Strp1 = param.CBarcode,
            Strp2 = cSupName ?? " ",
            Strp3 = param.CInvItemBarcodes.ItemNo,
            Strp4 = GetItemName(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp5 =
                $"{param.CInvItemBarcodes.Quantity - param.CNum} {GetUnitName(param.CInvItemBarcodes.Unit)}",
            Strp6 = DateTime.Now.ToString("yyyy-MM-dd"),
            Strp7 = GetItemModel(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp8 = param.CBarcode,
            Strp9 = GetItemModel(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp10 = param.CBarcode,
            Strp11 = param.CBarcode,
            Strp12 = param.CBarcode
        }).ExecuteCommand();

        db.Insertable(new MesRfPrnbarcode
        {
            Id = cId,
            Forder = "1",
            Fno = "1",
            CreateDate = DateTime.Now,
            Strp1 = param.NewBarcode,
            Strp2 = cSupName ?? " ",
            Strp3 = param.CInvItemBarcodes.ItemNo,
            Strp4 = GetItemName(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp5 = $"{param.CNum} {GetUnitName(param.CInvItemBarcodes.Unit)}",
            Strp6 = DateTime.Now.ToString("yyyy-MM-dd"),
            Strp7 = GetItemModel(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp8 = param.NewBarcode,
            Strp9 = GetItemModel(param.CInvItemBarcodes.ItemId) ?? " ",
            Strp10 = param.NewBarcode,
            Strp11 = param.NewBarcode,
            Strp12 = param.NewBarcode
        }).ExecuteCommand();
    }

    private (int OutId, string OutBill) HandleInventoryOut(SqlSugarScope db,
        ProdPickParams param)
    {
        // å¤„理出库单的插入或更新逻辑
        var tempNum = db.Queryable<MesInvItemOuts>()
            .Where(it => it.TaskNo == param.CDaa001 && it.Status == 0)
            .Count();

        int cOutId = 0;
        string cOutBill;

        if (tempNum == 0)
        {
            string sql =
                "SELECT COUNT(1) FROM MES_INV_ITEM_OUTS WHERE TRUNC(CREATE_DATE)=TRUNC(SYSDATE);";
            int todayCount = db.Ado.SqlQuerySingle<int>(sql);

            cOutBill = $"P{DateTime.Now:yyyyMMdd}{(todayCount + 1):D4}";

            // æ’入新的出库单
            db.Insertable(new MesInvItemOuts
            {
                ItemOutNo = cOutBill,
                TaskNo = param.CDaa001,
                Status = 0,
                CreateBy = param.CUser,
                CreateDate = DateTime.Now,
                WorkNo = param.CWomdaa.Daa021,
                OutType = "生产领料",
                BoardItem = param.CWomdaa.Daa002,
                PbillNo = param.CDaa001,
                BillTypeId = 200,
                TransactionNo = 201,
                Company = param.PiCompany,
                Factory = param.PiFactory,
                Remark = "生产领料",
                DepotCode = param.CInvItemStocks.DepotsCode,
                OutDate = DateTime.Now,
                OutPart = param.CDepart
            }).ExecuteCommand();
        }
        else
        {
            // èŽ·å–现有出库单号
            var outItem = db.Queryable<MesInvItemOuts>()
                .Where(it => it.TaskNo == param.CDaa001 && it.Status == 0)
                .Select(it => new { it.ItemOutNo, it.Id })
                .First();

            cOutBill = outItem.ItemOutNo;
            cOutId = Convert.ToInt32(outItem.Id);
        }

        // æ’入或更新从表
        InsertOrUpdateOutItems(db, cOutId, param);

        return (cOutId, cOutBill);
    }

    private void InsertOrUpdateOutItems(SqlSugarScope db, int cOutId,
        ProdPickParams param)
    {
        var tempNum = db.Queryable<MesInvItemOutItems>()
            .Where(it =>
                it.ItemId == param.CInvItemBarcodes.ItemId &&
                it.ItemOutId == cOutId)
            .Count();

        decimal? cNumTemp = param.CNum;

        string sql =
            "SELECT B.Id, NVL(A.YF, 0) yfl, B.DAB006 - NVL(A.YF, 0) Qty FROM WOMDAB B LEFT JOIN (SELECT SUM(QUANTITY) YF, ITEM_DABID FROM MES_INV_ITEM_OUT_ITEMS                GROUP BY ITEM_DABID) A ON A.ITEM_DABID = B.ID WHERE DAB003 = '" +
            param.CInvItemBarcodes.ItemId + "' AND DAB001 = '" + param.CDaa001 +
            "' ORDER BY TO_NUMBER(DAB002)";

        var womdabList = db.Ado.SqlQuery<DabResult>(sql);

        foreach (var item in womdabList)
        {
            if (item.Qty <= 0) continue;
            var itemDabid = item.Id;
            if (cNumTemp <= item.Qty)
            {
                if (tempNum == 0)
                {
                    // æ’入新的发料记录
                    db.Insertable(new MesInvItemOutItems
                    {
                        ItemOutId = cOutId,
                        Quantity = cNumTemp,
                        ItemDabid = itemDabid,
                        ItemId = param.CInvItemBarcodes.ItemId,
                        ItemNo = param.CInvItemBarcodes.ItemNo,
                        CreateBy = param.CUser,
                        CreateDate = DateTime.Now,
                        Factory = param.PiFactory,
                        Company = param.PiCompany,
                        DepotCode = param.CInvItemStocks.DepotsCode,
                        TaskNo = param.CDaa001,
                        EbelnK3id = param.CInvItemBarcodes.EbelnK3id,
                        LineK3id = param.CInvItemBarcodes.LineK3id,
                        PbillNo = param.CDaa001,
                        WorkNo = param.CInvItemStocks.WorkNo,
                        WorkLine = param.CInvItemStocks.WorkLine,
                        DepotSectionCode =
                            param.CInvItemStocks.DepotSectionsCode
                    }).ExecuteCommand();
                }
                else
                {
                    // æ›´æ–°çŽ°æœ‰å‘料记录的数量
                    db.Updateable<MesInvItemOutItems>()
                        .SetColumns(it => new MesInvItemOutItems
                            { Quantity = it.Quantity + cNumTemp })
                        .Where(it =>
                            it.ItemOutId == cOutId &&
                            it.ItemDabid == itemDabid)
                        .ExecuteCommand();
                }

                // æ›´æ–° WOMDAB è¡¨çš„发料数量
                db.Updateable<Womdab>()
                    .SetColumns(it => new Womdab
                        { Dab007 = item.Yfl + cNumTemp })
                    .Where(it => it.Id == itemDabid)
                    .ExecuteCommand();

                break;
            }

            // æ’入剩余的发料记录
            db.Insertable(new MesInvItemOutItems
            {
                ItemOutId = cOutId,
                Quantity = item.Qty,
                ItemDabid = itemDabid,
                ItemId = param.CInvItemBarcodes.ItemId,
                ItemNo = param.CInvItemBarcodes.ItemNo,
                CreateBy = param.CUser,
                CreateDate = DateTime.Now,
                Factory = param.PiFactory,
                Company = param.PiCompany,
                DepotCode = param.CInvItemStocks.DepotsCode,
                TaskNo = param.CDaa001,
                EbelnK3id = param.CInvItemBarcodes.EbelnK3id,
                LineK3id = param.CInvItemBarcodes.LineK3id,
                PbillNo = param.CDaa001,
                WorkNo = param.CInvItemStocks.WorkNo,
                WorkLine = param.CInvItemStocks.WorkLine,
                DepotSectionCode = param.CInvItemStocks.DepotSectionsCode
            }).ExecuteCommand();

            cNumTemp -= item.Qty;

            // æ›´æ–° WOMDAB è¡¨çš„发料数量
            db.Updateable<Womdab>()
                .SetColumns(it => new Womdab { Dab007 = it.Dab006 })
                .Where(it => it.Id == itemDabid)
                .ExecuteCommand();
        }
    }

    private string GenerateNewBarcode(string oldBarcode)
    {
        // ç”Ÿæˆæ–°çš„条码逻辑
        int count = Db.Queryable<MesInvItemBarcodes>()
            .Where(b => b.OldItemBarcode == oldBarcode).Count();
        return $"{oldBarcode}-{count + 1}";
    }

    private decimal? CalculateRemainingQuantity(
        string cDaa001, decimal? itemId)
    {
        // è®¡ç®—剩余可发数量
        var womdab = Db.Queryable<Womdab, Womdaa>((b, a) => new JoinQueryInfos(
                JoinType.Left, b.Pid == a.Id))
            .Where((b, a) =>
                a.Daa001 == cDaa001 && b.Dab003 == itemId.ToString())
            .Select(b => new
            {
                TotalQuantity = SqlFunc.AggregateMax(b.Dab006),
                IssuedQuantity = SqlFunc.AggregateMax(b.Dab007)
            })
            .First();

        return womdab.TotalQuantity - womdab.IssuedQuantity;
    }

    private static string GetItemName(decimal? pId)
    {
        try
        {
            if (pId == null)
            {
                return null;
            }

            // æŸ¥è¯¢ç‰©æ–™åç§°
            string itemName = Db.Queryable<MesItems>()
                .Where(it => it.Id == pId)
                .Select(it => it.ItemName)
                .First();

            return itemName;
        }
        catch (Exception)
        {
            throw new Exception("未找到物料名称，物料id号为" + pId);
        }
    }

    private string GetUnitName(string? pId)
    {
        try
        {
            if (string.IsNullOrEmpty(pId))
            {
                return null;
            }

            // æŸ¥è¯¢å•ä½åç§°æ˜¯å¦å­˜åœ¨
            int tempNum = Db.Queryable<MesUnit>()
                .Where(it => it.Id.ToString() == pId)
                .Count();

            string unitName;

            if (tempNum != 0)
            {
                // å¦‚果在 MES_UNIT è¡¨ä¸­æ‰¾åˆ°å•ä½åç§°
                unitName = Db.Queryable<MesUnit>()
                    .Where(it => it.Id.ToString() == pId)
                    .Select(it => it.Fname)
                    .First();
            }
            else
            {
                // å¦‚果在 MES_UNIT è¡¨ä¸­æ‰¾ä¸åˆ°ï¼Œåœ¨ MES_ITEMS è¡¨ä¸­æŸ¥æ‰¾ç›¸å…³è”的单位名称
                unitName = Db.Queryable<MesItems, MesUnit>((i, u) =>
                        new JoinQueryInfos(
                            JoinType.Left, i.ItemUnit == u.Id.ToString()))
                    .Where((i, u) => i.Id.ToString() == pId)
                    .Select((i, u) => u.Fname)
                    .First();
            }

            return unitName;
        }
        catch (Exception)
        {
            throw new Exception("单位名称未找到，物料id号为" + pId);
        }
    }

    private string GetItemModel(decimal? pId)
    {
        try
        {
            if (pId == null)
            {
                return null;
            }

            // æŸ¥è¯¢ç‰©æ–™è§„æ ¼
            string itemModel = Db.Queryable<MesItems>()
                .Where(it => it.Id == pId)
                .Select(it => it.ItemModel)
                .First();

            return itemModel;
        }
        catch (Exception)
        {
            throw new Exception("未找到物料型号，物料id号为" + pId);
        }
    }

    #endregion
}

public class ProdPickParams
{
    public string? CUser { get; set; }
    public string? CBarcode { get; set; }
    public string? CDaa001 { get; set; }
    public decimal? CNum { get; set; }
    public MesInvItemBarcodes? CInvItemBarcodes { get; set; }
    public MesInvItemStocks? CInvItemStocks { get; set; }
    public Womdaa? CWomdaa { get; set; }
    public string? NewBarcode { get; set; }
    public string? PiCompany { get; set; }
    public string? PiFactory { get; set; }
    public string? CDepart { get; set; }
    public int? COutId { get; set; }
    public string? OutBill { get; set; }
}

public class DabResult
{
    public decimal? Id { get; set; }
    public decimal? Yfl { get; set; }
    public decimal? Qty { get; set; }
}

 MES.Service/util/UserUtil.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
using MES.Service.DB;

namespace MES.Service.util;

public class UserUtil : RepositoryNoEntity
{
    public static (string factory, string company) GetFactory(string user)
    {
        string sql =
            "select t.Ffactory factory, t.Fcompany company from sys_user t where t.fcode = upper(trim('" +
            user + "'))";

        var sqlQuerySingle = Db.Ado.SqlQuerySingle<dynamic>(sql);

        return (sqlQuerySingle.FACTORY, sqlQuerySingle.COMPANY);
    }
}

 MESApplication/Controllers/Warehouse/MesInvItemBarcodesController.cs

@@ -41,6 +41,31 @@
        }
    }

    //PrcRfPdaProdPickItem3
    /// <summary>
    ///     ç”Ÿäº§é¢†æ–™å•ä¿å­˜
    /// </summary>
    /// <returns></returns>
    [HttpPost("ProdPickItem3")]
    public ResponseResult ProdPickItem3(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.PrcRfPdaProdPickItem3(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }

    /// <summary>
    ///     èŽ·å–所有
    /// </summary>

 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

@@ -869,6 +869,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetBarCodesQuan(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®æ¡ç èŽ·å–数量
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.ProdPickItem3(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                ç”Ÿäº§é¢†æ–™å•ä¿å­˜
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetList">
            <summary>
                èŽ·å–所有
@@ -1429,6 +1441,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetProductionPickDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ¨¡ç³ŠæŸ¥è¯¢å·¥å•å·å¹¶è¿”回
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetItemsByDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®å·¥å•å·èŽ·å–代领物料明细
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetList">
            <summary>
                èŽ·å–所有

 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

@@ -869,6 +869,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetBarCodesQuan(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®æ¡ç èŽ·å–数量
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.ProdPickItem3(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                ç”Ÿäº§é¢†æ–™å•ä¿å­˜
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetList">
            <summary>
                èŽ·å–所有
@@ -1429,6 +1441,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetProductionPickDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ¨¡ç³ŠæŸ¥è¯¢å·¥å•å·å¹¶è¿”回
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetItemsByDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®å·¥å•å·èŽ·å–代领物料明细
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetList">
            <summary>
                èŽ·å–所有

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

@@ -869,6 +869,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetBarCodesQuan(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®æ¡ç èŽ·å–数量
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.ProdPickItem3(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                ç”Ÿäº§é¢†æ–™å•ä¿å­˜
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.Warehouse.MesInvItemBarcodesController.GetList">
            <summary>
                èŽ·å–所有
@@ -1429,6 +1441,18 @@
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetProductionPickDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ¨¡ç³ŠæŸ¥è¯¢å·¥å•å·å¹¶è¿”回
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetItemsByDaa001(MES.Service.Dto.service.WarehouseQuery)">
            <summary>
                æ ¹æ®å·¥å•å·èŽ·å–代领物料明细
            </summary>
            <returns></returns>
        </member>
        <member name="M:MESApplication.Controllers.WomdaaController.GetList">
            <summary>
                èŽ·å–所有