1、产测查询工单改为通过线体直接查询 2、产测sn新增接口添加周转码字段

zjh

5 天以前 c9826deec7b7d657df13c5382ba9af053ede4dff

1、产测查询工单改为通过线体直接查询 2、产测sn新增接口添加周转码字段

 StandardPda/MES.Service/Dto/service/AsnInfo.cs

@@ -24,6 +24,10 @@
        /// </summary>
        public string loginId { get; set; }
        /// <summary>
        /// 周转码
        /// </summary>
        public string? turnoverCode { get; set; }
        /// <summary>
        /// 失败项目
        /// </summary>
        public List<CcFailItems>? failItems { get; set; }

 StandardPda/MES.Service/Dto/service/CCLoginDto.cs

@@ -7,6 +7,10 @@
        /// </summary>
        public string LoginId { get; set; }

       
        /// <summary>
        /// 线体
        /// </summary>
        public string LineId { get; set; }

    }
}

 StandardPda/MES.Service/service/Warehouse/WomdaaManager.cs

@@ -39,12 +39,13 @@


            //取直接关联线体的产测登录号数据，去取获取工单
            var sql1 = "select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from " +
                "MESLINE_LIKE_CCLOGIN_WORKS A1" +
                "                        join MES_LINE b on A1.LOGINID=b.ID" +
                "                        left join WOMDAA C on C.DAA015=B.LINE_NO" +
                "                        left join mes_items s on s.id = C.daa002" +
                "                       where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";
            //var sql1 = "select DAA001 tickeNo,s.ITEM_NO itemNo,s.ITEM_NAME itemName,s.ITEM_MODEL itemModel,DAA008 plannedNum from " +
            //    "MESLINE_LIKE_CCLOGIN_WORKS A1" +
            //    "                        join MES_LINE b on A1.LOGINID=b.ID" +
            //    "                        left join WOMDAA C on C.DAA015=B.LINE_NO" +
            //    "                        left join mes_items s on s.id = C.daa002" +
            //    "                       where WORKSNO='" + id + "' and DAA018='已开工'  order by DAA016 asc";
            var sql1 = "select DAA001 tickeNo, s.ITEM_NO itemNo, s.ITEM_NAME itemName, s.ITEM_MODEL itemModel, DAA008 plannedNum\r\nfrom  WOMDAA C\r\n         left join mes_items s on s.id = C.daa002\r\nleft join womcaa A on A.caa001=C.daa021\r\nwhere C.DAA015 = '" + id + "'\r\n  and DAA018 = '已开工' and A.CAA023='2'\r\norder by DAA016 asc";
            return SQLHelper.ExecuteQuery(sql1);
        }

@@ -91,13 +92,13 @@
                // 1. 主表插入
                var sql1 = $@"
            INSERT INTO MES_SN_STATUS_DETAILS
              (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID)
              (ID, TICKET_NO, SN_NO, WORKSTATION_NO, SN_STATE, LOGIN_ID,TURNOVER_CODE)
              VALUES (SEQ_MES_SN_STATUS_DETAILS_ID.NEXTVAL,
                      '{asnInfo.tickeNo}',
                      '{asnInfo.snNo}',
                      '{asnInfo.workstationNo}',
                      '{asnInfo.snState}',
                      '{asnInfo.loginId}')";
                      '{asnInfo.loginId}','{asnInfo.turnoverCode}')";
                int i = sqlHelper.ExecuteNonQueryWithTransaction(connection, transaction, sql1);

                // 2. 失败项插入

 StandardPda/MESApplication/Controllers/Warehouse/womdaaController.cs

@@ -42,7 +42,9 @@
            try
            {
                dynamic resultInfos = new ExpandoObject();
                var result = m.GetTickeInfo(ccLoginDto.LoginId);
                //var result = m.GetTickeInfo(ccLoginDto.LoginId);
                //传线体编码，根据线体编码获取工单信息
                var result = m.GetTickeInfo(ccLoginDto.LineId);
                resultInfos.tbBillList = result;

                entity.Result = 0;