11
啊鑫
2024-12-13 b2f0199d41ef80ba835bf58d6787df7f4accf7be
11
已修改9个文件
已添加1个文件
504 ■■■■ 文件已修改
Controllers/Warehouse/WomdaaController.cs 235 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Dto/service/ProductionPickDto.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/MesFile.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/MesInvItemOutCDetails.cs 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/MesSysPageview.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/Womcaa.cs 补丁 | 查看 | 原始文档 | blame | 历史
entity/Womcab.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
entity/Womdab.cs 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/Warehouse/WomdaaManager.cs 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service/base/LoginService.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Controllers/Warehouse/WomdaaController.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,235 @@
using System.Dynamic;
using Microsoft.AspNetCore.Mvc;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.Warehouse;
using NewPdaSqlServer.util;
namespace NewPdaSqlServer.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
public class WomdaaController : ControllerBase
{
    private readonly WomdaaManager m = new();
    #region ç”Ÿäº§é¢†æ–™
    //GetProductionPickDaa001
    /// <summary>
    ///     æ¨¡ç³ŠæŸ¥è¯¢å·¥å•号并返回
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetProductionPickDaa001")]
    public ResponseResult GetProductionPickDaa001(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetProductionPickDaa001(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //GetItemsByDaa001
    /// <summary>
    ///     æ ¹æ®å·¥å•号获取代领物料明细
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetItemsByDaa001")]
    public ResponseResult GetItemsByDaa001(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetItemsByDaa001(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    //ScanCode
    [HttpPost("ScanCode")]
    public ResponseResult ScanCode(WarehouseQuery query)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.ScanCode(query);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     èŽ·å–æ‰€æœ‰
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetList")]
    public ResponseResult GetList()
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetList();
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ ¹æ®ä¸»é”®èŽ·å–
    /// </summary>
    /// <returns></returns>
    [HttpPost("GetById")]
    public ResponseResult GetById(int id)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.GetById(id);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ ¹æ®ä¸»é”®åˆ é™¤
    /// </summary>
    /// <returns></returns>
    [HttpPost("DeleteByIds")]
    public ResponseResult DeleteByIds([FromBody] object[] ids)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.DeleteByIds(ids);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ·»åŠ 
    /// </summary>
    /// <returns></returns>
    [HttpPost("Insert")]
    public ResponseResult Add([FromBody] Womdaa data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Insert(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     æ·»åŠ è¿”å›žè‡ªå¢ž
    /// </summary>
    /// <returns></returns>
    [HttpPost("InsertReturnIdentity")]
    public ResponseResult InsertReturnIdentity([FromBody] Womdaa data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.InsertReturnIdentity(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    /// <summary>
    ///     ä¿®æ”¹
    /// </summary>
    /// <returns></returns>
    [HttpPost("Update")]
    public ResponseResult Update([FromBody] Womdaa data)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            resultInfos.tbBillList = m.Update(data);
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
    #endregion
}
Dto/service/ProductionPickDto.cs
@@ -1,12 +1,18 @@

using NewPdaSqlServer.entity;
using NewPdaSqlServer.entity;
namespace NewPdaSqlServer.Dto.service;
public class ProductionPickDto
{
    public string? ItemModel { get; set; }
    public string? PlanNo { get; set; }
    public string? daa001 { get; set; }
    public string? barcodeNum { get; set; }
    public string? splitNum { get; set; }
    public string? barcode { get; set; }
    public List<Womdab>? totals { get; set; }
entity/MesFile.cs
@@ -1,9 +1,8 @@
using SqlSugar;
namespace NewPdaSqlServer.entity
{
namespace NewPdaSqlServer.entity;
    /// <summary>
    ///
    ///</summary>
    [SugarTable("MES_FILE")]
    public class MesFile
@@ -24,30 +23,29 @@
        /// æ–‡ä»¶æ ‡é¢˜ 
        ///</summary>
         [SugarColumn(ColumnName="file_Title"    )]
         public string FileTitle { get; set; }
    public string? FileTitle { get; set; }
     /// <summary>
        /// æ–‡ä»¶ç±»åž‹ 
        ///</summary>
         [SugarColumn(ColumnName="file_Type"    )]
         public string FileType { get; set; }
    public string? FileType { get; set; }
     /// <summary>
        /// æ–‡ä»¶è·¯å¾„ 
        ///</summary>
         [SugarColumn(ColumnName="url_Path"    )]
         public string UrlPath { get; set; }
    public string? UrlPath { get; set; }
     /// <summary>
        /// ä¸Šä¼ è€… 
        ///</summary>
         [SugarColumn(ColumnName="create_by"    )]
         public string CreateBy { get; set; }
    public string? CreateBy { get; set; }
     /// <summary>
        /// ä¸Šä¼ æ—¶é—´ 
        ///</summary>
         [SugarColumn(ColumnName="create_date"    )]
         public DateTime? CreateDate { get; set; }
    }
}
entity/MesInvItemOutCDetails.cs
@@ -9,6 +9,7 @@
public class MesInvItemOutCDetails
{
    /// <summary>
    ///
    ///     é»˜è®¤å€¼: (newid())
    /// </summary>
    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
@@ -24,25 +25,25 @@
    ///     ç‰©æ–™æ¡ç 
    /// </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 = "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>
    ///     æ•°é‡ï¼ˆæ— æ¡ç æ‰‹å·¥å½•入,有条码为冗余字段)
@@ -61,7 +62,7 @@
    ///     åˆ›å»ºäºº
    /// </summary>
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    public string CreateBy { get; set; }
    /// <summary>
    ///     åˆ›å»ºæ—¶é—´
@@ -73,7 +74,7 @@
    ///     æœ€åŽæ›´æ–°äºº
    /// </summary>
    [SugarColumn(ColumnName = "LASTUPDATE_BY")]
    public string? LastupdateBy { get; set; }
    public string LastupdateBy { get; set; }
    /// <summary>
    ///     æœ€åŽæ›´æ–°æ—¶é—´
@@ -85,25 +86,25 @@
    ///     å®¢æˆ·ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "CUST_NO")]
    public string? CustNo { get; set; }
    public string CustNo { get; set; }
    /// <summary>
    ///     ä»“库编码
    /// </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>
    ///     å…æ£€æ ‡è¯†(0-否,1-是)
@@ -115,7 +116,7 @@
    ///     æŠ•料批次
    /// </summary>
    [SugarColumn(ColumnName = "PRD_LOT_NO")]
    public string? PrdLotNo { get; set; }
    public string PrdLotNo { get; set; }
    /// <summary>
    ///     æ˜¯å¦åšæŽ¥æ”¶æ£€æŸ¥
@@ -128,55 +129,55 @@
    ///     å·¥åŽ‚ç¼–å·
    /// </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 = "TASK_NOY")]
    public string? TaskNoy { get; set; }
    public string TaskNoy { get; set; }
    /// <summary>
    ///     ç®±å·
    /// </summary>
    [SugarColumn(ColumnName = "BOX_NO")]
    public string? BoxNo { get; set; }
    public string BoxNo { get; set; }
    /// <summary>
    ///     åŒ…装批次
    /// </summary>
    [SugarColumn(ColumnName = "TASK_PACK")]
    public string? TaskPack { get; set; }
    public string TaskPack { get; set; }
    /// <summary>
    ///     å¡æ¿
    /// </summary>
    [SugarColumn(ColumnName = "KB_NO")]
    public string? KbNo { get; set; }
    public string KbNo { get; set; }
    /// <summary>
    ///     æ¿åž‹
    /// </summary>
    [SugarColumn(ColumnName = "BOARD_STYLE")]
    public string? BoardStyle { get; set; }
    public string BoardStyle { get; set; }
    /// <summary>
    ///     ç”Ÿäº§å·¥å•
    /// </summary>
    [SugarColumn(ColumnName = "TASK_NO")]
    public string? TaskNo { get; set; }
    public string TaskNo { get; set; }
    /// <summary>
    ///     å·¥å•号
    /// </summary>
    [SugarColumn(ColumnName = "WORK_NO")]
    public string? WorkNo { get; set; }
    public string WorkNo { get; set; }
    /// <summary>
    ///     å·¥ä½œçº¿
@@ -188,13 +189,13 @@
    ///     ä¾›åº”商编号
    /// </summary>
    [SugarColumn(ColumnName = "SUPP_NO")]
    public string? SuppNo { get; set; }
    public string SuppNo { get; set; }
    /// <summary>
    ///     é‡‡è´­å•号
    /// </summary>
    [SugarColumn(ColumnName = "PBILL_NO")]
    public string? PbillNo { get; set; }
    public string PbillNo { get; set; }
    /// <summary>
    ///     æ”¶åˆ°æ•°é‡
@@ -213,19 +214,19 @@
    ///     æ”¶è´§äºº
    /// </summary>
    [SugarColumn(ColumnName = "RCV_BY")]
    public string? RcvBy { get; set; }
    public string RcvBy { get; set; }
    /// <summary>
    ///     æ”¶è´§éƒ¨åˆ†
    /// </summary>
    [SugarColumn(ColumnName = "RCV_PART")]
    public string? RcvPart { get; set; }
    public string RcvPart { get; set; }
    /// <summary>
    ///     å…¥åº“编号
    /// </summary>
    [SugarColumn(ColumnName = "RK_NO")]
    public string? RkNo { get; set; }
    public string RkNo { get; set; }
    /// <summary>
    ///     é‡‡è´­è®¢å•ID
@@ -246,17 +247,17 @@
    public long? ItemId { get; set; }
    /// <summary>
    ///     å¤‡æ–™å• ID
    /// </summary>
    [SugarColumn(ColumnName = "DABID")]
    public long? Dabid { get; set; }
    /// <summary>
    ///     ä»“库id
    /// </summary>
    [SugarColumn(ColumnName = "depot_id")]
    public int? DepotId { get; set; }
    /// <summary>
    /// å·¥å•明细行id
    ///</summary>
    [SugarColumn(ColumnName = "DABID")]
    public Guid? Dabid { 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; }
entity/MesSysPageview.cs
@@ -34,19 +34,16 @@
    public string Icoimg { get; set; }
    /// <summary>
    ///
    ///</summary>
    [SugarColumn(ColumnName = "PAGE_GROUP")]
    public string PageGroup { get; set; }
    /// <summary>
    ///
    ///</summary>
    [SugarColumn(ColumnName = "PAGE_IDX")]
    public int? PageIdx { get; set; }
    /// <summary>
    ///
    ///</summary>
    [SugarColumn(ColumnName = "PAGE_STATUS")]
    public bool? PageStatus { get; set; }
entity/Womcaa.cs
entity/Womcab.cs
@@ -129,7 +129,7 @@
    public string DepotCode { get; set; }
    /// <summary>
    ///     å‘料方式
    ///     å‘料方式 1、直接领料;2、直接倒冲;3、调拨领料;4、调拨到冲;7、不发料
    /// </summary>
    [SugarColumn(ColumnName = "ISSUE_TYPE")]
    public string IssueType { get; set; }
entity/Womdab.cs
@@ -8,12 +8,14 @@
public class Womdab
{
    /// <summary>
    ///
    ///     é»˜è®¤å€¼: (newid())
    /// </summary>
    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
    public Guid Guid { get; set; }
    /// <summary>
    ///
    /// </summary>
    [SugarColumn(ColumnName = "daaGuid")]
    public Guid? DaaGuid { get; set; }
@@ -34,7 +36,7 @@
    ///     å·¥å•单号
    /// </summary>
    [SugarColumn(ColumnName = "dab001")]
    public string Dab001 { get; set; }
    public string? Dab001 { get; set; }
    /// <summary>
    ///     åºå·
@@ -46,55 +48,55 @@
    ///     ææ–™ç¼–码
    /// </summary>
    [SugarColumn(ColumnName = "dab003")]
    public string Dab003 { get; set; }
    public string? Dab003 { get; set; }
    /// <summary>
    ///     ææ–™åç§°
    /// </summary>
    [SugarColumn(ColumnName = "dab004")]
    public string Dab004 { get; set; }
    public string? Dab004 { get; set; }
    /// <summary>
    ///     ææ–™è§„æ ¼
    /// </summary>
    [SugarColumn(ColumnName = "dab005")]
    public string Dab005 { get; set; }
    public string? Dab005 { get; set; }
    /// <summary>
    ///     éœ€é¢†ç”¨é‡
    /// </summary>
    [SugarColumn(ColumnName = "dab006")]
    public int? Dab006 { get; set; }
    public decimal? Dab006 { get; set; }
    /// <summary>
    ///     å·²é¢†ç”¨é‡
    /// </summary>
    [SugarColumn(ColumnName = "dab007")]
    public int? Dab007 { get; set; }
    public decimal? Dab007 { get; set; }
    /// <summary>
    ///     å·¥è‰º
    /// </summary>
    [SugarColumn(ColumnName = "dab008")]
    public string Dab008 { get; set; }
    public string? Dab008 { get; set; }
    /// <summary>
    ///     å•位
    /// </summary>
    [SugarColumn(ColumnName = "dab009")]
    public string Dab009 { get; set; }
    public string? Dab009 { get; set; }
    /// <summary>
    ///     ææ–™ç±»åž‹
    /// </summary>
    [SugarColumn(ColumnName = "dab010")]
    public string Dab010 { get; set; }
    public string? Dab010 { get; set; }
    /// <summary>
    ///     ä¸»æ–™
    /// </summary>
    [SugarColumn(ColumnName = "dab011")]
    public string Dab011 { get; set; }
    public string? Dab011 { get; set; }
    /// <summary>
    ///     ç»„成用量
@@ -112,37 +114,37 @@
    ///     æ˜¯å¦æ›¿æ–™
    /// </summary>
    [SugarColumn(ColumnName = "dab014")]
    public string Dab014 { get; set; }
    public string? Dab014 { get; set; }
    /// <summary>
    ///     ç‚¹ä½
    /// </summary>
    [SugarColumn(ColumnName = "dab015")]
    public string Dab015 { get; set; }
    public string? Dab015 { get; set; }
    /// <summary>
    ///     æŠ•料单号
    /// </summary>
    [SugarColumn(ColumnName = "dab016")]
    public string Dab016 { get; set; }
    public string? Dab016 { get; set; }
    /// <summary>
    ///     ä»“库编码
    /// </summary>
    [SugarColumn(ColumnName = "dab017")]
    public string Dab017 { get; set; }
    public string? Dab017 { get; set; }
    /// <summary>
    ///     ä»“库名称
    /// </summary>
    [SugarColumn(ColumnName = "dab018")]
    public string Dab018 { get; set; }
    public string? Dab018 { get; set; }
    /// <summary>
    ///     é¢†æ–™æ–¹å¼
    /// </summary>
    [SugarColumn(ColumnName = "dab019")]
    public string Dab019 { get; set; }
    public string? Dab019 { get; set; }
    /// <summary>
    ///     å›ºå®šæŸè€—
@@ -173,28 +175,28 @@
    ///     é»˜è®¤å€¼: ((0))
    /// </summary>
    [SugarColumn(ColumnName = "dab020")]
    public int? Dab020 { get; set; }
    public decimal? Dab020 { get; set; }
    /// <summary>
    ///     è¡¥é¢†æ•°é‡
    ///     é»˜è®¤å€¼: ((0))
    /// </summary>
    [SugarColumn(ColumnName = "dab021")]
    public int? Dab021 { get; set; }
    public decimal? Dab021 { get; set; }
    /// <summary>
    ///     é€€æ–™æ•°é‡
    ///     é»˜è®¤å€¼: ((0))
    /// </summary>
    [SugarColumn(ColumnName = "dab022")]
    public int? Dab022 { get; set; }
    public decimal? Dab022 { get; set; }
    /// <summary>
    ///     è¶…领数量
    ///     é»˜è®¤å€¼: ((0))
    /// </summary>
    [SugarColumn(ColumnName = "dab023")]
    public int? Dab023 { get; set; }
    public decimal? Dab023 { get; set; }
    /// <summary>
    ///     è‰¯å“é€€æ–™
@@ -228,7 +230,8 @@
    ///     åˆå¹¶å•号
    /// </summary>
    [SugarColumn(ColumnName = "hb_no")]
    public string HbNo { get; set; }
    public string? HbNo { get; set; }
    // åŠ¨æ€æ·»åŠ çš„å±žæ€§
    [SugarColumn(IsIgnore = true)] public decimal? wNum { get; set; }
service/Warehouse/WomdaaManager.cs
@@ -1,4 +1,6 @@
using NewPdaSqlServer.DB;
using System.Data;
using System.Data.SqlClient;
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using SqlSugar;
@@ -24,6 +26,75 @@
    //根据工单号返回产品型号和待领物料
    public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
    {
        return getDaa001(query);
    }
    public ProductionPickDto ScanCode(WarehouseQuery query)
    {
        string _strMsg = "";
        string _intSum = "";
        using (var conn = new SqlConnection(DbHelperSQL.strConn))
        {
            using (var cmd =new SqlCommand("[prc_sys_role_set_menuOrAction]", conn))
            {
                try
                {
                    conn.Open();
                    cmd.CommandType = CommandType.StoredProcedure;
                    SqlParameter[] parameters =
                    {
                        new("@outMsg", SqlDbType.NVarChar, 300),
                        new("@outSum", SqlDbType.NVarChar, 300),
                        new("@barcode_num", SqlDbType.NVarChar, 300),
                        new("@split_num", SqlDbType.NVarChar, 300),
                        new("@c_User", query.userName),
                        new("@p_biLL_no", query.daa001),
                        new("@p_item_barcode", query.barcode)
                    };
                    parameters[0].Direction = ParameterDirection.Output;
                    parameters[1].Direction = ParameterDirection.Output;
                    parameters[2].Direction = ParameterDirection.Output;
                    parameters[3].Direction = ParameterDirection.Output;
                    foreach (var parameter in parameters)
                        cmd.Parameters.Add(parameter);
                    cmd.ExecuteNonQuery();
                    _strMsg  = parameters[0].Value.ToString();
                    _intSum = parameters[1].Value.ToString();
                    var barcodeNum = parameters[2].Value.ToString();
                    var splitNum = parameters[3].Value.ToString();
                    var result = Convert.ToInt32(_intSum);
                    if (result <= 0)
                    {
                        throw new Exception(_strMsg);
                    }
                    var dto = new ProductionPickDto
                    {
                        daa001 = query.daa001,
                        barcodeNum = barcodeNum,
                        splitNum = splitNum,
                        barcode = query.barcode
                    };
                    return dto;
                }
                catch (Exception ex)
                {
                    throw new Exception(ex.Message);
                }
                finally
                {
                    conn.Close();
                }
            }
        }
    }
    private ProductionPickDto getDaa001(WarehouseQuery query)
    {
        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("工单号为空");
        var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
@@ -32,22 +103,24 @@
            .Where((a, i) => a.Daa001 == query.daa001)
            .Select((a, i) => new
            {
                i.ItemModel
                a.Daa001,a.CaaGuid
            }).First();
        if (womdaa?.ItemModel == null) throw new Exception("工单号不存在");
        if (womdaa?.Daa001 == null) throw new Exception("工单号不存在");
        
        var womdabs = Db.Queryable<Womdaa, Womdab, MesItems>((a, b, c) =>
        var womdabs = Db.Queryable<Womdaa, Womdab, MesItems, Womcab>(
                (a, b, c, d) =>
                new JoinQueryInfos(
                    JoinType.Left,
                    a.Id == b.Pid,
                        a.Guid == b.DaaGuid,
                    JoinType.Inner,
                    c.Id.ToString() ==
                    b.Dab003
                        b.Dab003,
                        JoinType.Inner, b.Erpid == d.Erpid
                ))
            .Where((a, b, c) =>
                a.Daa001 == query.daa001)
            .Select((a, b, c) => new Womdab
            .Where((a, b, c, d) =>
                a.Daa001 == query.daa001 && d.IssueType == "1")
            .Select((a, b, c, d) => new Womdab
            {
                Pid = b.Pid,
                Dab003 = b.Dab003,
@@ -61,13 +134,36 @@
        var list = womdabs.Where(s=>s.wNum > 0).ToList();
        var mesInvItemOutCDetailsList = Db
            .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>
                ((a, b, c) =>
                    new JoinQueryInfos(
                        JoinType.Inner,a.ItemId == b.Id,
                        JoinType.Inner,c.DepotId == a.DepotId
                    ))
            .Where((a, b, c) => a.WorkNo == query.daa001)
            .Select((a, b, c)=> new MesInvItemOutCDetails
            {
                ItemName = b.ItemName,
                ItemNo = b.ItemNo,
                ItemId = a.ItemId,
                DepotId = a.DepotId,
                WorkNo = a.WorkNo,
                DepotName = c.DepotName,
                Quantity = a.Quantity,
            })
            .ToList();
        var womcaa = Db.Queryable<Womcaa>().Where(s=>s.Guid == womdaa.CaaGuid).First();
        var dto = new ProductionPickDto
        {
            ItemModel = womdaa.ItemModel,
            daa001 = womdaa.Daa001,
            PlanNo = womcaa.Caa020,
            totals = womdabs,
            daisao = list
            daisao = list,
            yisao = mesInvItemOutCDetailsList
        };
        return dto;
    }
service/base/LoginService.cs
@@ -24,8 +24,6 @@
    public List<dynamic> getUserMenu(string name)
    {
        var sql = "";
        var pageViewList = Db.Queryable<MesSysPageview>()
            .Where(s => s.PageStatus == true)
            .OrderBy(s => s.PageIdx)
@@ -51,13 +49,17 @@
                    var mesFile = Db.Queryable<MesFile>()
                        .Where(s => s.ParentGuid == pageView.Guid).First();
                    var icoimg = "";
                    if (mesFile != null)
                        icoimg = "http://192.168.1.145:81/upload/" +
                                 mesFile.UrlPath;
                    groupObj.child.Add(new MesSysPageview
                    {
                        Guid = pageView.Guid,
                        PageView = pageView.PageView,
                        Path = pageView.Path,
                        Icoimg = "http://192.168.1.145:81/upload/" +
                                 mesFile.UrlPath,
                        Icoimg = icoimg,
                        PageGroup = pageView.PageGroup,
                        PageIdx = pageView.PageIdx,
                        PageStatus = pageView.PageStatus