紧急放行修改

xwt

4 天以前 41975878bf0b8d3632d8c5f21714502a57632070

紧急放行修改

 StandardInterface/MES.Service/Modes/QamftpDto.cs

@@ -5,7 +5,7 @@
    public class QamftpDto
    {
        public decimal Id { get; set; }
        public string ItemNo { get; set; }
        public string itemNo { get; set; }
        public string Ftype { get; set; }
        public string Fattach { get; set; }
        public string Fversion { get; set; }

 StandardInterface/MES.Service/service/QC/LljService.cs

@@ -67,7 +67,7 @@
                        .Contains(queryObj.SearchValue.ToLower()))
            //  .OrderByDescending((a, b,

            .OrderBy("CASE WHEN a.STATUS = '已提交' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
            .OrderBy("CASE WHEN a.EMERGENCY = 1 THEN 0 ELSE 1 END, CASE WHEN a.STATUS = '已提交' THEN 0 ELSE 1 END, a.IQC_DATE desc, a.ID asc")
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount); 

        var emergencyValues = pageList.Select(item => item.EMERGENCY).ToList(); 
@@ -311,9 +311,9 @@
        return input.Substring(startIndex + 1, length);
    }

    public List<QamftpDto> GetAttachments(string releaseNo)
    public List<QamftpDto> GetAttachments(string ItemNo)
    {
        if (string.IsNullOrEmpty(releaseNo))
        if (string.IsNullOrEmpty(ItemNo))
        {
            throw new ArgumentException("检验单号不能为空");
        }
@@ -322,13 +322,13 @@
        try
        {
            return db.Queryable<MesQamftp>()
                .Where(x => x.ReleaseNo == releaseNo)
                .Where(x => x.ItemNo == ItemNo)
                .OrderBy(x => x.Fdate, OrderByType.Desc)
                // .ThenBy(x => x.CreateDate, OrderByType.Desc)
                .Select(x => new QamftpDto
                {
                    Id = x.Id,
                    ItemNo = x.ItemNo,
                    itemNo = x.ItemNo,
                    Ftype = x.Ftype,
                    Fattach = x.Fattach,
                    Fversion = x.Fversion,
@@ -337,7 +337,7 @@
                    CreateDate = x.CreateDate,
                    Company = x.Company,
                    Factory = x.Factory,
                    ReleaseNo = x.ReleaseNo,
                    
                    F_type = x.F_type,
                    LastupdateBy = x.LastupdateBy,
                    LastupdateDate = x.LastupdateDate,

 StandardInterface/MESApplication/Controllers/QC/LljController.cs

@@ -320,11 +320,11 @@
    [HttpPost("getAttachments")]
    public ResponseResult GetAttachments([FromBody] JObject data)
    {
        var releaseNo = data["releaseNo"]?.ToString();
        var itemNo = data["itemNo"]?.ToString();
        try
        {
            dynamic resultInfos = new System.Dynamic.ExpandoObject();
            var tbBillList = new LljService().GetAttachments(releaseNo);
            var tbBillList = new LljService().GetAttachments(itemNo);
            if (tbBillList == null || tbBillList.Count == 0)
            {
                return new ResponseResult

 StandardInterface/MESApplication/appsettings.json

@@ -10,6 +10,6 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
  }
}