StandardPda/MES.Service/Dto/webApi/ErpCAA.cs

@@ -68,6 +68,8 @@
    
    public string? TypeA { get; set; }

    public decimal? FIsCancel { get; set; }

    


}

 StandardPda/MES.Service/Modes/Womcaa.cs

@@ -529,4 +529,10 @@
    /// </summary>
    [SugarColumn(ColumnName = "TS_DATE")]
    public DateTime? TsDate { get; set; }

    /// <summary>
    ///    终止标识
    /// </summary>
    [SugarColumn(ColumnName = "ISCANCEL")]
    public decimal? ISCANCEL { get; set; }
}

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

@@ -235,12 +235,12 @@

                var parameters1 = new[]
                {
            new OracleParameter(":ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
            new OracleParameter(":snNo", asnInfo.snNo ?? (object)DBNull.Value),
            new OracleParameter(":workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
            new OracleParameter(":snState", asnInfo.snState ?? (object)DBNull.Value),
            new OracleParameter(":loginId", asnInfo.loginId ?? (object)DBNull.Value),
            new OracleParameter(":turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value)
            new OracleParameter("ticketNo", asnInfo.tickeNo ?? (object)DBNull.Value),
            new OracleParameter("snNo", asnInfo.snNo ?? (object)DBNull.Value),
            new OracleParameter("workstationNo", asnInfo.workstationNo ?? (object)DBNull.Value),
            new OracleParameter("snState", asnInfo.snState ?? (object)DBNull.Value),
            new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value),
            new OracleParameter("turnoverCode", asnInfo.turnoverCode ?? (object)DBNull.Value)
        };

                int i = sqlHelper.ExecuteNonQueryWithTransaction(sql1, parameters1, connection, transaction);
@@ -264,11 +264,11 @@

                        var parameters2 = new[]
                        {
                    new OracleParameter(":defectIssue", item.DefectIssue ?? (object)DBNull.Value),
                    new OracleParameter(":rootCause", item.RootCause ?? (object)DBNull.Value),
                    new OracleParameter(":repairMethod", item.RepairMethod ?? (object)DBNull.Value),
                    new OracleParameter(":materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
                    new OracleParameter(":loginId", asnInfo.loginId ?? (object)DBNull.Value)
                    new OracleParameter("defectIssue", item.DefectIssue ?? (object)DBNull.Value),
                    new OracleParameter("rootCause", item.RootCause ?? (object)DBNull.Value),
                    new OracleParameter("repairMethod", item.RepairMethod ?? (object)DBNull.Value),
                    new OracleParameter("materialHandling", item.MaterialHandling ?? (object)DBNull.Value),
                    new OracleParameter("loginId", asnInfo.loginId ?? (object)DBNull.Value)
                };

                        sqlHelper.ExecuteNonQueryWithTransaction(sql2, parameters2, connection, transaction);
@@ -289,7 +289,7 @@
                        {
                            // 校验
                            var checkSql = "SELECT COUNT(1) FROM MES_SN_PART_BINDING WHERE PART_SN_NO = :partSn";
                            var checkParams = new[] { new OracleParameter(":partSn", partSn ?? (object)DBNull.Value) };
                            var checkParams = new[] { new OracleParameter("partSn", partSn ?? (object)DBNull.Value) };
                            var exists = Convert.ToInt32(sqlHelper.ExecuteScalarWithTransaction(connection, transaction, checkSql, checkParams));

                            if (exists > 0)
@@ -299,24 +299,25 @@

                            // 插入绑定
                            var sqlBind = @"
                        INSERT INTO MES_SN_PART_BINDING
                           (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
                           VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
                                   :snNo,
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user)";
    INSERT INTO MES_SN_PART_BINDING
       (ID, SN_NO, PART_SN_NO, PART_NAME_CN, CREATE_DATE, CREATE_USER)
       VALUES (SEQ_MES_SN_PART_BINDING.NEXTVAL,
               :snNo,
               :partSn,
               :partName,
               SYSDATE,
               :createUser)";

                            var bindParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter(":partName", partName ?? (object)DBNull.Value),
                        new OracleParameter(":user", user ?? (object)DBNull.Value)
                    };
    new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
    new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
    new OracleParameter("partName", partName ?? (object)DBNull.Value),
    new OracleParameter("createUser", user ?? (object)DBNull.Value)
};

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlBind, bindParams, connection, transaction);


                            // 插入日志
                            var sqlLog = @"
@@ -327,7 +328,7 @@
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user,
                                   :createUser,
                                   0)";

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, bindParams, connection, transaction);
@@ -342,8 +343,8 @@

                            var unbindParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value)
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlUnbind, unbindParams, connection, transaction);
@@ -357,15 +358,15 @@
                                   :partSn,
                                   :partName,
                                   SYSDATE,
                                   :user,
                                   :Puser,
                                   1)";

                            var logParams = new[]
                            {
                        new OracleParameter(":snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter(":partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter(":partName", partName ?? (object)DBNull.Value),
                        new OracleParameter(":user", user ?? (object)DBNull.Value)
                        new OracleParameter("snNo", snNo ?? (object)DBNull.Value),
                        new OracleParameter("partSn", partSn ?? (object)DBNull.Value),
                        new OracleParameter("partName", partName ?? (object)DBNull.Value),
                        new OracleParameter("Puser", user ?? (object)DBNull.Value)
                    };

                            sqlHelper.ExecuteNonQueryWithTransaction(sqlLog, logParams, connection, transaction);
@@ -390,6 +391,7 @@
        }



        /// <summary>
        /// 设置中箱码（绑定/解绑 SN）
        /// </summary>

 StandardPda/MES.Service/service/WomcaaManager.cs

@@ -159,7 +159,8 @@
            Isforcewholeset = dto.FIsForceWholeSet,
            PREVMO = dto.FPrevMO,
            TsDate = DateTime.Now,
            Typea = dto.TypeA
            Typea = dto.TypeA,
            ISCANCEL = dto.FIsCancel
        };